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

wayland: Hook MetaWaylandTabletPad to pad button actions management

Browse Source 
These are handled by the MetaInputSettings, so hook the events emitted
to it.
This commit is contained in:
Carlos Garnacho 2016-06-22 18:56:33 +02:00
parent 8e6244238d
commit 7bba20e536
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/wayland/meta-wayland-tablet-pad.c
View File

@ -29,6 +29,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include "tablet-unstable-v2-server-protocol.h" #include "tablet-unstable-v2-server-protocol.h"
#include "backends/meta-input-settings-private.h"
#include "meta-surface-actor-wayland.h" #include "meta-surface-actor-wayland.h"
#include "meta-wayland-private.h" #include "meta-wayland-private.h"
@ -233,6 +234,44 @@ handle_pad_button_event (MetaWaylandTabletPad *pad,
return TRUE; return TRUE;
} }
static void
meta_wayland_tablet_pad_update_action (MetaWaylandTabletPad *pad,
const ClutterEvent *event)
{
MetaInputSettings *input_settings;
ClutterInputDevice *device;
guint button;
button = event->pad_button.button;
device = clutter_event_get_source_device (event);
input_settings = meta_backend_get_input_settings (meta_get_backend ());
if (!input_settings)
return;
meta_input_settings_handle_pad_button (input_settings, device,
event->type == CLUTTER_PAD_BUTTON_PRESS,
button);
}
static gboolean
meta_wayland_tablet_pad_handle_event_action (MetaWaylandTabletPad *pad,
const ClutterEvent *event)
{
MetaInputSettings *input_settings;
ClutterInputDevice *device;
device = clutter_event_get_source_device (event);
input_settings = meta_backend_get_input_settings (meta_get_backend ());
if (input_settings &&
meta_input_settings_is_pad_button_grabbed (input_settings, device,
event->pad_button.button))
return TRUE;
return FALSE;
}
gboolean gboolean
meta_wayland_tablet_pad_handle_event (MetaWaylandTabletPad *pad, meta_wayland_tablet_pad_handle_event (MetaWaylandTabletPad *pad,
const ClutterEvent *event) const ClutterEvent *event)
@ -251,6 +290,8 @@ meta_wayland_tablet_pad_handle_event (MetaWaylandTabletPad *pad,
if (group) if (group)
handled |= meta_wayland_tablet_pad_group_handle_event (group, event); handled |= meta_wayland_tablet_pad_group_handle_event (group, event);
handled |= meta_wayland_tablet_pad_handle_event_action (pad, event);
if (handled) if (handled)
return TRUE; return TRUE;
@ -406,6 +447,8 @@ meta_wayland_tablet_pad_update (MetaWaylandTabletPad *pad,
{ {
case CLUTTER_PAD_BUTTON_PRESS: case CLUTTER_PAD_BUTTON_PRESS:
case CLUTTER_PAD_BUTTON_RELEASE: case CLUTTER_PAD_BUTTON_RELEASE:
meta_wayland_tablet_pad_update_action (pad, event);
break;
case CLUTTER_PAD_RING: case CLUTTER_PAD_RING:
case CLUTTER_PAD_STRIP: case CLUTTER_PAD_STRIP:
default: default: