clutter/evdev: Take over stylus configuration

Stylus configuration (stylus buttons, pressure) was handled
at the very high level, doing the button and pressure translations
right before sending these to wayland clients.

However, it makes more sense to store these settings into the
ClutterInputDeviceTool itself, and have clutter apply the config
at the lower level so 1) the settings actually apply desktop-wide,
not just in clients and 2) X11 and wayland may share similar
configuration paths. The settings are now just applied whenever
the tool enters proximity, in reaction to
ClutterDeviceManager::tool-changed.

This commit moves all handling of these two settings to
the clutter level, and removes the wayland-specific paths

https://bugzilla.gnome.org/show_bug.cgi?id=773779

1 files changed, 10 insertions, 9 deletions

diff --git a/src/backends/meta-input-settings-private.h b/src/backends/meta-input-settings-private.h
index 6e5f97bd4..06f215cb7 100644
--- a/src/backends/meta-input-settings-private.h
+++ b/src/backends/meta-input-settings-private.h
@@ -107,6 +107,16 @@ struct _MetaInputSettingsClass
   void (* set_trackball_accel_profile) (MetaInputSettings          *settings,
                                         ClutterInputDevice         *device,
                                         GDesktopPointerAccelProfile profile);
+
+  void (* set_stylus_pressure) (MetaInputSettings            *settings,
+                                ClutterInputDevice           *device,
+                                ClutterInputDeviceTool       *tool,
+                                const gint32                  curve[4]);
+  void (* set_stylus_button_map) (MetaInputSettings          *settings,
+                                  ClutterInputDevice         *device,
+                                  ClutterInputDeviceTool     *tool,
+                                  GDesktopStylusButtonAction  primary,
+                                  GDesktopStylusButtonAction  secondary);
 };
 
 GType meta_input_settings_get_type (void) G_GNUC_CONST;
@@ -121,15 +131,6 @@ MetaMonitorInfo *     meta_input_settings_get_tablet_monitor_info (MetaInputSett
 GDesktopTabletMapping meta_input_settings_get_tablet_mapping (MetaInputSettings  *settings,
                                                               ClutterInputDevice *device);
 
-GDesktopStylusButtonAction meta_input_settings_get_stylus_button_action (MetaInputSettings      *settings,
-                                                                         ClutterInputDeviceTool *tool,
-                                                                         ClutterInputDevice     *current_device,
-                                                                         guint                   button);
-gdouble                    meta_input_settings_translate_tablet_tool_pressure (MetaInputSettings      *input_settings,
-                                                                               ClutterInputDeviceTool *tool,
-                                                                               ClutterInputDevice     *current_tablet,
-                                                                               gdouble                 pressure);
-
 gboolean                   meta_input_settings_is_pad_button_grabbed     (MetaInputSettings  *input_settings,
                                                                           ClutterInputDevice *pad,
                                                                           guint               button);