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

window: Move has_pointer_x11 to WindowX11

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3211>
This commit is contained in:
Bilal Elmoussaoui 2023-08-24 15:45:06 +02:00 committed by Robert Mader
parent 19a36b8879
commit 0236506cff
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/window.c
View File

@ -90,6 +90,10 @@
#include "x11/window-x11.h" #include "x11/window-x11.h"
#include "x11/xprops.h" #include "x11/xprops.h"
#ifdef HAVE_X11_CLIENT
#include "x11/window-x11-private.h"
#endif
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
#include "wayland/meta-wayland-private.h" #include "wayland/meta-wayland-private.h"
#include "wayland/meta-wayland-surface-private.h" #include "wayland/meta-wayland-surface-private.h"
@ -7314,36 +7318,17 @@ window_has_pointer_wayland (MetaWindow *window)
return pointer_actor && clutter_actor_contains (window_actor, pointer_actor); return pointer_actor && clutter_actor_contains (window_actor, pointer_actor);
} }
static gboolean
window_has_pointer_x11 (MetaWindow *window)
{
MetaX11Display *x11_display = window->display->x11_display;
Window root, child;
double root_x, root_y, x, y;
XIButtonState buttons;
XIModifierState mods;
XIGroupState group;
meta_x11_error_trap_push (x11_display);
XIQueryPointer (x11_display->xdisplay,
META_VIRTUAL_CORE_POINTER_ID,
x11_display->xroot,
&root, &child,
&root_x, &root_y, &x, &y,
&buttons, &mods, &group);
meta_x11_error_trap_pop (x11_display);
free (buttons.mask);
return meta_x11_display_lookup_x_window (x11_display, child) == window;
}
gboolean gboolean
meta_window_has_pointer (MetaWindow *window) meta_window_has_pointer (MetaWindow *window)
{ {
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())
return window_has_pointer_wayland (window); return window_has_pointer_wayland (window);
#ifdef HAVE_X11_CLIENT
else else
return window_has_pointer_x11 (window); return meta_window_x11_has_pointer (window);
#else
g_assert_not_reached ();
#endif
} }
void void

2
src/x11/window-x11-private.h
View File

@ -100,4 +100,6 @@ Window meta_window_x11_get_user_time_window (MetaWindow *window);
Window meta_window_x11_get_xtransient_for (MetaWindow *window); Window meta_window_x11_get_xtransient_for (MetaWindow *window);
gboolean meta_window_x11_has_pointer (MetaWindow *window);
G_END_DECLS G_END_DECLS

23
src/x11/window-x11.c
View File

@ -4463,3 +4463,26 @@ meta_window_x11_get_xtransient_for (MetaWindow *window)
return None; return None;
} }
gboolean
meta_window_x11_has_pointer (MetaWindow *window)
{
MetaX11Display *x11_display = window->display->x11_display;
Window root, child;
double root_x, root_y, x, y;
XIButtonState buttons;
XIModifierState mods;
XIGroupState group;
meta_x11_error_trap_push (x11_display);
XIQueryPointer (x11_display->xdisplay,
META_VIRTUAL_CORE_POINTER_ID,
x11_display->xroot,
&root, &child,
&root_x, &root_y, &x, &y,
&buttons, &mods, &group);
meta_x11_error_trap_pop (x11_display);
free (buttons.mask);
return meta_x11_display_lookup_x_window (x11_display, child) == window;
}