frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Emulate crossing for native window 

Emitting a LeaveNotify event every time the pointer leaves an X11 window
may confuse focus follow mouse mode in window managers such as
mutter/gnome-shell.

Keep the previously found X window and compare against the new one, and
if they match then it means the pointer has left an Xwayland window for
a native Wayland surface, only in this case fake the crossing to the
root window.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Olivier Fourdan 2016-06-23 15:31:30 +02:00 committed by Peter Hutterer
parent 48c5c23a1b
commit 6e5bec261c
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xwayland/xwayland-input.c
View File

@ -959,7 +959,7 @@ xwl_xy_to_window(ScreenPtr screen, SpritePtr sprite, int x, int y)
} }
} }
if (xwl_seat == NULL || !xwl_seat->focus_window) { if (xwl_seat == NULL) {
sprite->spriteTraceGood = 1; sprite->spriteTraceGood = 1;
return sprite->spriteTrace[0]; return sprite->spriteTrace[0];
} }
@ -969,6 +969,19 @@ xwl_xy_to_window(ScreenPtr screen, SpritePtr sprite, int x, int y)
xwl_seat->xwl_screen->XYToWindow = screen->XYToWindow; xwl_seat->xwl_screen->XYToWindow = screen->XYToWindow;
screen->XYToWindow = xwl_xy_to_window; screen->XYToWindow = xwl_xy_to_window;
/* If the pointer has left the Wayland surface but the DIX still
* finds the pointer within the previous X11 window, it means that
* the pointer has crossed to another native Wayland window, in this
* case, pretend we entered the root window so that a LeaveNotify
* event is emitted.
*/
if (xwl_seat->focus_window == NULL && xwl_seat->last_xwindow == ret) {
sprite->spriteTraceGood = 1;
return sprite->spriteTrace[0];
}
xwl_seat->last_xwindow = ret;
return ret; return ret;
} }

3
hw/xwayland/xwayland.c
View File

@ -324,7 +324,8 @@ xwl_unrealize_window(WindowPtr window)
xorg_list_for_each_entry(xwl_seat, &xwl_screen->seat_list, link) { xorg_list_for_each_entry(xwl_seat, &xwl_screen->seat_list, link) {
if (xwl_seat->focus_window && xwl_seat->focus_window->window == window) if (xwl_seat->focus_window && xwl_seat->focus_window->window == window)
xwl_seat->focus_window = NULL; xwl_seat->focus_window = NULL;
if (xwl_seat->last_xwindow == window)
xwl_seat->last_xwindow = NullWindow;
xwl_seat_clear_touch(xwl_seat, window); xwl_seat_clear_touch(xwl_seat, window);
} }

1
hw/xwayland/xwayland.h
View File

@ -132,6 +132,7 @@ struct xwl_seat {
struct wl_surface *cursor; struct wl_surface *cursor;
struct wl_callback *cursor_frame_cb; struct wl_callback *cursor_frame_cb;
Bool cursor_needs_update; Bool cursor_needs_update;
WindowPtr last_xwindow;
struct xorg_list touches; struct xorg_list touches;