isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends: Drop GDK device querying code from MetaCursorTracker

Browse Source 
Clutter behavior is now equivalent to GDK's on X11, avoid poking to
GDK here.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-06-06 13:04:32 +02:00
parent 52da5fe4f2
commit 8b2a89041a
1 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/backends/meta-cursor-tracker.c
View File

@ -31,8 +31,6 @@
#include "backends/meta-cursor-tracker-private.h" #include "backends/meta-cursor-tracker-private.h"
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <string.h> #include <string.h>
#include "backends/meta-backend-private.h" #include "backends/meta-backend-private.h"
@ -464,29 +462,11 @@ meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
g_signal_emit (tracker, signals[CURSOR_MOVED], 0, new_x, new_y); g_signal_emit (tracker, signals[CURSOR_MOVED], 0, new_x, new_y);
} }
static void void
get_pointer_position_gdk (int *x, meta_cursor_tracker_get_pointer (MetaCursorTracker *tracker,
int *x,
int *y, int *y,
int *mods) ClutterModifierType *mods)
{
GdkSeat *gseat;
GdkDevice *gdevice;
GdkScreen *gscreen;
gseat = gdk_display_get_default_seat (gdk_display_get_default ());
gdevice = gdk_seat_get_pointer (gseat);
gdk_device_get_position (gdevice, &gscreen, x, y);
if (mods)
gdk_device_get_state (gdevice,
gdk_screen_get_root_window (gscreen),
NULL, (GdkModifierType*)mods);
}
static void
get_pointer_position_clutter (int *x,
int *y,
int *mods)
{ {
ClutterSeat *seat; ClutterSeat *seat;
ClutterInputDevice *cdevice; ClutterInputDevice *cdevice;
@ -504,23 +484,6 @@ get_pointer_position_clutter (int *x,
*mods = clutter_input_device_get_modifier_state (cdevice); *mods = clutter_input_device_get_modifier_state (cdevice);
} }
void
meta_cursor_tracker_get_pointer (MetaCursorTracker *tracker,
int *x,
int *y,
ClutterModifierType *mods)
{
/* We can't use the clutter interface when not running as a wayland compositor,
because we need to query the server, rather than using the last cached value.
OTOH, on wayland we can't use GDK, because that only sees the events
we forward to xwayland.
*/
if (meta_is_wayland_compositor ())
get_pointer_position_clutter (x, y, (int*)mods);
else
get_pointer_position_gdk (x, y, (int*)mods);
}
void void
meta_cursor_tracker_track_position (MetaCursorTracker *tracker) meta_cursor_tracker_track_position (MetaCursorTracker *tracker)
{ {