diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2020-06-23 00:24:12 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2020-06-23 23:42:53 +0200 |
commit | 6d2860efb74a7070bb035b07026ec154ed8b8e57 (patch) | |
tree | b54b130329eaf5455d3a54a7171e37278103cf84 | |
parent | 5f29b8fcecd3acba012e1bc50d2af35fdbd3590f (diff) | |
download | gtk+-6d2860efb74a7070bb035b07026ec154ed8b8e57.tar.gz |
gdk: Drop gdk_seat_get_logical_pointers()
Events come from hardware devices and are handled by controllers,
there's no need to use logical pointers, nor to peek them. Drop this
unused API.
-rw-r--r-- | docs/reference/gdk/gdk4-sections.txt | 1 | ||||
-rw-r--r-- | gdk/gdkseat.c | 28 | ||||
-rw-r--r-- | gdk/gdkseat.h | 4 | ||||
-rw-r--r-- | gdk/gdkseatdefault.c | 13 | ||||
-rw-r--r-- | gdk/gdkseatprivate.h | 2 | ||||
-rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 27 |
6 files changed, 0 insertions, 75 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 8b72b2ddb2..158fba7ec1 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -441,7 +441,6 @@ gdk_seat_get_capabilities gdk_seat_get_pointer gdk_seat_get_keyboard gdk_seat_get_physical_devices -gdk_seat_get_logical_pointers <SUBSECTION Standard> GDK_SEAT diff --git a/gdk/gdkseat.c b/gdk/gdkseat.c index d30e44d7c8..6505169c33 100644 --- a/gdk/gdkseat.c +++ b/gdk/gdkseat.c @@ -446,31 +446,3 @@ gdk_seat_get_tool (GdkSeat *seat, seat_class = GDK_SEAT_GET_CLASS (seat); return seat_class->get_tool (seat, serial, hw_id); } - -/** - * gdk_seat_get_logical_pointers: - * @seat: The #GdkSeat - * @capabilities: Queried capabilities - * - * Returns all logical pointers with the given capabilities driven by - * this @seat. - * - * On most windowing system backends this function will return a list - * with a single element (meaning that all input devices drive the same - * on-screen cursor). - * - * In other windowing systems where there can possibly be multiple - * foci (e.g. Wayland), this function will return all logical #GdkDevices - * that represent these. - * - * Returns: (transfer container) (element-type GdkDevice): A list - * of logical pointing devices - */ -GList * -gdk_seat_get_logical_pointers (GdkSeat *seat, - GdkSeatCapabilities capabilities) -{ - g_return_val_if_fail (GDK_IS_SEAT (seat), NULL); - - return GDK_SEAT_GET_CLASS (seat)->get_logical_pointers (seat, capabilities); -} diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h index 5bc912ac7e..960a6e306b 100644 --- a/gdk/gdkseat.h +++ b/gdk/gdkseat.h @@ -83,10 +83,6 @@ GdkDevice * gdk_seat_get_pointer (GdkSeat *seat); GDK_AVAILABLE_IN_ALL GdkDevice * gdk_seat_get_keyboard (GdkSeat *seat); -GDK_AVAILABLE_IN_ALL -GList * gdk_seat_get_logical_pointers (GdkSeat *seat, - GdkSeatCapabilities capabilities); - G_END_DECLS #endif /* __GDK_SEAT_H__ */ diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index 822c8d2e64..04906898fd 100644 --- a/gdk/gdkseatdefault.c +++ b/gdk/gdkseatdefault.c @@ -305,18 +305,6 @@ gdk_seat_default_get_tool (GdkSeat *seat, return NULL; } -static GList * -gdk_seat_default_get_logical_pointers (GdkSeat *seat, - GdkSeatCapabilities capabilities) -{ - GList *pointers = NULL; - - if (capabilities & GDK_SEAT_CAPABILITY_ALL_POINTING) - pointers = g_list_prepend (pointers, gdk_seat_get_pointer (seat)); - - return pointers; -} - static void gdk_seat_default_class_init (GdkSeatDefaultClass *klass) { @@ -332,7 +320,6 @@ gdk_seat_default_class_init (GdkSeatDefaultClass *klass) seat_class->get_logical_device = gdk_seat_default_get_logical_device; seat_class->get_physical_devices = gdk_seat_default_get_physical_devices; - seat_class->get_logical_pointers = gdk_seat_default_get_logical_pointers; seat_class->get_tool = gdk_seat_default_get_tool; } diff --git a/gdk/gdkseatprivate.h b/gdk/gdkseatprivate.h index b5139df8ee..07672f6a44 100644 --- a/gdk/gdkseatprivate.h +++ b/gdk/gdkseatprivate.h @@ -60,8 +60,6 @@ struct _GdkSeatClass GdkDeviceTool * (* get_tool) (GdkSeat *seat, guint64 serial, guint64 tool_id); - GList * (* get_logical_pointers) (GdkSeat *seat, - GdkSeatCapabilities capabilities); }; void gdk_seat_device_added (GdkSeat *seat, diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index d9b3ee8fa5..fe4d767e48 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -4767,32 +4767,6 @@ gdk_wayland_seat_get_physical_devices (GdkSeat *seat, return physical_devices; } -static GList * -gdk_wayland_seat_get_logical_pointers (GdkSeat *seat, - GdkSeatCapabilities capabilities) -{ - GdkWaylandSeat *wayland_seat = GDK_WAYLAND_SEAT (seat); - GList *logical_devices = NULL; - - if (capabilities & GDK_SEAT_CAPABILITY_POINTER) - logical_devices = g_list_prepend (logical_devices, wayland_seat->logical_pointer); - if (capabilities & GDK_SEAT_CAPABILITY_TOUCH) - logical_devices = g_list_prepend (logical_devices, wayland_seat->logical_touch); - if (capabilities & GDK_SEAT_CAPABILITY_TABLET_STYLUS) - { - GList *l; - - for (l = wayland_seat->tablets; l; l = l->next) - { - GdkWaylandTabletData *tablet = l->data; - - logical_devices = g_list_prepend (logical_devices, tablet->logical_device); - } - } - - return logical_devices; -} - static void gdk_wayland_seat_class_init (GdkWaylandSeatClass *klass) { @@ -4806,7 +4780,6 @@ gdk_wayland_seat_class_init (GdkWaylandSeatClass *klass) seat_class->ungrab = gdk_wayland_seat_ungrab; seat_class->get_logical_device = gdk_wayland_seat_get_logical_device; seat_class->get_physical_devices = gdk_wayland_seat_get_physical_devices; - seat_class->get_logical_pointers = gdk_wayland_seat_get_logical_pointers; } static void |