isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-25 12:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: remove pressed button checks from meta_wayland_pointer_can_grab_surface()

Browse Source 
Leave these checks up to the callers, the only uses of this function
(indirect, through meta_wayland_seat_get_grab_info) are
[wl_shell|xdg]_surface.move/resize/show_window_menu.

In move/resize it makes sense to check for a button being pressed, because
we must expect a button release event. However for xdg_surface.show_window_menu
we 1) don't strictly need further events and 2) we must account for press+release
event pairs being processed at once in the compositor before the client sees
the former.

That is eg. the case of touchpad 2nd/3rd button tap emulation, multifinger
taps will emit the event pair at once, so when the client manages to request
xdg_surface.show_window_menu, it'll be too late in the compositor side, so the
request is ignored.

https://bugzilla.gnome.org/show_bug.cgi?id=764519
This commit is contained in:
Carlos Garnacho 2016-04-04 18:07:42 +02:00
parent 08ac192b9d
commit a6cc35e595
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland/meta-wayland-pointer.c
View File

@ -1138,8 +1138,7 @@ meta_wayland_pointer_can_grab_surface (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
uint32_t serial) uint32_t serial)
{ {
return (pointer->button_count > 0 && return (pointer->grab_serial == serial &&
pointer->grab_serial == serial &&
pointer->focus_surface == surface); pointer->focus_surface == surface);
} }

12
src/wayland/meta-wayland-seat.c
View File

@ -374,10 +374,11 @@ meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
gboolean gboolean
meta_wayland_seat_get_grab_info (MetaWaylandSeat *seat, meta_wayland_seat_get_grab_info (MetaWaylandSeat *seat,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
uint32_t serial, uint32_t serial,
gfloat *x, gboolean require_pressed,
gfloat *y) gfloat *x,
gfloat *y)
{ {
ClutterEventSequence *sequence = NULL; ClutterEventSequence *sequence = NULL;
gboolean can_grab_surface = FALSE; gboolean can_grab_surface = FALSE;
@ -391,7 +392,8 @@ meta_wayland_seat_get_grab_info (MetaWaylandSeat *seat,
} }
else else
{ {
if ((seat->capabilities & WL_SEAT_CAPABILITY_POINTER) != 0) if ((seat->capabilities & WL_SEAT_CAPABILITY_POINTER) != 0 &&
(!require_pressed || seat->pointer.button_count > 0))
can_grab_surface = meta_wayland_pointer_can_grab_surface (&seat->pointer, surface, serial); can_grab_surface = meta_wayland_pointer_can_grab_surface (&seat->pointer, surface, serial);
if (can_grab_surface) if (can_grab_surface)

9
src/wayland/meta-wayland-seat.h
View File

@ -60,10 +60,11 @@ void meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
void meta_wayland_seat_repick (MetaWaylandSeat *seat); void meta_wayland_seat_repick (MetaWaylandSeat *seat);
gboolean meta_wayland_seat_get_grab_info (MetaWaylandSeat *seat, gboolean meta_wayland_seat_get_grab_info (MetaWaylandSeat *seat,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
uint32_t serial, uint32_t serial,
gfloat *x, gboolean require_pressed,
gfloat *y); gfloat *x,
gfloat *y);
gboolean meta_wayland_seat_can_popup (MetaWaylandSeat *seat, gboolean meta_wayland_seat_can_popup (MetaWaylandSeat *seat,
uint32_t serial); uint32_t serial);

10
src/wayland/meta-wayland-surface.c
View File

@ -1362,7 +1362,7 @@ xdg_surface_show_window_menu (struct wl_client *client,
MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource); MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
if (!meta_wayland_seat_get_grab_info (seat, surface, serial, NULL, NULL)) if (!meta_wayland_seat_get_grab_info (seat, surface, serial, FALSE, NULL, NULL))
return; return;
meta_window_show_menu (surface->window, META_WINDOW_MENU_WM, meta_window_show_menu (surface->window, META_WINDOW_MENU_WM,
@ -1407,7 +1407,7 @@ xdg_surface_move (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
gfloat x, y; gfloat x, y;
if (!meta_wayland_seat_get_grab_info (seat, surface, serial, &x, &y)) if (!meta_wayland_seat_get_grab_info (seat, surface, serial, TRUE, &x, &y))
return; return;
begin_grab_op_on_surface (surface, seat, META_GRAB_OP_MOVING, x, y); begin_grab_op_on_surface (surface, seat, META_GRAB_OP_MOVING, x, y);
@ -1447,7 +1447,7 @@ xdg_surface_resize (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
gfloat x, y; gfloat x, y;
if (!meta_wayland_seat_get_grab_info (seat, surface, serial, &x, &y)) if (!meta_wayland_seat_get_grab_info (seat, surface, serial, TRUE, &x, &y))
return; return;
begin_grab_op_on_surface (surface, seat, grab_op_for_xdg_surface_resize_edge (edges), x, y); begin_grab_op_on_surface (surface, seat, grab_op_for_xdg_surface_resize_edge (edges), x, y);
@ -1790,7 +1790,7 @@ wl_shell_surface_move (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
gfloat x, y; gfloat x, y;
if (!meta_wayland_seat_get_grab_info (seat, surface, serial, &x, &y)) if (!meta_wayland_seat_get_grab_info (seat, surface, serial, TRUE, &x, &y))
return; return;
begin_grab_op_on_surface (surface, seat, META_GRAB_OP_MOVING, x, y); begin_grab_op_on_surface (surface, seat, META_GRAB_OP_MOVING, x, y);
@ -1830,7 +1830,7 @@ wl_shell_surface_resize (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
gfloat x, y; gfloat x, y;
if (!meta_wayland_seat_get_grab_info (seat, surface, serial, &x, &y)) if (!meta_wayland_seat_get_grab_info (seat, surface, serial, TRUE, &x, &y))
return; return;
begin_grab_op_on_surface (surface, seat, grab_op_for_wl_shell_surface_resize_edge (edges), x, y); begin_grab_op_on_surface (surface, seat, grab_op_for_wl_shell_surface_resize_edge (edges), x, y);