1
=== added file 'debian/patches/non-latin-media-keys.patch'
2
--- debian/patches/non-latin-media-keys.patch	1970-01-01 00:00:00 +0000
3
+++ debian/patches/non-latin-media-keys.patch	2013-10-04 17:01:30 +0000
4
@@ -0,0 +1,118 @@
5
1
--- a/plugins/media-keys/gsd-media-keys-manager.c
6
2
+++ b/plugins/media-keys/gsd-media-keys-manager.c
7
3
@@ -2618,6 +2618,46 @@
8
4
                 }
9
5
         }
10
6
 
11
7
+        for (i = 0; i < manager->priv->keys->len; i++) {
12
8
+                MediaKey *key;
13
9
+
14
10
+                key = g_ptr_array_index (manager->priv->keys, i);
15
11
+
16
12
+                if (match_xi2_key_fuzzily (key->key, xev)) {
17
13
+                        switch (key->key_type) {
18
14
+                        case VOLUME_DOWN_KEY:
19
15
+                        case VOLUME_UP_KEY:
20
16
+                        case VOLUME_DOWN_QUIET_KEY:
21
17
+                        case VOLUME_UP_QUIET_KEY:
22
18
+                        case SCREEN_BRIGHTNESS_UP_KEY:
23
19
+                        case SCREEN_BRIGHTNESS_DOWN_KEY:
24
20
+                        case KEYBOARD_BRIGHTNESS_UP_KEY:
25
21
+                        case KEYBOARD_BRIGHTNESS_DOWN_KEY:
26
22
+                                /* auto-repeatable keys */
27
23
+                                if (xiev->evtype != XI_KeyPress)
28
24
+                                        return GDK_FILTER_CONTINUE;
29
25
+                                break;
30
26
+                        default:
31
27
+                                if (xiev->evtype != XI_KeyRelease) {
32
28
+                                        return GDK_FILTER_CONTINUE;
33
29
+                                }
34
30
+                        }
35
31
+
36
32
+                        manager->priv->current_screen = get_screen_from_root (manager, xev->root);
37
33
+
38
34
+                        if (key->key_type == CUSTOM_KEY) {
39
35
+                                do_custom_action (manager, deviceid, key, xev->time);
40
36
+                                return GDK_FILTER_REMOVE;
41
37
+                        }
42
38
+
43
39
+                        if (do_action (manager, deviceid, key->key_type, xev->time) == FALSE) {
44
40
+                                return GDK_FILTER_REMOVE;
45
41
+                        } else {
46
42
+                                return GDK_FILTER_CONTINUE;
47
43
+                        }
48
44
+                }
49
45
+        }
50
46
+
51
47
         return GDK_FILTER_CONTINUE;
52
48
 }
53
49
 
54
50
--- a/plugins/common/gsd-keygrab.c
55
51
+++ b/plugins/common/gsd-keygrab.c
56
52
@@ -307,8 +307,8 @@
57
53
 	return state;
58
54
 }
59
55
 
60
56
-gboolean
61
57
-match_xi2_key (Key *key, XIDeviceEvent *event)
62
58
+static gboolean
63
59
+real_match_xi2_key (Key *key, XIDeviceEvent *event, gboolean fuzzily)
64
60
 {
65
61
 	guint keyval;
66
62
 	GdkModifierType consumed;
67
63
@@ -335,6 +335,7 @@
68
64
 						 &keyval, NULL, NULL, &consumed)) {
69
65
 		guint lower, upper;
70
66
 		guint mask;
71
67
+		gboolean match;
72
68
 
73
69
 		/* HACK: we don't want to use SysRq as a keybinding, so we avoid
74
70
 		 * its translation from Alt+Print. */
75
71
@@ -358,8 +359,11 @@
76
72
 		if (lower == key->keysym)
77
73
 			consumed &= ~GDK_SHIFT_MASK;
78
74
 
79
75
-		return ((lower == key->keysym || upper == key->keysym)
80
76
-			&& (state & ~consumed & gsd_used_mods) == mask);
81
77
+		match = (lower == key->keysym || upper == key->keysym)
82
78
+			&& (state & ~consumed & gsd_used_mods) == mask;
83
79
+
84
80
+		if (match || !fuzzily)
85
81
+			return match;
86
82
 	}
87
83
 
88
84
 	/* The key we passed doesn't have a keysym, so try with just the keycode */
89
85
@@ -368,6 +372,18 @@
90
86
                 && key_uses_keycode (key, keycode));
91
87
 }
92
88
 
93
89
+gboolean
94
90
+match_xi2_key (Key *key, XIDeviceEvent *event)
95
91
+{
96
92
+	return real_match_xi2_key (key, event, FALSE);
97
93
+}
98
94
+
99
95
+gboolean
100
96
+match_xi2_key_fuzzily (Key *key, XIDeviceEvent *event)
101
97
+{
102
98
+	return real_match_xi2_key (key, event, TRUE);
103
99
+}
104
100
+
105
101
 Key *
106
102
 parse_key (const char *str)
107
103
 {
108
104
--- a/plugins/common/gsd-keygrab.h
109
105
+++ b/plugins/common/gsd-keygrab.h
110
106
@@ -45,8 +45,10 @@
111
107
 void            ungrab_key_unsafe (Key     *key,
112
108
                                    GSList  *screens);
113
109
 
114
110
-gboolean        match_xi2_key   (Key           *key,
115
111
-                                 XIDeviceEvent *event);
116
112
+gboolean        match_xi2_key         (Key           *key,
117
113
+                                       XIDeviceEvent *event);
118
114
+gboolean        match_xi2_key_fuzzily (Key           *key,
119
115
+                                       XIDeviceEvent *event);
120
116
 
121
117
 gboolean        key_uses_keycode (const Key *key,
122
118
                                   guint keycode);
123
0
119
124
=== modified file 'debian/patches/series'
125
--- debian/patches/series	2013-10-04 16:21:40 +0000
126
+++ debian/patches/series	2013-10-04 17:01:30 +0000
127
@@ -26,4 +26,4 @@
128
26
ubuntu-fix-desktop-file.patch
26
ubuntu-fix-desktop-file.patch
129
27
ubuntu-lid-close-suspend.patch
27
ubuntu-lid-close-suspend.patch
130
28
git_thumbnail_cleaning_use_less_ios.patch
28
git_thumbnail_cleaning_use_less_ios.patch
132
29
29
non-latin-media-keys.patch
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher		2013-10-04	Disapprove on 2013-10-08
Review via email: mp+189369@code.launchpad.net