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

xwayland: Be smarter about picking seats for move/resize

Browse Source 
If we're going to move or resize an xwayland surface, we used to just
pick the first seat in the list for doing the move/resize.  Ideally we
can map from the XInput device doing the click to the corresponding
weston_seat, but that requires using xcb xinput, which isn't well supported.

Instead, lets use a simple heuristic that just picks the pointer that
most recently delivered a button event to the window in question.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73807
This commit is contained in:
Kristian Høgsberg
2014-04-30 16:10:14 -07:00
parent a4b620e7e7
commit 052ef4e7bc
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwayland/window-manager.c
+24 -2
View File
@@ -1199,6 +1199,26 @@ weston_wm_pick_seat(struct weston_wm *wm)
struct weston_seat, link); struct weston_seat, link);
} }
static struct weston_seat *
weston_wm_pick_seat_for_window(struct weston_wm_window *window)
{
struct weston_wm *wm = window->wm;
struct weston_seat *seat, *s;
seat = NULL;
wl_list_for_each(s, &wm->server->compositor->seat_list, link) {
if (s->pointer != NULL &&
s->pointer->focus == window->view &&
s->pointer->button_count > 0 &&
(seat == NULL ||
s->pointer->grab_serial -
seat->pointer->grab_serial < (1 << 30)))
seat = s;
}
return seat;
}
static void static void
weston_wm_window_handle_moveresize(struct weston_wm_window *window, weston_wm_window_handle_moveresize(struct weston_wm_window *window,
xcb_client_message_event_t *client_message) xcb_client_message_event_t *client_message)
@@ -1215,7 +1235,7 @@ weston_wm_window_handle_moveresize(struct weston_wm_window *window,
}; };
struct weston_wm *wm = window->wm; struct weston_wm *wm = window->wm;
struct weston_seat *seat = weston_wm_pick_seat(wm); struct weston_seat *seat = weston_wm_pick_seat_for_window(window);
int detail; int detail;
struct weston_shell_interface *shell_interface = struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface; &wm->server->compositor->shell_interface;
@@ -1579,7 +1599,7 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
xcb_button_press_event_t *button = (xcb_button_press_event_t *) event; xcb_button_press_event_t *button = (xcb_button_press_event_t *) event;
struct weston_shell_interface *shell_interface = struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface; &wm->server->compositor->shell_interface;
struct weston_seat *seat = weston_wm_pick_seat(wm); struct weston_seat *seat;
struct weston_wm_window *window; struct weston_wm_window *window;
enum theme_location location; enum theme_location location;
enum frame_button_state button_state; enum frame_button_state button_state;
@@ -1596,6 +1616,8 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
if (button->detail != 1 && button->detail != 2) if (button->detail != 1 && button->detail != 2)
return; return;
seat = weston_wm_pick_seat_for_window(window);
button_state = button->response_type == XCB_BUTTON_PRESS ? button_state = button->response_type == XCB_BUTTON_PRESS ?
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;