isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Clean up MetaWaylandTabletPadGroup

Browse Source 
Using the clutter counterparts, some backend-specific code can be removed
from here.

https://bugzilla.gnome.org/show_bug.cgi?id=771098
This commit is contained in:
Carlos Garnacho 2016-12-28 11:53:17 +01:00
parent fff7da2a96
commit 5af848d991
1 changed files with 10 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/wayland/meta-wayland-tablet-pad-group.c
View File

@ -119,52 +119,6 @@ meta_wayland_tablet_pad_group_lookup_resource (MetaWaylandTabletPadGroup *group,
return resource; return resource;
} }
static guint
tablet_pad_group_get_current_mode (MetaWaylandTabletPadGroup *group)
{
MetaBackend *backend = meta_get_backend ();
#ifdef HAVE_NATIVE_BACKEND
if (META_IS_BACKEND_NATIVE (backend))
{
struct libinput_device *libinput_device;
struct libinput_tablet_pad_mode_group *mode_group;
guint n_group;
libinput_device = clutter_evdev_input_device_get_libinput_device (group->pad->device);
n_group = g_list_index (group->pad->groups, group);
mode_group = libinput_device_tablet_pad_get_mode_group (libinput_device, n_group);
return libinput_tablet_pad_mode_group_get_mode (mode_group);
}
else
#endif
return 0;
}
static guint
tablet_pad_group_get_n_modes (MetaWaylandTabletPadGroup *group)
{
MetaBackend *backend = meta_get_backend ();
guint n_modes = 1;
#ifdef HAVE_NATIVE_BACKEND
if (META_IS_BACKEND_NATIVE (backend))
{
struct libinput_device *libinput_device;
struct libinput_tablet_pad_mode_group *mode_group;
guint n_group;
libinput_device = clutter_evdev_input_device_get_libinput_device (group->pad->device);
n_group = g_list_index (group->pad->groups, group);
mode_group = libinput_device_tablet_pad_get_mode_group (libinput_device, n_group);
n_modes = libinput_tablet_pad_mode_group_get_num_modes (mode_group);
}
#endif
return n_modes;
}
gboolean gboolean
meta_wayland_tablet_pad_group_has_button (MetaWaylandTabletPadGroup *group, meta_wayland_tablet_pad_group_has_button (MetaWaylandTabletPadGroup *group,
guint button) guint button)
@ -221,7 +175,7 @@ meta_wayland_tablet_pad_group_notify (MetaWaylandTabletPadGroup *group,
{ {
struct wl_client *client = wl_resource_get_client (resource); struct wl_client *client = wl_resource_get_client (resource);
struct wl_array buttons; struct wl_array buttons;
guint n_modes; guint n_group, n_modes;
GList *l; GList *l;
wl_array_init (&buttons); wl_array_init (&buttons);
@ -255,7 +209,10 @@ meta_wayland_tablet_pad_group_notify (MetaWaylandTabletPadGroup *group,
zwp_tablet_pad_group_v2_send_strip (resource, strip_resource); zwp_tablet_pad_group_v2_send_strip (resource, strip_resource);
} }
n_modes = tablet_pad_group_get_n_modes (group); n_group = g_list_index (group->pad->groups, group);
n_modes = clutter_input_device_get_group_n_modes (group->pad->device,
n_group);
zwp_tablet_pad_group_v2_send_modes (resource, n_modes); zwp_tablet_pad_group_v2_send_modes (resource, n_modes);
zwp_tablet_pad_group_v2_send_done (resource); zwp_tablet_pad_group_v2_send_done (resource);
} }
@ -269,7 +226,7 @@ meta_wayland_tablet_pad_group_update (MetaWaylandTabletPadGroup *group,
case CLUTTER_PAD_BUTTON_PRESS: case CLUTTER_PAD_BUTTON_PRESS:
case CLUTTER_PAD_BUTTON_RELEASE: case CLUTTER_PAD_BUTTON_RELEASE:
if (meta_wayland_tablet_pad_group_is_mode_switch_button (group, event->pad_button.button)) if (meta_wayland_tablet_pad_group_is_mode_switch_button (group, event->pad_button.button))
group->current_mode = tablet_pad_group_get_current_mode (group); group->current_mode = event->pad_button.mode;
break; break;
default: default:
break; break;
@ -437,22 +394,10 @@ gboolean
meta_wayland_tablet_pad_group_is_mode_switch_button (MetaWaylandTabletPadGroup *group, meta_wayland_tablet_pad_group_is_mode_switch_button (MetaWaylandTabletPadGroup *group,
guint button) guint button)
{ {
MetaBackend *backend = meta_get_backend (); gint n_group = g_list_index (group->pad->groups, group);
#ifdef HAVE_NATIVE_BACKEND g_assert (n_group >= 0);
if (META_IS_BACKEND_NATIVE (backend))
{
struct libinput_device *libinput_device;
struct libinput_tablet_pad_mode_group *mode_group;
guint n_group;
libinput_device = clutter_evdev_input_device_get_libinput_device (group->pad->device); return clutter_input_device_is_mode_switch_button (group->pad->device,
n_group = g_list_index (group->pad->groups, group); n_group, button);
mode_group = libinput_device_tablet_pad_get_mode_group (libinput_device, n_group);
return libinput_tablet_pad_mode_group_button_is_toggle (mode_group, button) != 0;
}
else
#endif
return FALSE;
} }