diff options
| author | Elijah Newren <newren@src.gnome.org> | 2004-04-16 03:38:19 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2004-04-16 03:38:19 +0000 |
| commit | 4b9a23e8ebd0367ee321c2461ea171865c05c14f (patch) | |
| tree | 9a2962b9ec8200da722b62938dc5580be3467ed4 | |
| parent | c60ec1802a9c1d8d13eb028ae624ad4e39524710 (diff) | |
| download | metacity-4b9a23e8ebd0367ee321c2461ea171865c05c14f.tar.gz | |
Fix unwanted mouse grab op on rapid click-and-release
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/display.c | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2004-04-15 Elijah Newren <newren@math.utah.edu> + + * src/display.c: Prevent unwanted grab op from occurring. + Previously, for some people under certain conditions, clicking and + releasing the mouse button rapidly enough would result in Metacity + starting a move operation due to ignoring the button release. + This should fix that problem (it does for me). See bug 136587. + 2004-04-11 Rob Adams <readams@readams.net> * configure.in: Make the --enable-xinerama switch work properly. diff --git a/src/display.c b/src/display.c index a6cfb81f..cd0f686a 100644 --- a/src/display.c +++ b/src/display.c @@ -1270,7 +1270,7 @@ event_callback (XEvent *event, if (display->grab_op != META_GRAB_OP_NONE && display->grab_window != NULL && - event->xany.serial > display->grab_start_serial && + event->xany.serial >= display->grab_start_serial && grab_op_is_mouse (display->grab_op)) meta_window_handle_mouse_grab_op_event (display->grab_window, event); } @@ -1337,7 +1337,7 @@ event_callback (XEvent *event, if ((window && grab_op_is_mouse (display->grab_op) && display->grab_button != (int) event->xbutton.button && - event->xany.serial > display->grab_start_serial && + event->xany.serial >= display->grab_start_serial && display->grab_window == window) || grab_op_is_keyboard (display->grab_op)) { @@ -1498,19 +1498,19 @@ event_callback (XEvent *event, break; case ButtonRelease: if (display->grab_window == window && - event->xany.serial > display->grab_start_serial && + event->xany.serial >= display->grab_start_serial && grab_op_is_mouse (display->grab_op)) meta_window_handle_mouse_grab_op_event (window, event); break; case MotionNotify: if (display->grab_window == window && - event->xany.serial > display->grab_start_serial && + event->xany.serial >= display->grab_start_serial && grab_op_is_mouse (display->grab_op)) meta_window_handle_mouse_grab_op_event (window, event); break; case EnterNotify: if (display->grab_window == window && - event->xany.serial > display->grab_start_serial && + event->xany.serial >= display->grab_start_serial && grab_op_is_mouse (display->grab_op)) meta_window_handle_mouse_grab_op_event (window, event); /* do this even if window->has_focus to avoid races */ @@ -1574,7 +1574,7 @@ event_callback (XEvent *event, break; case LeaveNotify: if (display->grab_window == window && - event->xany.serial > display->grab_start_serial && + event->xany.serial >= display->grab_start_serial && grab_op_is_mouse (display->grab_op)) meta_window_handle_mouse_grab_op_event (window, event); else if (window != NULL) |