aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1995-03-26 21:12:11 +0000
committerRichard M. Stallman1995-03-26 21:12:11 +0000
commit1cf412ecec204f4d02fa7664013a1b296d0dcfba (patch)
tree6251cdecd6184991cd0f702acad133dd8cc152f6
parenta40b9bc73e13c2bb93d712f848bc4c82b14d7421 (diff)
downloademacs-1cf412ecec204f4d02fa7664013a1b296d0dcfba.tar.gz
emacs-1cf412ecec204f4d02fa7664013a1b296d0dcfba.zip
(XTmouse_position): New arg `insist'.
-rw-r--r--src/xterm.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index ca0f3eed2d4..0dc35d500e6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2199,8 +2199,9 @@ static void x_scroll_bar_report_motion ();
2199 again. */ 2199 again. */
2200 2200
2201static void 2201static void
2202XTmouse_position (fp, bar_window, part, x, y, time) 2202XTmouse_position (fp, insist, bar_window, part, x, y, time)
2203 FRAME_PTR *fp; 2203 FRAME_PTR *fp;
2204 int insist;
2204 Lisp_Object *bar_window; 2205 Lisp_Object *bar_window;
2205 enum scroll_bar_part *part; 2206 enum scroll_bar_part *part;
2206 Lisp_Object *x, *y; 2207 Lisp_Object *x, *y;
@@ -2321,6 +2322,9 @@ XTmouse_position (fp, bar_window, part, x, y, time)
2321 } 2322 }
2322 } 2323 }
2323 2324
2325 if (f1 == 0 && insist)
2326 f1 = selected_frame;
2327
2324 if (f1) 2328 if (f1)
2325 { 2329 {
2326 int ignore1, ignore2; 2330 int ignore1, ignore2;
@@ -2329,7 +2333,8 @@ XTmouse_position (fp, bar_window, part, x, y, time)
2329 2333
2330 pixel_to_glyph_coords (f1, win_x, win_y, &ignore1, &ignore2, 2334 pixel_to_glyph_coords (f1, win_x, win_y, &ignore1, &ignore2,
2331 &last_mouse_glyph, 2335 &last_mouse_glyph,
2332 FRAME_X_DISPLAY_INFO (f1)->grabbed); 2336 FRAME_X_DISPLAY_INFO (f1)->grabbed
2337 || insist);
2333 2338
2334 *bar_window = Qnil; 2339 *bar_window = Qnil;
2335 *part = 0; 2340 *part = 0;