diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-06-18 19:22:20 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-06-18 19:22:20 +0100 |
| commit | 1c856a208fdc9b435be60973e9c465f19b532863 (patch) | |
| tree | ac979f50a9f429a10928e0066ae1be312af8c23b /gdk/gdkdeviceprivate.h | |
| parent | c7916c8e480f08c03f7ce9f77cbba87f2c9d949b (diff) | |
| download | gtk+-1c856a208fdc9b435be60973e9c465f19b532863.tar.gz | |
Rename master and slave device
We already use the "logical/virtual" and "physical" names in the
documentation, there's no reason to use loaded terms just because X11
uses them.
Diffstat (limited to 'gdk/gdkdeviceprivate.h')
| -rw-r--r-- | gdk/gdkdeviceprivate.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index e48c06f0b2..712ab70581 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -41,11 +41,11 @@ struct _GdkDevice gboolean has_cursor; GdkAxisFlags axis_flags; GdkDisplay *display; - /* Paired master for master, - * associated master for slaves + /* The paired logical device for logical devices, + * or the associated logical device for physical ones */ GdkDevice *associated; - GList *slaves; + GList *physical_devices; GdkDeviceType type; GArray *axes; guint num_touches; @@ -132,10 +132,11 @@ gboolean _gdk_device_translate_axis (GdkDevice *device, GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device, gint n_events); -void _gdk_device_add_slave (GdkDevice *device, - GdkDevice *slave); -void _gdk_device_remove_slave (GdkDevice *device, - GdkDevice *slave); +void _gdk_device_add_physical_device (GdkDevice *device, + GdkDevice *physical); +void _gdk_device_remove_physical_device (GdkDevice *device, + GdkDevice *physical); + void _gdk_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, |