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

clutter: Add current group mode on pad events

Browse Source 
This info can be obtained here right away, so we don't need
backend-dependent paths in the upper layers.

https://bugzilla.gnome.org/show_bug.cgi?id=771098
This commit is contained in:
Carlos Garnacho 2016-12-28 11:32:07 +01:00
parent 938891a2e2
commit 8bcdf9ba61
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter/clutter-event.h
View File

@ -508,6 +508,7 @@ struct _ClutterPadButtonEvent
guint32 button; guint32 button;
guint32 group; guint32 group;
ClutterInputDevice *device; ClutterInputDevice *device;
guint32 mode;
}; };
struct _ClutterPadStripEvent struct _ClutterPadStripEvent
@ -523,6 +524,7 @@ struct _ClutterPadStripEvent
guint32 strip_number; guint32 strip_number;
guint32 group; guint32 group;
gdouble value; gdouble value;
guint32 mode;
}; };
struct _ClutterPadRingEvent struct _ClutterPadRingEvent
@ -538,6 +540,7 @@ struct _ClutterPadRingEvent
guint32 ring_number; guint32 ring_number;
guint32 group; guint32 group;
gdouble angle; gdouble angle;
guint32 mode;
}; };
/** /**

21
clutter/clutter/evdev/clutter-device-manager-evdev.c
View File

@ -668,6 +668,7 @@ notify_pad_button (ClutterInputDevice *input_device,
guint64 time_us, guint64 time_us,
guint32 button, guint32 button,
guint32 mode_group, guint32 mode_group,
guint32 mode,
guint32 pressed) guint32 pressed)
{ {
ClutterInputDeviceEvdev *device_evdev; ClutterInputDeviceEvdev *device_evdev;
@ -693,6 +694,7 @@ notify_pad_button (ClutterInputDevice *input_device,
event->pad_button.stage = stage; event->pad_button.stage = stage;
event->pad_button.button = button; event->pad_button.button = button;
event->pad_button.group = mode_group; event->pad_button.group = mode_group;
event->pad_button.mode = mode;
clutter_event_set_device (event, input_device); clutter_event_set_device (event, input_device);
clutter_event_set_source_device (event, input_device); clutter_event_set_source_device (event, input_device);
clutter_event_set_time (event, us2ms (time_us)); clutter_event_set_time (event, us2ms (time_us));
@ -708,6 +710,7 @@ notify_pad_strip (ClutterInputDevice *input_device,
guint32 strip_number, guint32 strip_number,
guint32 strip_source, guint32 strip_source,
guint32 mode_group, guint32 mode_group,
guint32 mode,
gdouble value) gdouble value)
{ {
ClutterInputDeviceEvdev *device_evdev; ClutterInputDeviceEvdev *device_evdev;
@ -737,6 +740,7 @@ notify_pad_strip (ClutterInputDevice *input_device,
event->pad_strip.strip_number = strip_number; event->pad_strip.strip_number = strip_number;
event->pad_strip.value = value; event->pad_strip.value = value;
event->pad_strip.group = mode_group; event->pad_strip.group = mode_group;
event->pad_strip.mode = mode;
clutter_event_set_device (event, input_device); clutter_event_set_device (event, input_device);
clutter_event_set_source_device (event, input_device); clutter_event_set_source_device (event, input_device);
clutter_event_set_time (event, us2ms (time_us)); clutter_event_set_time (event, us2ms (time_us));
@ -752,6 +756,7 @@ notify_pad_ring (ClutterInputDevice *input_device,
guint32 ring_number, guint32 ring_number,
guint32 ring_source, guint32 ring_source,
guint32 mode_group, guint32 mode_group,
guint32 mode,
gdouble angle) gdouble angle)
{ {
ClutterInputDeviceEvdev *device_evdev; ClutterInputDeviceEvdev *device_evdev;
@ -781,6 +786,7 @@ notify_pad_ring (ClutterInputDevice *input_device,
event->pad_ring.ring_number = ring_number; event->pad_ring.ring_number = ring_number;
event->pad_ring.angle = angle; event->pad_ring.angle = angle;
event->pad_ring.group = mode_group; event->pad_ring.group = mode_group;
event->pad_ring.mode = mode;
clutter_event_set_device (event, input_device); clutter_event_set_device (event, input_device);
clutter_event_set_source_device (event, input_device); clutter_event_set_source_device (event, input_device);
clutter_event_set_time (event, us2ms (time_us)); clutter_event_set_time (event, us2ms (time_us));
@ -1815,7 +1821,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
case LIBINPUT_EVENT_TABLET_PAD_BUTTON: case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
{ {
guint64 time; guint64 time;
guint32 button_state, button, group; guint32 button_state, button, group, mode;
struct libinput_tablet_pad_mode_group *mode_group; struct libinput_tablet_pad_mode_group *mode_group;
struct libinput_event_tablet_pad *pad_event = struct libinput_event_tablet_pad *pad_event =
libinput_event_get_tablet_pad_event (event); libinput_event_get_tablet_pad_event (event);
@ -1825,17 +1831,18 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
mode_group = libinput_event_tablet_pad_get_mode_group (pad_event); mode_group = libinput_event_tablet_pad_get_mode_group (pad_event);
group = libinput_tablet_pad_mode_group_get_index (mode_group); group = libinput_tablet_pad_mode_group_get_index (mode_group);
mode = libinput_event_tablet_pad_get_mode (pad_event);
button = libinput_event_tablet_pad_get_button_number (pad_event); button = libinput_event_tablet_pad_get_button_number (pad_event);
button_state = libinput_event_tablet_pad_get_button_state (pad_event) == button_state = libinput_event_tablet_pad_get_button_state (pad_event) ==
LIBINPUT_BUTTON_STATE_PRESSED; LIBINPUT_BUTTON_STATE_PRESSED;
notify_pad_button (device, time, button, group, button_state); notify_pad_button (device, time, button, group, mode, button_state);
break; break;
} }
case LIBINPUT_EVENT_TABLET_PAD_STRIP: case LIBINPUT_EVENT_TABLET_PAD_STRIP:
{ {
guint64 time; guint64 time;
guint32 number, source, group; guint32 number, source, group, mode;
struct libinput_tablet_pad_mode_group *mode_group; struct libinput_tablet_pad_mode_group *mode_group;
struct libinput_event_tablet_pad *pad_event = struct libinput_event_tablet_pad *pad_event =
libinput_event_get_tablet_pad_event (event); libinput_event_get_tablet_pad_event (event);
@ -1849,14 +1856,15 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
mode_group = libinput_event_tablet_pad_get_mode_group (pad_event); mode_group = libinput_event_tablet_pad_get_mode_group (pad_event);
group = libinput_tablet_pad_mode_group_get_index (mode_group); group = libinput_tablet_pad_mode_group_get_index (mode_group);
mode = libinput_event_tablet_pad_get_mode (pad_event);
notify_pad_strip (device, time, number, source, group, value); notify_pad_strip (device, time, number, source, group, mode, value);
break; break;
} }
case LIBINPUT_EVENT_TABLET_PAD_RING: case LIBINPUT_EVENT_TABLET_PAD_RING:
{ {
guint64 time; guint64 time;
guint32 number, source, group; guint32 number, source, group, mode;
struct libinput_tablet_pad_mode_group *mode_group; struct libinput_tablet_pad_mode_group *mode_group;
struct libinput_event_tablet_pad *pad_event = struct libinput_event_tablet_pad *pad_event =
libinput_event_get_tablet_pad_event (event); libinput_event_get_tablet_pad_event (event);
@ -1870,8 +1878,9 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
mode_group = libinput_event_tablet_pad_get_mode_group (pad_event); mode_group = libinput_event_tablet_pad_get_mode_group (pad_event);
group = libinput_tablet_pad_mode_group_get_index (mode_group); group = libinput_tablet_pad_mode_group_get_index (mode_group);
mode = libinput_event_tablet_pad_get_mode (pad_event);
notify_pad_ring (device, time, number, source, group, angle); notify_pad_ring (device, time, number, source, group, mode, angle);
break; break;
} }
default: default: