Mercurial > emacs
changeset 8164:3b90e6a741f1
(XTread_socket, construct_menu_click) [USE_X_TOOLKIT]:
Update x_mouse_grabbed and Vmouse_depressed.
(x_make_frame_visible): In x_sync loop at the end,
every fourth time, sleep for 1/4 second.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 07 Jul 1994 03:03:34 +0000 |
parents | d836abb05e48 |
children | 02ee07034f11 |
files | src/xterm.c |
diffstat | 1 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Thu Jul 07 02:44:58 1994 +0000 +++ b/src/xterm.c Thu Jul 07 03:03:34 1994 +0000 @@ -2061,6 +2061,15 @@ XSET (result->x, Lisp_Int, event->x); XSET (result->y, Lisp_Int, -1); XSET (result->frame_or_window, Lisp_Frame, f); + + /* Notice if the mouse is still grabbed. */ + if (event->type == ButtonPress) + { + if (! x_mouse_grabbed) + Vmouse_depressed = Qt; + x_mouse_grabbed |= (1 << event->button); + last_mouse_frame = f; + } } /* Function to report a mouse movement to the mainstream Emacs code. @@ -2385,9 +2394,15 @@ int width = window_internal_width (w); FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); int i; - int curs_x = f->phys_cursor_x; - int curs_y = f->phys_cursor_y; int cursor_off = 0; + int old_curs_x = curs_x; + int old_curs_y = curs_y; + + /* Set these variables temporarily + so that if we have to turn the cursor off and on again + we will put it back at the same place. */ + curs_x = f->phys_cursor_x; + curs_y = f->phys_cursor_y; for (i = mouse_face_beg_row; i <= mouse_face_end_row; i++) { @@ -2417,6 +2432,9 @@ if (cursor_off) x_display_cursor (f, 1); + curs_x = old_curs_x; + curs_y = old_curs_y; + /* Change the mouse cursor according to the value of HL. */ if (hl > 0) XDefineCursor (XDISPLAY FRAME_X_WINDOW (f), f->display.x->cross_cursor); @@ -4206,8 +4224,8 @@ } else { - struct scroll_bar *bar = - x_window_to_scroll_bar (event.xbutton.window); + struct scroll_bar *bar + = x_window_to_scroll_bar (event.xbutton.window); if (bar) x_scroll_bar_handle_click (bar, &event, &emacs_event); @@ -4218,6 +4236,12 @@ if (f && event.type == ButtonPress) construct_menu_click (&emacs_event, &event, f); + else if (f) + { + x_mouse_grabbed &= ~(1 << event.xbutton.button); + if (!x_mouse_grabbed) + Vmouse_depressed = Qnil; + } } #endif /* USE_X_TOOLKIT */ }