[mutter] backends: Add mouse accessibility settings
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backends: Add mouse accessibility settings
- Date: Thu, 6 Jun 2019 11:34:51 +0000 (UTC)
commit a3b86447f7491d83333c2c8d284e5fbf5476e284
Author: Olivier Fourdan <ofourdan redhat com>
Date: Wed Mar 6 08:49:54 2019 +0100
backends: Add mouse accessibility settings
Add support for mouse accessibility settings to set the click assist
values.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/512
src/backends/meta-input-settings.c | 103 +++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
---
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 476a0c701..847ba1bea 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -77,6 +77,7 @@ struct _MetaInputSettingsPrivate
GSettings *keyboard_settings;
GSettings *gsd_settings;
GSettings *keyboard_a11y_settings;
+ GSettings *mouse_a11y_settings;
GHashTable *mappable_devices;
@@ -162,6 +163,7 @@ meta_input_settings_dispose (GObject *object)
g_clear_object (&priv->keyboard_settings);
g_clear_object (&priv->gsd_settings);
g_clear_object (&priv->keyboard_a11y_settings);
+ g_clear_object (&priv->mouse_a11y_settings);
g_clear_object (&priv->input_mapper);
g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
g_clear_pointer (&priv->current_tools, g_hash_table_unref);
@@ -1275,6 +1277,102 @@ meta_input_keyboard_a11y_settings_changed (GSettings *settings,
load_keyboard_a11y_settings (input_settings, NULL);
}
+struct _pointer_a11y_settings_flags_pair {
+ const char *name;
+ ClutterPointerA11yFlags flag;
+} pointer_a11y_settings_flags_pair[] = {
+ { "secondary-click-enabled", CLUTTER_A11Y_SECONDARY_CLICK_ENABLED },
+ { "dwell-click-enabled", CLUTTER_A11Y_DWELL_ENABLED },
+};
+
+static ClutterPointerA11yDwellDirection
+pointer_a11y_dwell_direction_from_setting (MetaInputSettings *input_settings,
+ const char *key)
+{
+ MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
+ GDesktopMouseDwellDirection dwell_gesture_direction;
+
+ dwell_gesture_direction = g_settings_get_enum (priv->mouse_a11y_settings, key);
+ switch (dwell_gesture_direction)
+ {
+ case G_DESKTOP_MOUSE_DWELL_DIRECTION_LEFT:
+ return CLUTTER_A11Y_DWELL_DIRECTION_LEFT;
+ break;
+ case G_DESKTOP_MOUSE_DWELL_DIRECTION_RIGHT:
+ return CLUTTER_A11Y_DWELL_DIRECTION_RIGHT;
+ break;
+ case G_DESKTOP_MOUSE_DWELL_DIRECTION_UP:
+ return CLUTTER_A11Y_DWELL_DIRECTION_UP;
+ break;
+ case G_DESKTOP_MOUSE_DWELL_DIRECTION_DOWN:
+ return CLUTTER_A11Y_DWELL_DIRECTION_DOWN;
+ break;
+ default:
+ break;
+ }
+ return CLUTTER_A11Y_DWELL_DIRECTION_NONE;
+}
+
+static void
+load_pointer_a11y_settings (MetaInputSettings *input_settings,
+ ClutterInputDevice *device)
+{
+ MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
+ ClutterPointerA11ySettings pointer_a11y_settings;
+ ClutterInputDevice *core_pointer;
+ GDesktopMouseDwellMode dwell_mode;
+
+ guint i;
+
+ core_pointer = clutter_device_manager_get_core_device (priv->device_manager, CLUTTER_POINTER_DEVICE);
+ if (device && device != core_pointer)
+ return;
+
+ clutter_device_manager_get_pointer_a11y_settings (priv->device_manager, &pointer_a11y_settings);
+ pointer_a11y_settings.controls = 0;
+ for (i = 0; i < G_N_ELEMENTS (pointer_a11y_settings_flags_pair); i++)
+ {
+ if (g_settings_get_boolean (priv->mouse_a11y_settings, pointer_a11y_settings_flags_pair[i].name))
+ pointer_a11y_settings.controls |= pointer_a11y_settings_flags_pair[i].flag;
+ }
+
+ /* "secondary-click-time" is expressed in seconds */
+ pointer_a11y_settings.secondary_click_delay =
+ (1000 * g_settings_get_double (priv->mouse_a11y_settings, "secondary-click-time"));
+ /* "dwell-time" is expressed in seconds */
+ pointer_a11y_settings.dwell_delay =
+ (1000 * g_settings_get_double (priv->mouse_a11y_settings, "dwell-time"));
+ pointer_a11y_settings.dwell_threshold = g_settings_get_int (priv->mouse_a11y_settings,
+ "dwell-threshold");
+
+ dwell_mode = g_settings_get_enum (priv->mouse_a11y_settings, "dwell-mode");
+ if (dwell_mode == G_DESKTOP_MOUSE_DWELL_MODE_WINDOW)
+ pointer_a11y_settings.dwell_mode = CLUTTER_A11Y_DWELL_MODE_WINDOW;
+ else
+ pointer_a11y_settings.dwell_mode = CLUTTER_A11Y_DWELL_MODE_GESTURE;
+
+ pointer_a11y_settings.dwell_gesture_single =
+ pointer_a11y_dwell_direction_from_setting (input_settings, "dwell-gesture-single");
+ pointer_a11y_settings.dwell_gesture_double =
+ pointer_a11y_dwell_direction_from_setting (input_settings, "dwell-gesture-double");
+ pointer_a11y_settings.dwell_gesture_drag =
+ pointer_a11y_dwell_direction_from_setting (input_settings, "dwell-gesture-drag");
+ pointer_a11y_settings.dwell_gesture_secondary =
+ pointer_a11y_dwell_direction_from_setting (input_settings, "dwell-gesture-secondary");
+
+ clutter_device_manager_set_pointer_a11y_settings (priv->device_manager, &pointer_a11y_settings);
+}
+
+static void
+meta_input_mouse_a11y_settings_changed (GSettings *settings,
+ const char *key,
+ gpointer user_data)
+{
+ MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data);
+
+ load_pointer_a11y_settings (input_settings, NULL);
+}
+
static GSettings *
lookup_device_settings (ClutterInputDevice *device)
{
@@ -1556,6 +1654,7 @@ apply_device_settings (MetaInputSettings *input_settings,
priv->trackball_settings,
device);
load_keyboard_a11y_settings (input_settings, device);
+ load_pointer_a11y_settings (input_settings, device);
}
static void
@@ -1862,6 +1961,10 @@ meta_input_settings_init (MetaInputSettings *settings)
g_signal_connect (priv->device_manager, "kbd-a11y-flags-changed",
G_CALLBACK (on_keyboard_a11y_settings_changed), settings);
+ priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
+ g_signal_connect (priv->mouse_a11y_settings, "changed",
+ G_CALLBACK (meta_input_mouse_a11y_settings_changed), settings);
+
priv->mappable_devices =
g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) device_mapping_info_free);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]