Mercurial > emacs

comparison src/xterm.c @ 90787:91bf6e05918b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 662-669) - Update from CVS - Fix read-only prompt problem in isearch - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 207-208) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
author Miles Bader <miles@gnu.org>
date Sun, 18 Mar 2007 14:11:08 +0000
parents dd7c098af727 e95c60f2a27e
children 31beec9ee600
comparison
equal deleted inserted replaced
90786:ca12f314faac 90787:91bf6e05918b
5523 5523
5524 BLOCK_INPUT; 5524 BLOCK_INPUT;
5525 5525
5526 x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1); 5526 x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
5527 5527
5528 /* Switch to scroll bar foreground color. */ 5528 /* Switch to scroll bar foreground color. */
5529 if (f->output_data.x->scroll_bar_foreground_pixel != -1) 5529 if (f->output_data.x->scroll_bar_foreground_pixel != -1)
5530 XSetForeground (FRAME_X_DISPLAY (f), gc, 5530 XSetForeground (FRAME_X_DISPLAY (f), gc,
5531 f->output_data.x->scroll_bar_foreground_pixel); 5531 f->output_data.x->scroll_bar_foreground_pixel);
5532 5532
5533 /* Draw a one-pixel border just inside the edges of the scroll bar. */ 5533 /* Draw a one-pixel border just inside the edges of the scroll bar. */
6977 Lisp_Object window; 6977 Lisp_Object window;
6978 int x = event.xbutton.x; 6978 int x = event.xbutton.x;
6979 int y = event.xbutton.y; 6979 int y = event.xbutton.y;
6980 6980
6981 window = window_from_coordinates (f, x, y, 0, 0, 0, 1); 6981 window = window_from_coordinates (f, x, y, 0, 0, 0, 1);
6982 if (EQ (window, f->tool_bar_window)) 6982 tool_bar_p = EQ (window, f->tool_bar_window);
6983
6984 if (tool_bar_p && event.xbutton.button < 4)
6983 { 6985 {
6984 if (event.xbutton.type == ButtonPress) 6986 if (event.xbutton.type == ButtonPress)
6985 handle_tool_bar_click (f, x, y, 1, 0); 6987 handle_tool_bar_click (f, x, y, 1, 0);
6986 else 6988 else
6987 handle_tool_bar_click (f, x, y, 0, 6989 handle_tool_bar_click (f, x, y, 0,
6988 x_x_to_emacs_modifiers (dpyinfo, 6990 x_x_to_emacs_modifiers (dpyinfo,
6989 event.xbutton.state)); 6991 event.xbutton.state));
6990 tool_bar_p = 1;
6991 } 6992 }
6992 } 6993 }
6993 6994
6994 if (!tool_bar_p) 6995 if (!tool_bar_p)
6995 if (!dpyinfo->x_focus_frame 6996 if (!dpyinfo->x_focus_frame