diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2016-05-13 12:15:02 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2016-07-20 19:26:31 +0200 |
| commit | 47067e6d17061b6ed5f8f1b04d4c6735166b6825 (patch) | |
| tree | 9db7496f69a89664f001490b12f15a22ea094e52 | |
| parent | 3386e5dc39554b797a0ea5116fedab96dd7902f5 (diff) | |
| download | mutter-47067e6d17061b6ed5f8f1b04d4c6735166b6825.tar.gz | |
backends: Add empty stubs for tablet configuration
Those will be called when configuring tablets.
| -rw-r--r-- | src/backends/meta-input-settings-private.h | 15 | ||||
| -rw-r--r-- | src/backends/native/meta-input-settings-native.c | 31 | ||||
| -rw-r--r-- | src/backends/x11/meta-input-settings-x11.c | 29 |
3 files changed, 75 insertions, 0 deletions
diff --git a/src/backends/meta-input-settings-private.h b/src/backends/meta-input-settings-private.h index ec207f2c5..237557444 100644 --- a/src/backends/meta-input-settings-private.h +++ b/src/backends/meta-input-settings-private.h @@ -23,6 +23,7 @@ #define META_INPUT_SETTINGS_PRIVATE_H #include "display-private.h" +#include "meta-monitor-manager-private.h" #include <clutter/clutter.h> @@ -78,6 +79,20 @@ struct _MetaInputSettingsClass gboolean repeat, guint delay, guint interval); + + void (* set_tablet_mapping) (MetaInputSettings *settings, + ClutterInputDevice *device, + GDesktopTabletMapping mapping); + void (* set_tablet_keep_aspect) (MetaInputSettings *settings, + ClutterInputDevice *device, + MetaOutput *output, + gboolean keep_aspect); + void (* set_tablet_area) (MetaInputSettings *settings, + ClutterInputDevice *device, + gdouble padding_left, + gdouble padding_right, + gdouble padding_top, + gdouble padding_bottom); }; GType meta_input_settings_get_type (void) G_GNUC_CONST; diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c index 4b4e8c24a..80b144c8b 100644 --- a/src/backends/native/meta-input-settings-native.c +++ b/src/backends/native/meta-input-settings-native.c @@ -242,6 +242,33 @@ meta_input_settings_native_set_keyboard_repeat (MetaInputSettings *settings, } static void +meta_input_settings_native_set_tablet_mapping (MetaInputSettings *settings, + ClutterInputDevice *device, + GDesktopTabletMapping mapping) +{ +} + +static void +meta_input_settings_native_set_tablet_keep_aspect (MetaInputSettings *settings, + ClutterInputDevice *device, + MetaOutput *output, + gboolean keep_aspect) +{ + /* FIXME: Implement */ +} + +static void +meta_input_settings_native_set_tablet_area (MetaInputSettings *settings, + ClutterInputDevice *device, + gdouble padding_left, + gdouble padding_right, + gdouble padding_top, + gdouble padding_bottom) +{ + /* FIXME: Implement */ +} + +static void meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass) { MetaInputSettingsClass *input_settings_class = META_INPUT_SETTINGS_CLASS (klass); @@ -256,6 +283,10 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass) input_settings_class->set_scroll_button = meta_input_settings_native_set_scroll_button; input_settings_class->set_click_method = meta_input_settings_native_set_click_method; input_settings_class->set_keyboard_repeat = meta_input_settings_native_set_keyboard_repeat; + + input_settings_class->set_tablet_mapping = meta_input_settings_native_set_tablet_mapping; + input_settings_class->set_tablet_keep_aspect = meta_input_settings_native_set_tablet_keep_aspect; + input_settings_class->set_tablet_area = meta_input_settings_native_set_tablet_area; } static void diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c index 79d567bf6..e159fb62e 100644 --- a/src/backends/x11/meta-input-settings-x11.c +++ b/src/backends/x11/meta-input-settings-x11.c @@ -306,6 +306,31 @@ meta_input_settings_x11_set_keyboard_repeat (MetaInputSettings *settings, } static void +meta_input_settings_x11_set_tablet_mapping (MetaInputSettings *settings, + ClutterInputDevice *device, + GDesktopTabletMapping mapping) +{ +} + +static void +meta_input_settings_x11_set_tablet_keep_aspect (MetaInputSettings *settings, + ClutterInputDevice *device, + MetaOutput *output, + gboolean keep_aspect) +{ +} + +static void +meta_input_settings_x11_set_tablet_area (MetaInputSettings *settings, + ClutterInputDevice *device, + gdouble padding_left, + gdouble padding_right, + gdouble padding_top, + gdouble padding_bottom) +{ +} + +static void meta_input_settings_x11_class_init (MetaInputSettingsX11Class *klass) { MetaInputSettingsClass *input_settings_class = META_INPUT_SETTINGS_CLASS (klass); @@ -320,6 +345,10 @@ meta_input_settings_x11_class_init (MetaInputSettingsX11Class *klass) input_settings_class->set_scroll_button = meta_input_settings_x11_set_scroll_button; input_settings_class->set_click_method = meta_input_settings_x11_set_click_method; input_settings_class->set_keyboard_repeat = meta_input_settings_x11_set_keyboard_repeat; + + input_settings_class->set_tablet_mapping = meta_input_settings_x11_set_tablet_mapping; + input_settings_class->set_tablet_keep_aspect = meta_input_settings_x11_set_tablet_keep_aspect; + input_settings_class->set_tablet_area = meta_input_settings_x11_set_tablet_area; } static void |