diff options
-rw-r--r-- | clutter/clutter/x11/clutter-backend-x11.c | 20 | ||||
-rw-r--r-- | clutter/clutter/x11/clutter-xkb-a11y-x11.c | 9 |
2 files changed, 27 insertions, 2 deletions
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c index 0ddd0f836..8c5ebc834 100644 --- a/clutter/clutter/x11/clutter-backend-x11.c +++ b/clutter/clutter/x11/clutter-backend-x11.c @@ -54,6 +54,7 @@ #include "clutter-main.h" #include "clutter-private.h" #include "clutter-settings-private.h" +#include "clutter-xkb-a11y-x11.h" G_DEFINE_TYPE (ClutterBackendX11, clutter_backend_x11, CLUTTER_TYPE_BACKEND) @@ -277,6 +278,20 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11) } static void +on_keymap_state_change (ClutterKeymapX11 *keymap_x11, + gpointer data) +{ + ClutterDeviceManager *device_manager = CLUTTER_DEVICE_MANAGER (data); + ClutterKbdA11ySettings kbd_a11y_settings; + + /* On keymaps state change, just reapply the current settings, it'll + * take care of enabling/disabling mousekeys based on NumLock state. + */ + clutter_device_manager_get_kbd_a11y_settings (device_manager, &kbd_a11y_settings); + clutter_device_manager_x11_apply_kbd_a11y_settings (device_manager, &kbd_a11y_settings); +} + +static void clutter_backend_x11_create_keymap (ClutterBackendX11 *backend_x11) { if (backend_x11->keymap == NULL) @@ -292,6 +307,11 @@ clutter_backend_x11_create_keymap (ClutterBackendX11 *backend_x11) backend = CLUTTER_BACKEND (backend_x11); translator = CLUTTER_EVENT_TRANSLATOR (backend_x11->keymap); _clutter_backend_add_event_translator (backend, translator); + + g_signal_connect (backend_x11->keymap, + "state-changed", + G_CALLBACK (on_keymap_state_change), + backend->device_manager); } } diff --git a/clutter/clutter/x11/clutter-xkb-a11y-x11.c b/clutter/clutter/x11/clutter-xkb-a11y-x11.c index 6adde813a..6b782c7a5 100644 --- a/clutter/clutter/x11/clutter-xkb-a11y-x11.c +++ b/clutter/clutter/x11/clutter-xkb-a11y-x11.c @@ -241,8 +241,13 @@ clutter_device_manager_x11_apply_kbd_a11y_settings (ClutterDeviceManager *devi } /* mouse keys */ - if (set_xkb_ctrl (desc, kbd_a11y_settings->controls, - CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | XkbMouseKeysAccelMask)) + if (clutter_keymap_get_num_lock_state (CLUTTER_KEYMAP (backend_x11->keymap))) + { + /* Disable mousekeys when NumLock is ON */ + desc->ctrls->enabled_ctrls &= ~(XkbMouseKeysMask | XkbMouseKeysAccelMask); + } + else if (set_xkb_ctrl (desc, kbd_a11y_settings->controls, + CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | XkbMouseKeysAccelMask)) { gint mk_max_speed; gint mk_accel_time; |