summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-10-31 17:45:42 +0300
committermonsta <[email protected]>2016-10-31 17:45:42 +0300
commit307c93ead80e8d46beee426d339e4e6ffa5b7f81 (patch)
tree178a20440a7c6bee2438a85da4da42743f2ff4d2
parent2eebee804b2d643c20cab019fb8149095423370a (diff)
downloadmate-settings-daemon-307c93ead80e8d46beee426d339e4e6ffa5b7f81.tar.bz2
mate-settings-daemon-307c93ead80e8d46beee426d339e4e6ffa5b7f81.tar.xz
mouse: make separate callback for processing touchpad settings
-rw-r--r--plugins/mouse/msd-mouse-manager.c55
1 files changed, 32 insertions, 23 deletions
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index 61b52a2..4e94311 100644
--- a/plugins/mouse/msd-mouse-manager.c
+++ b/plugins/mouse/msd-mouse-manager.c
@@ -1003,36 +1003,14 @@ mouse_callback (GSettings *settings,
gboolean mouse_left_handed = g_settings_get_boolean (settings, key);
gboolean touchpad_left_handed = get_touchpad_handedness (manager, mouse_left_handed);
set_left_handed_all (manager, mouse_left_handed, touchpad_left_handed);
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_LEFT_HANDED) == 0) {
- gboolean mouse_left_handed = g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED);
- gboolean touchpad_left_handed = get_touchpad_handedness (manager, mouse_left_handed);
- set_left_handed_all (manager, mouse_left_handed, touchpad_left_handed);
} else if (g_strcmp0 (key, KEY_MOUSE_MOTION_ACCELERATION) == 0) {
set_motion_acceleration (manager, g_settings_get_double (settings, key));
} else if (g_strcmp0 (key, KEY_MOUSE_MOTION_THRESHOLD) == 0) {
set_motion_threshold (manager, g_settings_get_int (settings, key));
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_DISABLE_W_TYPING) == 0) {
- set_disable_w_typing (manager, g_settings_get_boolean (settings, key));
} else if (g_strcmp0 (key, KEY_MIDDLE_BUTTON_EMULATION) == 0) {
set_middle_button_all (manager, g_settings_get_boolean (settings, key));
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0) {
- set_tap_to_click_all (manager);
- } else if ((g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_CLICK) == 0) || (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_CLICK) == 0)) {
- set_click_actions_all (manager);
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0) {
- set_tap_to_click_all (manager);
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_TAP) == 0) {
- set_tap_to_click_all (manager);
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_TAP) == 0) {
- set_tap_to_click_all (manager);
- } else if (g_strcmp0 (key, KEY_VERT_EDGE_SCROLL) == 0 || g_strcmp0 (key, KEY_HORIZ_EDGE_SCROLL) == 0 || g_strcmp0 (key, KEY_VERT_TWO_FINGER_SCROLL) == 0 || g_strcmp0 (key, KEY_HORIZ_TWO_FINGER_SCROLL) == 0) {
- set_scrolling (manager->priv->settings_touchpad);
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_NATURAL_SCROLL) == 0) {
- set_natural_scroll_all (manager);
} else if (g_strcmp0 (key, KEY_MOUSE_LOCATE_POINTER) == 0) {
set_locate_pointer (manager, g_settings_get_boolean (settings, key));
- } else if (g_strcmp0 (key, KEY_TOUCHPAD_ENABLED) == 0) {
- set_touchpad_enabled_all (g_settings_get_boolean (settings, key));
#if 0 /* FIXME need to fork (?) mousetweaks for this to work */
} else if (g_strcmp0 (key, KEY_MOUSE_A11Y_DWELL_ENABLE) == 0) {
set_mousetweaks_daemon (manager,
@@ -1048,6 +1026,37 @@ mouse_callback (GSettings *settings,
}
static void
+touchpad_callback (GSettings *settings,
+ const gchar *key,
+ MsdMouseManager *manager)
+{
+ if (g_strcmp0 (key, KEY_TOUCHPAD_DISABLE_W_TYPING) == 0) {
+ set_disable_w_typing (manager, g_settings_get_boolean (settings, key));
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_LEFT_HANDED) == 0) {
+ gboolean mouse_left_handed = g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED);
+ gboolean touchpad_left_handed = get_touchpad_handedness (manager, mouse_left_handed);
+ set_left_handed_all (manager, mouse_left_handed, touchpad_left_handed);
+ } else if ((g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0)
+ || (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0)
+ || (g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_TAP) == 0)
+ || (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_TAP) == 0)) {
+ set_tap_to_click_all (manager);
+ } else if ((g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_CLICK) == 0)
+ || (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_CLICK) == 0)) {
+ set_click_actions_all (manager);
+ } else if ((g_strcmp0 (key, KEY_VERT_EDGE_SCROLL) == 0)
+ || (g_strcmp0 (key, KEY_HORIZ_EDGE_SCROLL) == 0)
+ || (g_strcmp0 (key, KEY_VERT_TWO_FINGER_SCROLL) == 0)
+ || (g_strcmp0 (key, KEY_HORIZ_TWO_FINGER_SCROLL) == 0)) {
+ set_scrolling (manager->priv->settings_touchpad);
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_NATURAL_SCROLL) == 0) {
+ set_natural_scroll_all (manager);
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_ENABLED) == 0) {
+ set_touchpad_enabled_all (g_settings_get_boolean (settings, key));
+ }
+}
+
+static void
msd_mouse_manager_init (MsdMouseManager *manager)
{
manager->priv = MSD_MOUSE_MANAGER_GET_PRIVATE (manager);
@@ -1064,7 +1073,7 @@ msd_mouse_manager_idle_cb (MsdMouseManager *manager)
g_signal_connect (manager->priv->settings_mouse, "changed",
G_CALLBACK (mouse_callback), manager);
g_signal_connect (manager->priv->settings_touchpad, "changed",
- G_CALLBACK (mouse_callback), manager);
+ G_CALLBACK (touchpad_callback), manager);
manager->priv->syndaemon_spawned = FALSE;