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

wayland-pointer: Call meta_window_handle_enter when focusing desktop

Browse Source 
When the desktop is focused instead of a window we want to tell the core
about this to handle focus-mode mouse. This is handled by looking for
CLUTTER_LEAVE events where the newly focused window is NULL.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3258>
This commit is contained in:
Sebastian Wick 2023-09-08 22:31:36 +02:00 committed by Marge Bot
parent 49d1af2023
commit de2daf65b4
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -685,6 +685,12 @@ void
meta_wayland_pointer_update (MetaWaylandPointer *pointer, meta_wayland_pointer_update (MetaWaylandPointer *pointer,
const ClutterEvent *event) const ClutterEvent *event)
{ {
MetaWaylandInputDevice *input_device = META_WAYLAND_INPUT_DEVICE (pointer);
MetaWaylandSeat *seat = meta_wayland_input_device_get_seat (input_device);
MetaWaylandCompositor *compositor = meta_wayland_seat_get_compositor (seat);
MetaContext *context =
meta_wayland_compositor_get_context (compositor);
MetaDisplay *display = meta_context_get_display (context);
ClutterEventType event_type; ClutterEventType event_type;
event_type = clutter_event_type (event); event_type = clutter_event_type (event);
@ -696,31 +702,27 @@ meta_wayland_pointer_update (MetaWaylandPointer *pointer,
{ {
repick_for_event (pointer, event); repick_for_event (pointer, event);
if (event_type == CLUTTER_ENTER) if (event_type == CLUTTER_ENTER || event_type == CLUTTER_LEAVE)
{ {
MetaWindow *focus_window = NULL;
ClutterInputDevice *device; ClutterInputDevice *device;
graphene_point_t pos;
MetaWindow *focus_window = NULL;
device = clutter_event_get_source_device (event); device = clutter_event_get_source_device (event);
clutter_event_get_coords (event, &pos.x, &pos.y);
if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_LOGICAL) if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_LOGICAL)
{ {
if (pointer->focus_surface) if (pointer->focus_surface)
focus_window = meta_wayland_surface_get_window (pointer->focus_surface); focus_window = meta_wayland_surface_get_window (pointer->focus_surface);
if (focus_window) meta_display_handle_window_enter (display,
{
graphene_point_t pos;
clutter_event_get_coords (event, &pos.x, &pos.y);
meta_display_handle_window_enter (focus_window->display,
focus_window, focus_window,
clutter_event_get_time (event), clutter_event_get_time (event),
pos.x, pos.y); pos.x, pos.y);
} }
} }
} }
}
if (event_type == CLUTTER_MOTION || if (event_type == CLUTTER_MOTION ||
event_type == CLUTTER_BUTTON_PRESS || event_type == CLUTTER_BUTTON_PRESS ||