Merge lp:~attente/gnome-settings-daemon/non-latin-media-keys into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[William Hua]

Also check shortcuts by key code. (LP: 1226962)

Also check shortcuts by key code. (LP: 1226962)

This branch only fixes one half of the problem, fixing gnome-settings-daemon's keyboard shortcuts on the root window.

The other half is dealing with the GTK+ side's accelerator shortcut handling for application windows more directly.

[lp:~attente/gnome-settings-daemon/non-latin-media-keys]

429. By William Hua on 2013-10-04

ocd

430. By William Hua on 2013-10-04

Merge trunk.

[Dmitry Shachnev (mitya57)]

Thanks for taking care of this issue. FYI, there is some feedback in comments 25 and 28 of the linked bug.

[Sebastien Bacher (seb128)]

(setting as rejected, it was discussed/debugged on IRc and we find a better way to resolve the issue)

review: Disapprove

Unmerged revisions

430. By William Hua on 2013-10-04

Merge trunk.

429. By William Hua on 2013-10-04

ocd

428. By William Hua on 2013-10-04

Also check shortcuts by key code. (LP: 1226962)

=== added file 'debian/patches/non-latin-media-keys.patch'
--- debian/patches/non-latin-media-keys.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/non-latin-media-keys.patch	2013-10-04 17:01:30 +0000
@@ -0,0 +1,118 @@
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -2618,6 +2618,46 @@
+                 }
+         }
+ 
++        for (i = 0; i < manager->priv->keys->len; i++) {
++                MediaKey *key;
++
++                key = g_ptr_array_index (manager->priv->keys, i);
++
++                if (match_xi2_key_fuzzily (key->key, xev)) {
++                        switch (key->key_type) {
++                        case VOLUME_DOWN_KEY:
++                        case VOLUME_UP_KEY:
++                        case VOLUME_DOWN_QUIET_KEY:
++                        case VOLUME_UP_QUIET_KEY:
++                        case SCREEN_BRIGHTNESS_UP_KEY:
++                        case SCREEN_BRIGHTNESS_DOWN_KEY:
++                        case KEYBOARD_BRIGHTNESS_UP_KEY:
++                        case KEYBOARD_BRIGHTNESS_DOWN_KEY:
++                                /* auto-repeatable keys */
++                                if (xiev->evtype != XI_KeyPress)
++                                        return GDK_FILTER_CONTINUE;
++                                break;
++                        default:
++                                if (xiev->evtype != XI_KeyRelease) {
++                                        return GDK_FILTER_CONTINUE;
++                                }
++                        }
++
++                        manager->priv->current_screen = get_screen_from_root (manager, xev->root);
++
++                        if (key->key_type == CUSTOM_KEY) {
++                                do_custom_action (manager, deviceid, key, xev->time);
++                                return GDK_FILTER_REMOVE;
++                        }
++
++                        if (do_action (manager, deviceid, key->key_type, xev->time) == FALSE) {
++                                return GDK_FILTER_REMOVE;
++                        } else {
++                                return GDK_FILTER_CONTINUE;
++                        }
++                }
++        }
++
+         return GDK_FILTER_CONTINUE;
+ }
+ 
+--- a/plugins/common/gsd-keygrab.c
++++ b/plugins/common/gsd-keygrab.c
+@@ -307,8 +307,8 @@
+ 	return state;
+ }
+ 
+-gboolean
+-match_xi2_key (Key *key, XIDeviceEvent *event)
++static gboolean
++real_match_xi2_key (Key *key, XIDeviceEvent *event, gboolean fuzzily)
+ {
+ 	guint keyval;
+ 	GdkModifierType consumed;
+@@ -335,6 +335,7 @@
+ 						 &keyval, NULL, NULL, &consumed)) {
+ 		guint lower, upper;
+ 		guint mask;
++		gboolean match;
+ 
+ 		/* HACK: we don't want to use SysRq as a keybinding, so we avoid
+ 		 * its translation from Alt+Print. */
+@@ -358,8 +359,11 @@
+ 		if (lower == key->keysym)
+ 			consumed &= ~GDK_SHIFT_MASK;
+ 
+-		return ((lower == key->keysym || upper == key->keysym)
+-			&& (state & ~consumed & gsd_used_mods) == mask);
++		match = (lower == key->keysym || upper == key->keysym)
++			&& (state & ~consumed & gsd_used_mods) == mask;
++
++		if (match || !fuzzily)
++			return match;
+ 	}
+ 
+ 	/* The key we passed doesn't have a keysym, so try with just the keycode */
+@@ -368,6 +372,18 @@
+                 && key_uses_keycode (key, keycode));
+ }
+ 
++gboolean
++match_xi2_key (Key *key, XIDeviceEvent *event)
++{
++	return real_match_xi2_key (key, event, FALSE);
++}
++
++gboolean
++match_xi2_key_fuzzily (Key *key, XIDeviceEvent *event)
++{
++	return real_match_xi2_key (key, event, TRUE);
++}
++
+ Key *
+ parse_key (const char *str)
+ {
+--- a/plugins/common/gsd-keygrab.h
++++ b/plugins/common/gsd-keygrab.h
+@@ -45,8 +45,10 @@
+ void            ungrab_key_unsafe (Key     *key,
+                                    GSList  *screens);
+ 
+-gboolean        match_xi2_key   (Key           *key,
+-                                 XIDeviceEvent *event);
++gboolean        match_xi2_key         (Key           *key,
++                                       XIDeviceEvent *event);
++gboolean        match_xi2_key_fuzzily (Key           *key,
++                                       XIDeviceEvent *event);
+ 
+ gboolean        key_uses_keycode (const Key *key,
+                                   guint keycode);

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-04 16:21:40 +0000
+++ debian/patches/series	2013-10-04 17:01:30 +0000
@@ -26,4 +26,4 @@
 ubuntu-fix-desktop-file.patch
 ubuntu-lid-close-suspend.patch
 git_thumbnail_cleaning_use_less_ios.patch
-
+non-latin-media-keys.patch