Mercurial > hg > xemacs-beta

comparison src/window.c @ 450:98528da0b7fc r21-2-40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-40
author cvs
date Mon, 13 Aug 2007 11:39:20 +0200
parents 3078fd1074e8
children e7ef97881643
comparison
equal deleted inserted replaced
449:c83749d23eb5 450:98528da0b7fc
279 INIT_DISP_VARIABLE (last_start, Fmake_marker ()); 279 INIT_DISP_VARIABLE (last_start, Fmake_marker ());
280 INIT_DISP_VARIABLE (last_facechange, Qzero); 280 INIT_DISP_VARIABLE (last_facechange, Qzero);
281 p->face_cachels = Dynarr_new (face_cachel); 281 p->face_cachels = Dynarr_new (face_cachel);
282 p->glyph_cachels = Dynarr_new (glyph_cachel); 282 p->glyph_cachels = Dynarr_new (glyph_cachel);
283 p->line_start_cache = Dynarr_new (line_start_cache); 283 p->line_start_cache = Dynarr_new (line_start_cache);
284 p->subwindow_instance_cache = make_lisp_hash_table (30, 284 p->subwindow_instance_cache = make_image_instance_cache_hash_table ();
285 HASH_TABLE_KEY_VALUE_WEAK, 285
286 HASH_TABLE_EQ);
287 p->line_cache_last_updated = Qzero; 286 p->line_cache_last_updated = Qzero;
288 INIT_DISP_VARIABLE (last_point_x, 0); 287 INIT_DISP_VARIABLE (last_point_x, 0);
289 INIT_DISP_VARIABLE (last_point_y, 0); 288 INIT_DISP_VARIABLE (last_point_y, 0);
290 INIT_DISP_VARIABLE (window_end_pos, 0); 289 INIT_DISP_VARIABLE (window_end_pos, 0);
291 p->redisplay_end_trigger = Qnil; 290 p->redisplay_end_trigger = Qnil;
3602 instances. */ 3601 instances. */
3603 p->line_start_cache = Dynarr_new (line_start_cache); 3602 p->line_start_cache = Dynarr_new (line_start_cache);
3604 p->face_cachels = Dynarr_new (face_cachel); 3603 p->face_cachels = Dynarr_new (face_cachel);
3605 p->glyph_cachels = Dynarr_new (glyph_cachel); 3604 p->glyph_cachels = Dynarr_new (glyph_cachel);
3606 p->subwindow_instance_cache = 3605 p->subwindow_instance_cache =
3607 make_lisp_hash_table (30, 3606 make_image_instance_cache_hash_table ();
3608 HASH_TABLE_KEY_VALUE_WEAK,
3609 HASH_TABLE_EQ);
3610 3607
3611 /* Put new into window structure in place of window */ 3608 /* Put new into window structure in place of window */
3612 replace_window (window, new); 3609 replace_window (window, new);
3613 3610
3614 o->next = Qnil; 3611 o->next = Qnil;
5476 We specifically want to do this for tabs, since for some 5473 We specifically want to do this for tabs, since for some
5477 reason finding a file will cause the configuration to be 5474 reason finding a file will cause the configuration to be
5478 set. */ 5475 set. */
5479 if (NILP (w->subwindow_instance_cache)) 5476 if (NILP (w->subwindow_instance_cache))
5480 w->subwindow_instance_cache = 5477 w->subwindow_instance_cache =
5481 make_lisp_hash_table (30, 5478 make_image_instance_cache_hash_table ();
5482 HASH_TABLE_KEY_VALUE_WEAK, 5479
5483 HASH_TABLE_EQ);
5484 SET_LAST_MODIFIED (w, 1); 5480 SET_LAST_MODIFIED (w, 1);
5485 SET_LAST_FACECHANGE (w); 5481 SET_LAST_FACECHANGE (w);
5486 w->config_mark = 0; 5482 w->config_mark = 0;
5487 5483
5488 /* #### Consider making the instance cache a winslot. */ 5484 /* #### Consider making the instance cache a winslot. */
5859 &lrecord_window_configuration); 5855 &lrecord_window_configuration);
5860 XSETWINDOW_CONFIGURATION (result, config); 5856 XSETWINDOW_CONFIGURATION (result, config);
5861 /* 5857 /*
5862 config->frame_width = FRAME_WIDTH (f); 5858 config->frame_width = FRAME_WIDTH (f);
5863 config->frame_height = FRAME_HEIGHT (f); */ 5859 config->frame_height = FRAME_HEIGHT (f); */
5864 /* When using `push-window-configuration', often the minibuffer ends 5860 /* #### When using `push-window-configuration', often the minibuffer ends
5865 up as the selected window because functions run as the result of 5861 up as the selected window because functions run as the result of
5866 user interaction e.g. hyper-apropos. It seems to me the sensible 5862 user interaction e.g. hyper-apropos. It seems to me the sensible
5867 thing to do is not record the minibuffer here. */ 5863 thing to do is not record the minibuffer here.
5864
5865 #### Unfortunately this is a change to previous behaviour, however logical
5866 it may be, so revert for the moment. */
5867 #if 0
5868 if (FRAME_MINIBUF_ONLY_P (f) || minibuf_level) 5868 if (FRAME_MINIBUF_ONLY_P (f) || minibuf_level)
5869 config->current_window = FRAME_SELECTED_WINDOW (f); 5869 config->current_window = FRAME_SELECTED_WINDOW (f);
5870 else 5870 else
5871 config->current_window = FRAME_LAST_NONMINIBUF_WINDOW (f); 5871 config->current_window = FRAME_LAST_NONMINIBUF_WINDOW (f);
5872 #endif
5873 config->current_window = FRAME_SELECTED_WINDOW (f);
5872 XSETBUFFER (config->current_buffer, current_buffer); 5874 XSETBUFFER (config->current_buffer, current_buffer);
5873 config->minibuffer_scroll_window = Vminibuffer_scroll_window; 5875 config->minibuffer_scroll_window = Vminibuffer_scroll_window;
5874 config->root_window = FRAME_ROOT_WINDOW (f); 5876 config->root_window = FRAME_ROOT_WINDOW (f);
5875 config->min_height = window_min_height; 5877 config->min_height = window_min_height;
5876 config->min_width = window_min_width; 5878 config->min_width = window_min_width;