Mercurial > emacs
comparison src/xdisp.c @ 85114:5039706521c9
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 09 Oct 2007 08:52:57 +0000 |
parents | 55a892948dea 6618fda00eb6 |
children | a8b8f12ca180 bdb3fe0ba9fa |
comparison
equal
deleted
inserted
replaced
85113:82b4a12fd080 | 85114:5039706521c9 |
---|---|
21353 | 21353 |
21354 *active_cursor = 0; | 21354 *active_cursor = 0; |
21355 non_selected = 1; | 21355 non_selected = 1; |
21356 } | 21356 } |
21357 | 21357 |
21358 /* Nonselected window or nonselected frame. */ | 21358 /* Detect a nonselected window or nonselected frame. */ |
21359 else if (w != XWINDOW (f->selected_window) | 21359 else if (w != XWINDOW (f->selected_window) |
21360 #ifdef HAVE_WINDOW_SYSTEM | 21360 #ifdef HAVE_WINDOW_SYSTEM |
21361 || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame | 21361 || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame |
21362 #endif | 21362 #endif |
21363 ) | 21363 ) |
21372 | 21372 |
21373 /* Never display a cursor in a window in which cursor-type is nil. */ | 21373 /* Never display a cursor in a window in which cursor-type is nil. */ |
21374 if (NILP (b->cursor_type)) | 21374 if (NILP (b->cursor_type)) |
21375 return NO_CURSOR; | 21375 return NO_CURSOR; |
21376 | 21376 |
21377 /* Use cursor-in-non-selected-windows for non-selected window or frame. */ | |
21378 if (non_selected) | |
21379 { | |
21380 alt_cursor = b->cursor_in_non_selected_windows; | |
21381 return get_specified_cursor_type (alt_cursor, width); | |
21382 } | |
21383 | |
21384 /* Get the normal cursor type for this window. */ | 21377 /* Get the normal cursor type for this window. */ |
21385 if (EQ (b->cursor_type, Qt)) | 21378 if (EQ (b->cursor_type, Qt)) |
21386 { | 21379 { |
21387 cursor_type = FRAME_DESIRED_CURSOR (f); | 21380 cursor_type = FRAME_DESIRED_CURSOR (f); |
21388 *width = FRAME_CURSOR_WIDTH (f); | 21381 *width = FRAME_CURSOR_WIDTH (f); |
21389 } | 21382 } |
21390 else | 21383 else |
21391 cursor_type = get_specified_cursor_type (b->cursor_type, width); | 21384 cursor_type = get_specified_cursor_type (b->cursor_type, width); |
21385 | |
21386 /* Use cursor-in-non-selected-windows instead | |
21387 for non-selected window or frame. */ | |
21388 if (non_selected) | |
21389 { | |
21390 alt_cursor = b->cursor_in_non_selected_windows; | |
21391 if (!EQ (Qt, alt_cursor)) | |
21392 return get_specified_cursor_type (alt_cursor, width); | |
21393 /* t means modify the normal cursor type. */ | |
21394 if (cursor_type == FILLED_BOX_CURSOR) | |
21395 cursor_type = HOLLOW_BOX_CURSOR; | |
21396 else if (cursor_type == BAR_CURSOR && *width > 1) | |
21397 --*width; | |
21398 return cursor_type; | |
21399 } | |
21392 | 21400 |
21393 /* Use normal cursor if not blinked off. */ | 21401 /* Use normal cursor if not blinked off. */ |
21394 if (!w->cursor_off_p) | 21402 if (!w->cursor_off_p) |
21395 { | 21403 { |
21396 #ifdef HAVE_WINDOW_SYSTEM | 21404 #ifdef HAVE_WINDOW_SYSTEM |
24192 that time before the window gets selected.\) | 24200 that time before the window gets selected.\) |
24193 Any other value means to autoselect window instantaneously when the | 24201 Any other value means to autoselect window instantaneously when the |
24194 mouse pointer enters it. | 24202 mouse pointer enters it. |
24195 | 24203 |
24196 Autoselection selects the minibuffer only if it is active, and never | 24204 Autoselection selects the minibuffer only if it is active, and never |
24197 unselects the minibuffer if it is active. */); | 24205 unselects the minibuffer if it is active. |
24206 | |
24207 When customizing this variable make sure that the actual value of | |
24208 `focus-follows-mouse' matches the behavior of your window manager. */); | |
24198 Vmouse_autoselect_window = Qnil; | 24209 Vmouse_autoselect_window = Qnil; |
24199 | 24210 |
24200 DEFVAR_LISP ("auto-resize-tool-bars", &Vauto_resize_tool_bars, | 24211 DEFVAR_LISP ("auto-resize-tool-bars", &Vauto_resize_tool_bars, |
24201 doc: /* *Non-nil means automatically resize tool-bars. | 24212 doc: /* *Non-nil means automatically resize tool-bars. |
24202 This dynamically changes the tool-bar's height to the minimum height | 24213 This dynamically changes the tool-bar's height to the minimum height |