diff --git a/clutter/clutter.symbols b/clutter/clutter.symbols index ba61d37a0..7da395d42 100644 --- a/clutter/clutter.symbols +++ b/clutter/clutter.symbols @@ -1594,6 +1594,7 @@ clutter_x11_add_filter clutter_x11_disable_event_retrieval clutter_x11_enable_xinput clutter_x11_event_get_key_group +clutter_x11_event_sequence_get_touch_detail clutter_x11_filter_return_get_type clutter_x11_get_current_event_time clutter_x11_get_default_display diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c index 292ee76d6..db55c97e7 100644 --- a/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/x11/clutter-device-manager-xi2.c @@ -1098,10 +1098,11 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, if (xev->flags & XITouchEmulatingPointer) _clutter_event_set_pointer_emulated (event, TRUE); - CLUTTER_NOTE (EVENT, "touch %s: win:0x%x device:%s (x:%.2f, y:%.2f, axes:%s)", + CLUTTER_NOTE (EVENT, "touch %s: win:0x%x device:%s (seq:%d, x:%.2f, y:%.2f, axes:%s)", event->type == CLUTTER_TOUCH_BEGIN ? "begin" : "end", (unsigned int) stage_x11->xwin, event->touch.device->device_name, + GPOINTER_TO_UINT (event->touch.sequence), event->touch.x, event->touch.y, event->touch.axes != NULL ? "yes" : "no"); @@ -1144,9 +1145,10 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, if (xev->flags & XITouchEmulatingPointer) _clutter_event_set_pointer_emulated (event, TRUE); - CLUTTER_NOTE (EVENT, "touch update: win:0x%x device:%s (x:%.2f, y:%.2f, axes:%s)", + CLUTTER_NOTE (EVENT, "touch update: win:0x%x device:%s (seq:%d, x:%.2f, y:%.2f, axes:%s)", (unsigned int) stage_x11->xwin, event->touch.device->device_name, + GPOINTER_TO_UINT (event->touch.sequence), event->touch.x, event->touch.y, event->touch.axes != NULL ? "yes" : "no"); diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index 16a34bc4c..9eedbcd2a 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/clutter/x11/clutter-event-x11.c @@ -375,3 +375,21 @@ clutter_x11_event_get_key_group (const ClutterEvent *event) return event_x11->key_group; } + +/** + * clutter_x11_event_sequence_get_touch_detail: + * @sequence: a #ClutterEventSequence + * + * Retrieves the touch detail froma #ClutterEventSequence. + * + * Return value: the touch detail + * + * Since: 1.12 + */ +guint +clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence) +{ + g_return_val_if_fail (sequence != NULL, 0); + + return GPOINTER_TO_UINT (sequence); +} diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h index f641982c4..df04a8323 100644 --- a/clutter/x11/clutter-x11.h +++ b/clutter/x11/clutter-x11.h @@ -140,6 +140,8 @@ Time clutter_x11_get_current_event_time (void); gint clutter_x11_event_get_key_group (const ClutterEvent *event); +guint clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence); + G_END_DECLS #endif /* __CLUTTER_X11_H__ */ diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index b3bb07bcc..287644395 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -1364,6 +1364,7 @@ clutter_x11_get_input_devices clutter_x11_has_xinput clutter_x11_enable_xinput clutter_x11_event_get_key_group +clutter_x11_event_sequence_get_touch_detail ClutterX11XInputDevice