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

wayland: Implement stylus button actions

Browse Source 
Those just send different BTN_ keycodes.
This commit is contained in:
Carlos Garnacho 2016-06-22 15:56:08 +02:00
parent fbb4c0b831
commit 7e267e9b01
1 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/wayland/meta-wayland-tablet-tool.c
View File

@ -36,9 +36,11 @@
#include "meta-wayland-tablet.h" #include "meta-wayland-tablet.h"
#include "meta-wayland-tablet-seat.h" #include "meta-wayland-tablet-seat.h"
#include "meta-wayland-tablet-tool.h" #include "meta-wayland-tablet-tool.h"
#include "backends/meta-input-settings-private.h"
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-backend-native.h" #include "backends/native/meta-backend-native.h"
#include <linux/input-event-codes.h>
#endif #endif
#define TABLET_AXIS_MAX 65535 #define TABLET_AXIS_MAX 65535
@ -651,6 +653,63 @@ broadcast_up (MetaWaylandTabletTool *tool,
} }
} }
static guint32
translate_button_action (MetaWaylandTabletTool *tool,
const ClutterEvent *event)
{
MetaInputSettings *input_settings;
GDesktopStylusButtonAction action;
MetaBackend *backend;
backend = meta_get_backend ();
input_settings = meta_backend_get_input_settings (backend);
if (input_settings)
{
ClutterInputDevice *device;
device = clutter_event_get_source_device (event);
action = meta_input_settings_get_stylus_button_action (input_settings,
tool->device_tool,
device,
event->button.button);
}
else
{
action = G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT;
}
switch (action)
{
case G_DESKTOP_STYLUS_BUTTON_ACTION_MIDDLE:
return BTN_STYLUS;
case G_DESKTOP_STYLUS_BUTTON_ACTION_RIGHT:
return BTN_STYLUS2;
case G_DESKTOP_STYLUS_BUTTON_ACTION_BACK:
return BTN_BACK;
case G_DESKTOP_STYLUS_BUTTON_ACTION_FORWARD:
return BTN_FORWARD;
case G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT:
default:
{
#ifdef HAVE_NATIVE_BACKEND
MetaBackend *backend = meta_get_backend ();
if (META_IS_BACKEND_NATIVE (backend))
{
return clutter_evdev_event_get_event_code (event);
}
else
#endif
{
/* We can't do much better here, there's several
* different BTN_ ranges to cover.
*/
return event->button.button;
}
}
}
}
static void static void
broadcast_button (MetaWaylandTabletTool *tool, broadcast_button (MetaWaylandTabletTool *tool,
const ClutterEvent *event) const ClutterEvent *event)
@ -658,22 +717,9 @@ broadcast_button (MetaWaylandTabletTool *tool,
struct wl_resource *resource; struct wl_resource *resource;
guint32 button; guint32 button;
button = translate_button_action (tool, event);
tool->button_serial = wl_display_next_serial (tool->seat->manager->wl_display); tool->button_serial = wl_display_next_serial (tool->seat->manager->wl_display);
#ifdef HAVE_NATIVE_BACKEND
MetaBackend *backend = meta_get_backend ();
if (META_IS_BACKEND_NATIVE (backend))
button = clutter_evdev_event_get_event_code (event);
else
#endif
{
/* We can't do much better here, there's several
* different BTN_ ranges to cover.
*/
button = event->button.button;
}
wl_resource_for_each (resource, &tool->focus_resource_list) wl_resource_for_each (resource, &tool->focus_resource_list)
{ {
zwp_tablet_tool_v2_send_button (resource, tool->button_serial, button, zwp_tablet_tool_v2_send_button (resource, tool->button_serial, button,