mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: Handle race between multi-pointer motion and clicks

Browse Source 
Make sure we're looking at the right location.  The frame could have
received a motion event from a pointer from a different wl_seat, but
under X it looks like our core pointer moved.  Move the frame pointer
to the button press location before deciding what to do.
This commit is contained in:
Kristian Høgsberg
2014-04-30 16:52:30 -07:00
parent e5c1ae9368
commit 8c3c738718
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwayland/window-manager.c
+7
View File
@@ -1629,6 +1629,13 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
FRAME_BUTTON_PRESSED : FRAME_BUTTON_RELEASED; FRAME_BUTTON_PRESSED : FRAME_BUTTON_RELEASED;
button_id = button->detail == 1 ? BTN_LEFT : BTN_RIGHT; button_id = button->detail == 1 ? BTN_LEFT : BTN_RIGHT;
/* Make sure we're looking at the right location. The frame
* could have received a motion event from a pointer from a
* different wl_seat, but under X it looks like our core
* pointer moved. Move the frame pointer to the button press
* location before deciding what to do. */
location = frame_pointer_motion(window->frame, NULL,
button->event_x, button->event_y);
location = frame_pointer_button(window->frame, NULL, location = frame_pointer_button(window->frame, NULL,
button_id, button_state); button_id, button_state);
if (frame_status(window->frame) & FRAME_STATUS_REPAINT) if (frame_status(window->frame) & FRAME_STATUS_REPAINT)