summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/reference/gdk/gdk4-sections.txt2
-rw-r--r--gdk/broadway/gdkdevice-broadway.c2
-rw-r--r--gdk/gdkseat.c10
-rw-r--r--gdk/gdkseat.h2
-rw-r--r--gdk/gdkseatdefault.c6
-rw-r--r--gdk/gdkseatprivate.h4
-rw-r--r--gdk/gdksurface.c4
-rw-r--r--gdk/wayland/gdkdevice-wayland.c6
-rw-r--r--gdk/x11/gdkmain-x11.c4
-rw-r--r--gtk/inspector/general.c2
-rw-r--r--testsuite/gdk/seat.c4
11 files changed, 23 insertions, 23 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index e25321cc23..a7c942a4e5 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -428,7 +428,7 @@ gdk_seat_get_display
gdk_seat_get_capabilities
gdk_seat_get_pointer
gdk_seat_get_keyboard
-gdk_seat_get_physical_devices
+gdk_seat_get_devices
gdk_seat_get_tools
<SUBSECTION Standard>
diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c
index 7b2d45670b..8ed1a9ccf4 100644
--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -135,7 +135,7 @@ _gdk_broadway_surface_grab_check_unmap (GdkSurface *surface,
seat = gdk_display_get_default_seat (display);
- devices = gdk_seat_get_physical_devices (seat, GDK_SEAT_CAPABILITY_ALL);
+ devices = gdk_seat_get_devices (seat, GDK_SEAT_CAPABILITY_ALL);
devices = g_list_prepend (devices, gdk_seat_get_keyboard (seat));
devices = g_list_prepend (devices, gdk_seat_get_pointer (seat));
diff --git a/gdk/gdkseat.c b/gdk/gdkseat.c
index 9c29968ae7..a88e8e7785 100644
--- a/gdk/gdkseat.c
+++ b/gdk/gdkseat.c
@@ -324,26 +324,26 @@ gdk_seat_ungrab (GdkSeat *seat)
}
/**
- * gdk_seat_get_physical_devices:
+ * gdk_seat_get_devices:
* @seat: a #GdkSeat
* @capabilities: capabilities to get devices for
*
- * Returns the physical devices that match the given capabilities.
+ * Returns the devices that match the given capabilities.
*
* Returns: (transfer container) (element-type GdkDevice): A list of #GdkDevices.
* The list must be freed with g_list_free(), the elements are owned
* by GDK and must not be freed.
**/
GList *
-gdk_seat_get_physical_devices (GdkSeat *seat,
- GdkSeatCapabilities capabilities)
+gdk_seat_get_devices (GdkSeat *seat,
+ GdkSeatCapabilities capabilities)
{
GdkSeatClass *seat_class;
g_return_val_if_fail (GDK_IS_SEAT (seat), NULL);
seat_class = GDK_SEAT_GET_CLASS (seat);
- return seat_class->get_physical_devices (seat, capabilities);
+ return seat_class->get_devices (seat, capabilities);
}
/**
diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h
index 1802d5348f..4924067bd0 100644
--- a/gdk/gdkseat.h
+++ b/gdk/gdkseat.h
@@ -75,7 +75,7 @@ GdkSeatCapabilities
gdk_seat_get_capabilities (GdkSeat *seat);
GDK_AVAILABLE_IN_ALL
-GList * gdk_seat_get_physical_devices (GdkSeat *seat,
+GList * gdk_seat_get_devices (GdkSeat *seat,
GdkSeatCapabilities capabilities);
GList * gdk_seat_get_tools (GdkSeat *seat);
diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c
index dd44233a6b..c9595bafdf 100644
--- a/gdk/gdkseatdefault.c
+++ b/gdk/gdkseatdefault.c
@@ -262,8 +262,8 @@ append_filtered (GList *list,
}
static GList *
-gdk_seat_default_get_physical_devices (GdkSeat *seat,
- GdkSeatCapabilities capabilities)
+gdk_seat_default_get_devices (GdkSeat *seat,
+ GdkSeatCapabilities capabilities)
{
GdkSeatDefaultPrivate *priv;
GList *devices = NULL;
@@ -315,7 +315,7 @@ gdk_seat_default_class_init (GdkSeatDefaultClass *klass)
seat_class->ungrab = gdk_seat_default_ungrab;
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_devices = gdk_seat_default_get_devices;
seat_class->get_tools = gdk_seat_default_get_tools;
}
diff --git a/gdk/gdkseatprivate.h b/gdk/gdkseatprivate.h
index 90e8a8674c..171a3bde3a 100644
--- a/gdk/gdkseatprivate.h
+++ b/gdk/gdkseatprivate.h
@@ -54,8 +54,8 @@ struct _GdkSeatClass
GdkDevice * (* get_logical_device) (GdkSeat *seat,
GdkSeatCapabilities capability);
- GList * (* get_physical_devices) (GdkSeat *seat,
- GdkSeatCapabilities capabilities);
+ GList * (* get_devices) (GdkSeat *seat,
+ GdkSeatCapabilities capabilities);
GList * (* get_tools) (GdkSeat *seat);
};
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 6cbbe391ee..63abe2595b 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -1686,7 +1686,7 @@ gdk_surface_hide (GdkSurface *surface)
seat = gdk_display_get_default_seat (display);
if (seat)
{
- devices = gdk_seat_get_physical_devices (seat, GDK_SEAT_CAPABILITY_ALL);
+ devices = gdk_seat_get_devices (seat, GDK_SEAT_CAPABILITY_ALL);
devices = g_list_prepend (devices, gdk_seat_get_keyboard (seat));
devices = g_list_prepend (devices, gdk_seat_get_pointer (seat));
}
@@ -1804,7 +1804,7 @@ gdk_surface_set_cursor (GdkSurface *surface,
device = gdk_seat_get_pointer (s->data);
gdk_surface_set_cursor_internal (surface, device, surface->cursor);
- devices = gdk_seat_get_physical_devices (s->data, GDK_SEAT_CAPABILITY_TABLET_STYLUS);
+ devices = gdk_seat_get_devices (s->data, GDK_SEAT_CAPABILITY_TABLET_STYLUS);
for (d = devices; d; d = d->next)
{
device = d->data;
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index bf04b19142..6ca368d9aa 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -4652,8 +4652,8 @@ gdk_wayland_seat_get_logical_device (GdkSeat *seat,
}
static GList *
-gdk_wayland_seat_get_physical_devices (GdkSeat *seat,
- GdkSeatCapabilities capabilities)
+gdk_wayland_seat_get_devices (GdkSeat *seat,
+ GdkSeatCapabilities capabilities)
{
GdkWaylandSeat *wayland_seat = GDK_WAYLAND_SEAT (seat);
GList *physical_devices = NULL;
@@ -4725,7 +4725,7 @@ gdk_wayland_seat_class_init (GdkWaylandSeatClass *klass)
seat_class->grab = gdk_wayland_seat_grab;
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_devices = gdk_wayland_seat_get_devices;
seat_class->get_tools = gdk_wayland_seat_get_tools;
}
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 4208ab881e..b7a7e3b9cd 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -141,7 +141,7 @@ _gdk_x11_surface_grab_check_unmap (GdkSurface *surface,
seat = gdk_display_get_default_seat (display);
- devices = gdk_seat_get_physical_devices (seat, GDK_SEAT_CAPABILITY_ALL);
+ devices = gdk_seat_get_devices (seat, GDK_SEAT_CAPABILITY_ALL);
devices = g_list_prepend (devices, gdk_seat_get_keyboard (seat));
devices = g_list_prepend (devices, gdk_seat_get_pointer (seat));
@@ -169,7 +169,7 @@ _gdk_x11_surface_grab_check_destroy (GdkSurface *surface)
seat = gdk_display_get_default_seat (display);
- devices = gdk_seat_get_physical_devices (seat, GDK_SEAT_CAPABILITY_ALL);
+ devices = gdk_seat_get_devices (seat, GDK_SEAT_CAPABILITY_ALL);
devices = g_list_prepend (devices, gdk_seat_get_keyboard (seat));
devices = g_list_prepend (devices, gdk_seat_get_pointer (seat));
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 499c1e65e7..a28ef07ccd 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -820,7 +820,7 @@ add_seat (GtkInspectorGeneral *gen,
g_free (text);
g_free (caps);
- list = gdk_seat_get_physical_devices (seat, GDK_SEAT_CAPABILITY_ALL);
+ list = gdk_seat_get_devices (seat, GDK_SEAT_CAPABILITY_ALL);
for (l = list; l; l = l->next)
add_device (gen, GDK_DEVICE (l->data));
diff --git a/testsuite/gdk/seat.c b/testsuite/gdk/seat.c
index 640e7d0c81..bd98236132 100644
--- a/testsuite/gdk/seat.c
+++ b/testsuite/gdk/seat.c
@@ -60,7 +60,7 @@ test_default_seat (void)
g_assert (caps != GDK_SEAT_CAPABILITY_NONE);
pointer0 = gdk_seat_get_pointer (seat0);
- physical_devices = gdk_seat_get_physical_devices (seat0, GDK_SEAT_CAPABILITY_POINTER);
+ physical_devices = gdk_seat_get_devices (seat0, GDK_SEAT_CAPABILITY_POINTER);
if ((caps & GDK_SEAT_CAPABILITY_POINTER) != 0)
{
@@ -84,7 +84,7 @@ test_default_seat (void)
}
keyboard0 = gdk_seat_get_keyboard (seat0);
- physical_devices = gdk_seat_get_physical_devices (seat0, GDK_SEAT_CAPABILITY_KEYBOARD);
+ physical_devices = gdk_seat_get_devices (seat0, GDK_SEAT_CAPABILITY_KEYBOARD);
if ((caps & GDK_SEAT_CAPABILITY_KEYBOARD) != 0)
{
View Lorry Controller Status