brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Avoid entering MetaWindow on other than user pointer motions

Browse Source 
On one hand, this used to be handled generically in all the paths that
changed the MetaWaylandPointer focus surface, induced by user interaction
or not.

On the other hand, just listening for crossing events is not sufficient
since those also do happen programmatically. We must only listen to
crossing events that have a physical source device, meaning this was
created through user interaction.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/888
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2828>
This commit is contained in:
Carlos Garnacho 2023-02-01 17:41:12 +01:00
parent e58f716fb1
commit c4d8ba0f72
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,7 +681,33 @@ meta_wayland_pointer_update (MetaWaylandPointer *pointer,
event->type == CLUTTER_ENTER || event->type == CLUTTER_ENTER ||
event->type == CLUTTER_LEAVE) && event->type == CLUTTER_LEAVE) &&
!clutter_event_get_event_sequence (event)) !clutter_event_get_event_sequence (event))
repick_for_event (pointer, event); {
repick_for_event (pointer, event);
if (event->type == CLUTTER_ENTER)
{
MetaWindow *focus_window = NULL;
ClutterInputDevice *device;
device = clutter_event_get_source_device (event);
if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_LOGICAL)
{
if (pointer->focus_surface)
focus_window = meta_wayland_surface_get_window (pointer->focus_surface);
if (focus_window)
{
graphene_point_t pos;
clutter_event_get_coords (event, &pos.x, &pos.y);
meta_window_handle_enter (focus_window,
clutter_event_get_time (event),
pos.x, pos.y);
}
}
}
}
if (event->type == CLUTTER_MOTION || if (event->type == CLUTTER_MOTION ||
event->type == CLUTTER_BUTTON_PRESS || event->type == CLUTTER_BUTTON_PRESS ||
@ -1044,10 +1070,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
if (surface != NULL) if (surface != NULL)
{ {
ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
struct wl_client *client = wl_resource_get_client (surface->resource); struct wl_client *client = wl_resource_get_client (surface->resource);
graphene_point_t pos;
MetaWindow *focus_window;
pointer->focus_surface = surface; pointer->focus_surface = surface;
@ -1056,15 +1079,6 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
G_CALLBACK (focus_surface_destroyed), G_CALLBACK (focus_surface_destroyed),
pointer); pointer);
clutter_stage_get_device_coords (stage, pointer->device, NULL, &pos);
focus_window = meta_wayland_surface_get_window (pointer->focus_surface);
if (focus_window)
meta_window_handle_enter (focus_window,
/* XXX -- can we reliably get a timestamp for setting focus? */
clutter_get_current_event_time (),
pos.x, pos.y);
toplevel_window = surface_get_effective_window (pointer->focus_surface); toplevel_window = surface_get_effective_window (pointer->focus_surface);
if (toplevel_window) if (toplevel_window)
{ {