brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Make all events contain int64_t microsecond precision times

Browse Source 
Make this something common to all events, as opposed to just some motion
events. The clutter_event_get_time() function now converts to milliseconds
from this data.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3190>
This commit is contained in:
Carlos Garnacho 2023-08-17 15:07:36 +02:00 committed by Marge Bot
parent 09ade38002
commit 2e3550320a
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
clutter/clutter/clutter-event.c
View File

@ -37,7 +37,7 @@
struct _ClutterAnyEvent struct _ClutterAnyEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -46,7 +46,7 @@ struct _ClutterAnyEvent
struct _ClutterKeyEvent struct _ClutterKeyEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -61,7 +61,7 @@ struct _ClutterKeyEvent
struct _ClutterButtonEvent struct _ClutterButtonEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -78,7 +78,7 @@ struct _ClutterButtonEvent
struct _ClutterProximityEvent struct _ClutterProximityEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -88,7 +88,7 @@ struct _ClutterProximityEvent
struct _ClutterCrossingEvent struct _ClutterCrossingEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -103,7 +103,7 @@ struct _ClutterCrossingEvent
struct _ClutterMotionEvent struct _ClutterMotionEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -114,7 +114,6 @@ struct _ClutterMotionEvent
double *axes; double *axes;
ClutterInputDeviceTool *tool; ClutterInputDeviceTool *tool;
int64_t time_us;
double dx; double dx;
double dy; double dy;
double dx_unaccel; double dx_unaccel;
@ -126,7 +125,7 @@ struct _ClutterMotionEvent
struct _ClutterScrollEvent struct _ClutterScrollEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -146,7 +145,7 @@ struct _ClutterScrollEvent
struct _ClutterTouchEvent struct _ClutterTouchEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -161,7 +160,7 @@ struct _ClutterTouchEvent
struct _ClutterTouchpadPinchEvent struct _ClutterTouchpadPinchEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -181,7 +180,7 @@ struct _ClutterTouchpadPinchEvent
struct _ClutterTouchpadSwipeEvent struct _ClutterTouchpadSwipeEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -199,7 +198,7 @@ struct _ClutterTouchpadSwipeEvent
struct _ClutterTouchpadHoldEvent struct _ClutterTouchpadHoldEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -213,7 +212,7 @@ struct _ClutterTouchpadHoldEvent
struct _ClutterPadButtonEvent struct _ClutterPadButtonEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -226,7 +225,7 @@ struct _ClutterPadButtonEvent
struct _ClutterPadStripEvent struct _ClutterPadStripEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -241,7 +240,7 @@ struct _ClutterPadStripEvent
struct _ClutterPadRingEvent struct _ClutterPadRingEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -256,7 +255,7 @@ struct _ClutterPadRingEvent
struct _ClutterDeviceEvent struct _ClutterDeviceEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -265,7 +264,7 @@ struct _ClutterDeviceEvent
struct _ClutterIMEvent struct _ClutterIMEvent
{ {
ClutterEventType type; ClutterEventType type;
uint32_t time; int64_t time_us;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
@ -359,7 +358,7 @@ clutter_event_get_time (const ClutterEvent *event)
{ {
g_return_val_if_fail (event != NULL, CLUTTER_CURRENT_TIME); g_return_val_if_fail (event != NULL, CLUTTER_CURRENT_TIME);
return event->any.time; return us2ms (event->any.time_us);
} }
/** /**
@ -1678,10 +1677,7 @@ clutter_event_sequence_get_slot (const ClutterEventSequence *sequence)
int64_t int64_t
clutter_event_get_time_us (const ClutterEvent *event) clutter_event_get_time_us (const ClutterEvent *event)
{ {
if (event->type == CLUTTER_MOTION) return event->any.time_us;
return event->motion.time_us;
return 0;
} }
gboolean gboolean
@ -1848,7 +1844,7 @@ clutter_event_key_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->key.time = us2ms (timestamp_us); event->key.time_us = timestamp_us;
event->key.flags = flags; event->key.flags = flags;
event->key.modifier_state = modifiers; event->key.modifier_state = modifiers;
event->key.keyval = keyval; event->key.keyval = keyval;
@ -1882,7 +1878,7 @@ clutter_event_button_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->button.time = us2ms (timestamp_us); event->button.time_us = timestamp_us;
event->button.flags = flags; event->button.flags = flags;
event->button.x = coords.x; event->button.x = coords.x;
event->button.y = coords.y; event->button.y = coords.y;
@ -1928,13 +1924,12 @@ clutter_event_motion_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_MOTION); event = clutter_event_new (CLUTTER_MOTION);
event->motion.time = us2ms (timestamp_us); event->motion.time_us = timestamp_us;
event->motion.flags = flags; event->motion.flags = flags;
event->motion.x = coords.x; event->motion.x = coords.x;
event->motion.y = coords.y; event->motion.y = coords.y;
event->motion.modifier_state = modifiers; event->motion.modifier_state = modifiers;
event->motion.axes = axes; event->motion.axes = axes;
event->motion.time_us = timestamp_us;
event->motion.dx = delta.x; event->motion.dx = delta.x;
event->motion.dy = delta.y; event->motion.dy = delta.y;
event->motion.dx_unaccel = delta_unaccel.x; event->motion.dx_unaccel = delta_unaccel.x;
@ -1978,7 +1973,7 @@ clutter_event_scroll_smooth_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_SCROLL); event = clutter_event_new (CLUTTER_SCROLL);
event->scroll.time = us2ms (timestamp_us); event->scroll.time_us = timestamp_us;
event->scroll.flags = flags; event->scroll.flags = flags;
event->scroll.x = coords.x; event->scroll.x = coords.x;
event->scroll.y = coords.y; event->scroll.y = coords.y;
@ -2023,7 +2018,7 @@ clutter_event_scroll_discrete_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_SCROLL); event = clutter_event_new (CLUTTER_SCROLL);
event->scroll.time = us2ms (timestamp_us); event->scroll.time_us = timestamp_us;
event->scroll.flags = flags; event->scroll.flags = flags;
event->scroll.x = coords.x; event->scroll.x = coords.x;
event->scroll.y = coords.y; event->scroll.y = coords.y;
@ -2066,7 +2061,7 @@ clutter_event_crossing_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->crossing.time = us2ms (timestamp_us); event->crossing.time_us = timestamp_us;
event->crossing.flags = flags; event->crossing.flags = flags;
event->crossing.x = coords.x; event->crossing.x = coords.x;
event->crossing.y = coords.y; event->crossing.y = coords.y;
@ -2100,7 +2095,7 @@ clutter_event_touch_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->touch.time = us2ms (timestamp_us); event->touch.time_us = timestamp_us;
event->touch.flags = flags; event->touch.flags = flags;
event->touch.x = coords.x; event->touch.x = coords.x;
event->touch.y = coords.y; event->touch.y = coords.y;
@ -2130,7 +2125,7 @@ clutter_event_touch_cancel_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_TOUCH_CANCEL); event = clutter_event_new (CLUTTER_TOUCH_CANCEL);
event->touch.time = us2ms (timestamp_us); event->touch.time_us = timestamp_us;
event->touch.flags = flags; event->touch.flags = flags;
event->touch.sequence = sequence; event->touch.sequence = sequence;
@ -2157,7 +2152,7 @@ clutter_event_proximity_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->proximity.time = us2ms (timestamp_us); event->proximity.time_us = timestamp_us;
event->proximity.flags = flags; event->proximity.flags = flags;
event->proximity.tool = tool; event->proximity.tool = tool;
@ -2188,7 +2183,7 @@ clutter_event_touchpad_pinch_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_TOUCHPAD_PINCH); event = clutter_event_new (CLUTTER_TOUCHPAD_PINCH);
event->touchpad_pinch.time = us2ms (timestamp_us); event->touchpad_pinch.time_us = timestamp_us;
event->touchpad_pinch.flags = flags; event->touchpad_pinch.flags = flags;
event->touchpad_pinch.phase = phase; event->touchpad_pinch.phase = phase;
event->touchpad_pinch.x = coords.x; event->touchpad_pinch.x = coords.x;
@ -2226,7 +2221,7 @@ clutter_event_touchpad_swipe_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_TOUCHPAD_SWIPE); event = clutter_event_new (CLUTTER_TOUCHPAD_SWIPE);
event->touchpad_swipe.time = us2ms (timestamp_us); event->touchpad_swipe.time_us = timestamp_us;
event->touchpad_swipe.flags = flags; event->touchpad_swipe.flags = flags;
event->touchpad_swipe.phase = phase; event->touchpad_swipe.phase = phase;
event->touchpad_swipe.x = coords.x; event->touchpad_swipe.x = coords.x;
@ -2260,7 +2255,7 @@ clutter_event_touchpad_hold_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_TOUCHPAD_HOLD); event = clutter_event_new (CLUTTER_TOUCHPAD_HOLD);
event->touchpad_hold.time = us2ms (timestamp_us); event->touchpad_hold.time_us = timestamp_us;
event->touchpad_hold.flags = flags; event->touchpad_hold.flags = flags;
event->touchpad_hold.phase = phase; event->touchpad_hold.phase = phase;
event->touchpad_hold.x = coords.x; event->touchpad_hold.x = coords.x;
@ -2290,7 +2285,7 @@ clutter_event_pad_button_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->pad_button.time = us2ms (timestamp_us); event->pad_button.time_us = timestamp_us;
event->pad_button.flags = flags; event->pad_button.flags = flags;
event->pad_button.button = button; event->pad_button.button = button;
event->pad_button.group = group; event->pad_button.group = group;
@ -2318,7 +2313,7 @@ clutter_event_pad_strip_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_PAD_STRIP); event = clutter_event_new (CLUTTER_PAD_STRIP);
event->pad_strip.time = us2ms (timestamp_us); event->pad_strip.time_us = timestamp_us;
event->pad_strip.flags = flags; event->pad_strip.flags = flags;
event->pad_strip.strip_source = strip_source; event->pad_strip.strip_source = strip_source;
event->pad_strip.strip_number = strip; event->pad_strip.strip_number = strip;
@ -2348,7 +2343,7 @@ clutter_event_pad_ring_new (ClutterEventFlags flags,
event = clutter_event_new (CLUTTER_PAD_RING); event = clutter_event_new (CLUTTER_PAD_RING);
event->pad_ring.time = us2ms (timestamp_us); event->pad_ring.time_us = timestamp_us;
event->pad_ring.flags = flags; event->pad_ring.flags = flags;
event->pad_ring.ring_source = ring_source; event->pad_ring.ring_source = ring_source;
event->pad_ring.ring_number = ring; event->pad_ring.ring_number = ring;
@ -2376,7 +2371,7 @@ clutter_event_device_notify_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->device.time = us2ms (timestamp_us); event->device.time_us = timestamp_us;
event->device.flags = flags; event->device.flags = flags;
g_set_object (&event->device.device, source_device); g_set_object (&event->device.device, source_device);
@ -2402,7 +2397,7 @@ clutter_event_im_new (ClutterEventType type,
event = clutter_event_new (type); event = clutter_event_new (type);
event->im.time = us2ms (timestamp_us); event->im.time_us = timestamp_us;
event->im.flags = flags; event->im.flags = flags;
event->im.text = g_strdup (text); event->im.text = g_strdup (text);
event->im.offset = offset; event->im.offset = offset;
@ -2672,13 +2667,13 @@ clutter_event_describe (const ClutterEvent *event)
event_description = generate_event_description (event); event_description = generate_event_description (event);
modifiers_description = generate_modifiers_description (event); modifiers_description = generate_modifiers_description (event);
return g_strdup_printf ("'%s'%s%s, time=%u ms, modifiers=%s, %s", return g_strdup_printf ("'%s'%s%s, time=%" G_GINT64_FORMAT " us, modifiers=%s, %s",
clutter_event_get_name (event), clutter_event_get_name (event),
source_device ? " from " : "", source_device ? " from " : "",
source_device ? source_device ?
clutter_input_device_get_device_node (source_device) : clutter_input_device_get_device_node (source_device) :
"", "",
event->any.time, event->any.time_us,
modifiers_description, modifiers_description,
event_description); event_description);
} }