diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-03-25 22:39:15 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-26 10:30:33 -0400 |
commit | f131d68fef9ba92aad1eb3d838a4b930d8f1f2bf (patch) | |
tree | 20b4af5363ed32e61663a85e71be19c1c24e21c5 | |
parent | 301464945501f74acc83e0f671839dfccf4d4f4f (diff) | |
download | gtk+-f131d68fef9ba92aad1eb3d838a4b930d8f1f2bf.tar.gz |
gdk: Add gdk_device_get_timestamp
Give each device a timestamp that reflects the last
user activity with that device, as reflected in the
events that are produced for this device.
-rw-r--r-- | gdk/gdkdevice.c | 28 | ||||
-rw-r--r-- | gdk/gdkdevice.h | 3 | ||||
-rw-r--r-- | gdk/gdkdeviceprivate.h | 5 | ||||
-rw-r--r-- | gdk/gdksurface.c | 5 |
4 files changed, 41 insertions, 0 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 24a7d8b3b3..ea0b78fb28 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -1381,3 +1381,31 @@ gdk_device_has_bidi_layouts (GdkDevice *device) return FALSE; } + +void +gdk_device_set_timestamp (GdkDevice *device, + guint32 timestamp) +{ + device->timestamp = timestamp; +} + +/** + * gdk_device_get_timestamp: + * @device: a `GdkDevice` + * + * Returns the timestamp of the last activity for this device. + * + * In practice, this means the timestamp of the last event that was + * received from the OS for this device. (GTK may occasionally produce + * events for a device that are not received from the OS, and will not + * update the timestamp). + * + * Returns: the timestamp of the last activity for this device + * + * Since: 4.2 + */ +guint32 +gdk_device_get_timestamp (GdkDevice *device) +{ + return device->timestamp; +} diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index 58d75199f8..720347e95f 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -117,6 +117,9 @@ GDK_AVAILABLE_IN_ALL GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device, double *win_x, double *win_y); + +GDK_AVAILABLE_IN_4_2 +guint32 gdk_device_get_timestamp (GdkDevice *device); G_END_DECLS #endif /* __GDK_DEVICE_H__ */ diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index a4cfffc28b..8a2be66155 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -89,6 +89,8 @@ struct _GdkDevice GdkSeat *seat; GdkDeviceTool *last_tool; + + guint32 timestamp; }; struct _GdkDeviceClass @@ -189,6 +191,9 @@ gboolean gdk_device_get_axis (GdkDevice *device, GdkAxisUse gdk_device_get_axis_use (GdkDevice *device, guint index_); +void gdk_device_set_timestamp (GdkDevice *device, + guint32 timestamp); + G_END_DECLS diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 6ad438093a..c55a9a8042 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -2248,13 +2248,18 @@ _gdk_windowing_got_event (GdkDisplay *display, GdkPointerSurfaceInfo *pointer_info = NULL; GdkDevice *device; GdkEventType type; + guint32 timestamp; _gdk_display_update_last_event (display, event); device = gdk_event_get_device (event); + timestamp = gdk_event_get_time (event); if (device) { + if (timestamp != GDK_CURRENT_TIME) + gdk_device_set_timestamp (device, timestamp); + if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD && gdk_device_get_source (device) != GDK_SOURCE_TABLET_PAD) { |