[gtk+/wip/wayland-tablet-v2: 62/66] wayland: Implement pad event emission
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/wayland-tablet-v2: 62/66] wayland: Implement pad event emission
- Date: Fri, 19 Aug 2016 13:08:27 +0000 (UTC)
commit 7d72eea3ec5a8df29d0c874c3caeaf5f19b8925f
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Aug 4 19:44:44 2016 +0200
wayland: Implement pad event emission
We now send all the set of button/ring/strip/group_mode events.
gdk/wayland/gdkdevice-wayland.c | 99 +++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
---
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index d3c3124..4866f63 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -2775,6 +2775,24 @@ _gdk_wayland_seat_remove_tablet_pad (GdkWaylandSeat *seat,
g_free (pad);
}
+static GdkWaylandTabletPadGroupData *
+tablet_pad_lookup_button_group (GdkWaylandTabletPadData *pad,
+ uint32_t button)
+{
+ GdkWaylandTabletPadGroupData *group;
+ GList *l;
+
+ for (l = pad->mode_groups; l; l = l->next)
+ {
+ group = l->data;
+
+ if (g_list_find (group->buttons, GUINT_TO_POINTER (button)))
+ return group;
+ }
+
+ return NULL;
+}
+
static void
tablet_handle_name (void *data,
struct zwp_tablet_v2 *wp_tablet,
@@ -3885,7 +3903,25 @@ tablet_pad_ring_handle_frame (void *data,
struct zwp_tablet_pad_ring_v2 *wp_tablet_pad_ring,
uint32_t time)
{
+ GdkWaylandTabletPadGroupData *group = data;
+ GdkWaylandTabletPadData *pad = group->pad;
+ GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
+ GdkEvent *event;
+
g_debug (G_STRLOC ": %s ring = %p", G_STRFUNC, wp_tablet_pad_ring);
+
+ event = gdk_event_new (GDK_PAD_RING);
+ g_set_object (&event->pad_axis.window, seat->keyboard_focus);
+ event->pad_axis.time = time;
+ event->pad_axis.group = g_list_index (pad->mode_groups, group);
+ event->pad_axis.index = g_list_index (pad->rings, wp_tablet_pad_ring);
+ event->pad_axis.mode = group->current_mode;
+ event->pad_axis.value = group->axis_tmp_info.value;
+ gdk_event_set_device (event, pad->device);
+ gdk_event_set_source_device (event, pad->device);
+
+ _gdk_wayland_display_deliver_event (gdk_seat_get_display (pad->seat),
+ event);
}
static const struct zwp_tablet_pad_ring_v2_listener tablet_pad_ring_listener = {
@@ -3938,8 +3974,27 @@ tablet_pad_strip_handle_frame (void *data,
struct zwp_tablet_pad_strip_v2 *wp_tablet_pad_strip,
uint32_t time)
{
+ GdkWaylandTabletPadGroupData *group = data;
+ GdkWaylandTabletPadData *pad = group->pad;
+ GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
+ GdkEvent *event;
+
g_debug (G_STRLOC ": %s strip = %p",
G_STRFUNC, wp_tablet_pad_strip);
+
+ event = gdk_event_new (GDK_PAD_STRIP);
+ g_set_object (&event->pad_axis.window, seat->keyboard_focus);
+ event->pad_axis.time = time;
+ event->pad_axis.group = g_list_index (pad->mode_groups, group);
+ event->pad_axis.index = g_list_index (pad->strips, wp_tablet_pad_strip);
+ event->pad_axis.mode = group->current_mode;
+ event->pad_axis.value = group->axis_tmp_info.value;
+
+ gdk_event_set_device (event, pad->device);
+ gdk_event_set_source_device (event, pad->device);
+
+ _gdk_wayland_display_deliver_event (gdk_seat_get_display (pad->seat),
+ event);
}
static const struct zwp_tablet_pad_strip_v2_listener tablet_pad_strip_listener = {
@@ -4031,8 +4086,29 @@ tablet_pad_group_handle_mode (void *data,
uint32_t serial,
uint32_t mode)
{
+ GdkWaylandTabletPadGroupData *group = data;
+ GdkWaylandTabletPadData *pad = group->pad;
+ GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
+ GdkEvent *event;
+ guint n_group;
+
g_debug (G_STRLOC ": %s pad group = %p, mode = %d",
G_STRFUNC, wp_tablet_pad_group, mode);
+
+ group->mode_switch_serial = serial;
+ group->current_mode = mode;
+ n_group = g_list_index (pad->mode_groups, group);
+
+ event = gdk_event_new (GDK_PAD_GROUP_MODE);
+ g_set_object (&event->pad_button.window, seat->keyboard_focus);
+ event->pad_group_mode.group = n_group;
+ event->pad_group_mode.mode = mode;
+ event->pad_group_mode.time = time;
+ gdk_event_set_device (event, pad->device);
+ gdk_event_set_source_device (event, pad->device);
+
+ _gdk_wayland_display_deliver_event (gdk_seat_get_display (pad->seat),
+ event);
}
static const struct zwp_tablet_pad_group_v2_listener tablet_pad_group_listener = {
@@ -4124,8 +4200,31 @@ tablet_pad_handle_button (void *data,
uint32_t button,
uint32_t state)
{
+ GdkWaylandTabletPadData *pad = data;
+ GdkWaylandTabletPadGroupData *group;
+ GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
+ GdkEvent *event;
+ gint n_group;
+
g_debug (G_STRLOC ": %s pad = %p, button = %d, state = %d",
G_STRFUNC, wp_tablet_pad, button, state);
+
+ group = tablet_pad_lookup_button_group (pad, button);
+ n_group = g_list_index (pad->mode_groups, group);
+
+ event = gdk_event_new (state == ZWP_TABLET_PAD_V2_BUTTON_STATE_PRESSED ?
+ GDK_PAD_BUTTON_PRESS :
+ GDK_PAD_BUTTON_RELEASE);
+ g_set_object (&event->pad_button.window, seat->keyboard_focus);
+ event->pad_button.button = button;
+ event->pad_button.group = n_group;
+ event->pad_button.mode = group->current_mode;
+ event->pad_button.time = time;
+ gdk_event_set_device (event, pad->device);
+ gdk_event_set_source_device (event, pad->device);
+
+ _gdk_wayland_display_deliver_event (gdk_seat_get_display (pad->seat),
+ event);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]