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

backends: Split pad action mapping to a separate object

Browse Source 
This now lives in the core, and will get updated from events in the
UI thread.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho
2020-07-15 22:38:00 +02:00
committed by Marge Bot
parent d6f720497a
commit 5f30d1b8ac
9 changed files with 922 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@
#include <wayland-server.h>
#include "backends/meta-input-settings-private.h"
#include "core/display-private.h"
#include "compositor/meta-surface-actor-wayland.h"
#include "wayland/meta-wayland-private.h"
#include "wayland/meta-wayland-tablet-pad-group.h"
@ -244,15 +245,14 @@ tablet_pad_set_feedback (struct wl_client *client,
{
MetaWaylandTabletPad *pad = wl_resource_get_user_data (resource);
MetaWaylandTabletPadGroup *group = tablet_pad_lookup_button_group (pad, button);
MetaInputSettings *input_settings;
MetaPadActionMapper *mapper;
if (!group || group->mode_switch_serial != serial)
return;
input_settings = meta_backend_get_input_settings (meta_get_backend ());
mapper = meta_get_display ()->pad_action_mapper;
if (input_settings &&
meta_input_settings_is_pad_button_grabbed (input_settings, pad->device, button))
if (meta_pad_action_mapper_is_button_grabbed (mapper, pad->device, button))
return;
if (meta_wayland_tablet_pad_group_is_mode_switch_button (group, button))
@ -367,15 +367,14 @@ static gboolean
meta_wayland_tablet_pad_handle_event_action (MetaWaylandTabletPad *pad,
const ClutterEvent *event)
{
MetaInputSettings *input_settings;
MetaPadActionMapper *mapper;
ClutterInputDevice *device;
device = clutter_event_get_source_device (event);
input_settings = meta_backend_get_input_settings (meta_get_backend ());
mapper = meta_get_display ()->pad_action_mapper;
if (input_settings &&
meta_input_settings_is_pad_button_grabbed (input_settings, device,
event->pad_button.button))
if (meta_pad_action_mapper_is_button_grabbed (mapper, device,
event->pad_button.button))
return TRUE;
return FALSE;