* [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon/files: gnome-settings-daemon-3.0.2-keygrab-pause.patch gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch gnome-settings-daemon-3.0.2-keygrab-range.patch gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch gnome-settings-daemon-3.0.2-keygrab-defines.patch gnome-settings-daemon-3.0.2-wacom-touch.patch gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
@ 2011-08-18 6:19 Nirbheek Chauhan (nirbheek)
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-08-18 6:19 UTC (permalink / raw
To: gentoo-commits
nirbheek 11/08/18 06:19:59
Added: gnome-settings-daemon-3.0.2-keygrab-pause.patch
gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
gnome-settings-daemon-3.0.2-keygrab-range.patch
gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
gnome-settings-daemon-3.0.2-keygrab-defines.patch
gnome-settings-daemon-3.0.2-wacom-touch.patch
gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
Log:
Bump to 3.0.2, from gnome overlay for GNOME 3, dropped keywords: bug 379657
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-keygrab-pause.patch
===================================================================
From 65a5ca27a24a2d5a59797d13f305b13026794fc2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 01 Jul 2011 12:39:45 +0000
Subject: common: Allow the "Pause" key to be used
That'd be the "Pause"/"PrtScreen" key, not AudioPause.
https://bugzilla.gnome.org/show_bug.cgi?id=653524
---
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 304c8c2..70fde7a 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -147,7 +147,8 @@ grab_key_unsafe (Key *key,
*/
if ((modifiers & gsd_used_mods) == 0 &&
(IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) {
+ IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) ||
+ key->keysym == GDK_KEY_Pause)) {
GString *keycodes;
keycodes = g_string_new ("");
--
cgit v0.9
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
===================================================================
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 80f664a..c9a29fb 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
args[0] = "syndaemon";
args[1] = "-i";
- args[2] = "2.0";
+ args[2] = "0.5";
args[3] = "-K";
args[4] = "-R";
args[5] = NULL;
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-keygrab-range.patch
===================================================================
From 74631cb8e0950c7a648df53195377b0c96a09008 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 01 Jul 2011 12:38:50 +0000
Subject: common: Fix keys range check
That could never happen...
---
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 31c1ba6..304c8c2 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -146,8 +146,8 @@ grab_key_unsafe (Key *key,
* (which are useful to grab without a modifier).
*/
if ((modifiers & gsd_used_mods) == 0 &&
- IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) {
+ (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
+ IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) {
GString *keycodes;
keycodes = g_string_new ("");
--
cgit v0.9
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
===================================================================
From 33efc3649aa75fc77e4f1521031992376131d507 Mon Sep 17 00:00:00 2001
From: Chris Coulson <chris.coulson@canonical.com>
Date: Wed, 13 Jul 2011 11:58:29 +0200
Subject: [PATCH 01/11] common: Fix grabbing of multimedia keys
---
plugins/common/gsd-keygrab.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 70fde7a..1d50a22 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -146,9 +146,9 @@ grab_key_unsafe (Key *key,
* (which are useful to grab without a modifier).
*/
if ((modifiers & gsd_used_mods) == 0 &&
- (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) ||
- key->keysym == GDK_KEY_Pause)) {
+ !IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
+ !IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) &&
+ key->keysym != GDK_KEY_Pause) {
GString *keycodes;
keycodes = g_string_new ("");
--
1.7.6
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-keygrab-defines.patch
===================================================================
From afceb3e697934780b487db1e11e21fb23cbe9e28 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 01 Jul 2011 12:28:51 +0000
Subject: common: Use defines instead of variables for ranges
Seeing as those won't ever change.
---
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 464f6e8..17e287c 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -42,8 +42,10 @@ static GdkModifierType gsd_ignored_mods = 0;
static GdkModifierType gsd_used_mods = 0;
/* Taken from a comment in XF86keysym.h */
-static guint gsd_unmodified_keysym_min = 0x10080001;
-static guint gsd_unmodified_keysym_max = 0x1008FFFF;
+#define XF86KEYS_RANGE_MIN 0x10080001
+#define XF86KEYS_RANGE_MAX 0x1008FFFF
+
+#define IN_RANGE(x, min, max) (x >= min && x <= max)
static void
setup_modifiers (void)
@@ -141,8 +143,7 @@ grab_key_unsafe (Key *key,
* a modifier).
*/
if ((modifiers & gsd_used_mods) == 0 &&
- ((key->keysym < gsd_unmodified_keysym_min) ||
- (key->keysym > gsd_unmodified_keysym_max))) {
+ (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) {
GString *keycodes;
keycodes = g_string_new ("");
--
cgit v0.9
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-wacom-touch.patch
===================================================================
From 4248d799058f36bbb93ab9be173b249e7f631f80 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 25 May 2011 02:50:15 +0000
Subject: wacom: enable wacom touch key by default.
This was caused by a misunderstanding of the touch behaviour.
This key enables/disables the touch part of the tablet altogether, not the
behaviour of touch while using the pen. Hence the erroneous default, we
really don't want to disable touch on most tablets by default.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
https://bugzilla.gnome.org/show_bug.cgi?id=651020
---
diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
index 738b26a..4554d62 100644
--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
@@ -23,9 +23,9 @@
<_description>Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, and 'ccw' for 90 degree counterclockwise.</_description>
</key>
<key name="touch" type="b">
- <default>false</default>
+ <default>true</default>
<_summary>Wacom touch feature</_summary>
- <_description>Enable this to only move the cursor when the user touches the tablet.</_description>
+ <_description>Enable this to move the cursor when the user touches the tablet.</_description>
</key>
<key name="tablet-pc-button" type="b">
<default>false</default>
--
cgit v0.9
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
===================================================================
From bc6561d2b2adbe39e928528dfaba2d129b143952 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 01 Jul 2011 12:32:30 +0000
Subject: common: Fix function keys not being grabbed
Because they were unmodified, and we tried to avoid screwing
up the user's keymaps for those.
Bug was introduced in 469145ff59fe2a65d603cfeb5011427dc0f7c36b
https://bugzilla.gnome.org/show_bug.cgi?id=649222
---
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 17e287c..31c1ba6 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -45,6 +45,9 @@ static GdkModifierType gsd_used_mods = 0;
#define XF86KEYS_RANGE_MIN 0x10080001
#define XF86KEYS_RANGE_MAX 0x1008FFFF
+#define FKEYS_RANGE_MIN GDK_KEY_F1
+#define FKEYS_RANGE_MAX GDK_KEY_F35
+
#define IN_RANGE(x, min, max) (x >= min && x <= max)
static void
@@ -139,11 +142,12 @@ grab_key_unsafe (Key *key,
/* If key doesn't have a usable modifier, we don't want
* to grab it, since the user might lose a useful key.
*
- * The exception is the XFree86 keys (which are useful to grab without
- * a modifier).
+ * The exception is the XFree86 keys and the Function keys
+ * (which are useful to grab without a modifier).
*/
if ((modifiers & gsd_used_mods) == 0 &&
- (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) {
+ IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
+ IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) {
GString *keycodes;
keycodes = g_string_new ("");
--
cgit v0.9
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-18 6:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-18 6:19 [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon/files: gnome-settings-daemon-3.0.2-keygrab-pause.patch gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch gnome-settings-daemon-3.0.2-keygrab-range.patch gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch gnome-settings-daemon-3.0.2-keygrab-defines.patch gnome-settings-daemon-3.0.2-wacom-touch.patch gnome-settings-daemon-3.0.2-keygrab-function-keys.patch Nirbheek Chauhan (nirbheek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox