[Pkg-xfce-commits] r7981 - in /desktop/trunk/libxfce4ui/debian: changelog patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Wed Oct  9 19:10:32 2013
New Revision: 7981

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7981
Log:
upload

Added:
    desktop/trunk/libxfce4ui/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch
Modified:
    desktop/trunk/libxfce4ui/debian/changelog
    desktop/trunk/libxfce4ui/debian/patches/series

Modified: desktop/trunk/libxfce4ui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/changelog?rev=7981&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/changelog	(original)
+++ desktop/trunk/libxfce4ui/debian/changelog	Wed Oct  9 19:10:32 2013
@@ -1,9 +1,12 @@
-libxfce4ui (4.10.0-5) UNRELEASED; urgency=low
+libxfce4ui (4.10.0-5) unstable; urgency=low
 
   * debian/rules:
     - force disable gladeui.                                    closes: #724037
+  * debian/patches:
+    - 02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744 added, fix
+      keyboard shortcut not working when using shift modifier.  closes: #721669
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 22 Sep 2013 20:55:00 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 09 Oct 2013 21:01:03 +0200
 
 libxfce4ui (4.10.0-4) unstable; urgency=low
 

Added: desktop/trunk/libxfce4ui/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch?rev=7981&op=file
==============================================================================
--- desktop/trunk/libxfce4ui/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch	(added)
+++ desktop/trunk/libxfce4ui/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch	Wed Oct  9 19:10:32 2013
@@ -0,0 +1,68 @@
+From 9dfbc906f89601f145557fe6846e9ad44a8e9e22 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Tue, 18 Dec 2012 09:00:44 +0100
+Subject: [PATCH] Fix keyboard shortcuts with Shift modifier (bug #8744).
+
+---
+ libxfce4kbd-private/xfce-shortcut-dialog.c   |  8 ++++++++
+ libxfce4kbd-private/xfce-shortcuts-grabber.c | 12 +++++++++++-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c
+index 0519982..2ee1931 100644
+--- a/libxfce4kbd-private/xfce-shortcut-dialog.c
++++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
+@@ -371,6 +371,14 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog,
+                                        &keyval, NULL, NULL, &consumed);
+ 
+   /* Get the modifiers */
++
++  /* If Shift was used when translating the keyboard state, we remove it
++   * from the consumed bit because gtk_accelerator_{name,parse} fail to
++   * handle this correctly. This allows us to have shortcuts with Shift
++   * as a modifier key (see bug #8744). */
++  if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK))
++    consumed &= ~GDK_SHIFT_MASK;
++
+   modifiers &= ~consumed;
+   modifiers &= mod_mask;
+ 
+diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c
+index b8d2898..dd13f7e 100644
+--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
++++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
+@@ -313,7 +313,7 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
+     TRACE ("Ungrabbing %s", shortcut_name);
+ 
+   TRACE ("Keyval: %d", key->keyval);
+-  TRACE ("Modifiers: 0x%x", key->modifiers);
++  TRACE ("Modifiers: 0x%x", modifiers);
+ 
+   g_free (shortcut_name);
+ 
+@@ -512,6 +512,14 @@ xfce_shortcuts_grabber_event_filter (Gdk
+                                        &keyval, NULL, NULL, &consumed);
+ 
+   /* Get the modifiers */
++
++  /* If Shift was used when translating the keyboard state, we remove it
++   * from the consumed bit because gtk_accelerator_{name,parse} fail to
++   * handle this correctly. This allows us to have shortcuts with Shift
++   * as a modifier key (see bug #8744). */
++  if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK))
++    consumed &= ~GDK_SHIFT_MASK;
++
+   modifiers &= ~consumed;
+   gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
+   modifiers &= mod_mask;
+@@ -506,6 +515,7 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent            *gdk_xevent,
+   context.modifiers = modifiers;
+ 
+   raw_shortcut_name = gtk_accelerator_name (keyval, modifiers);
++  gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers);
+   TRACE ("Looking for %s", raw_shortcut_name);
+   g_free (raw_shortcut_name);
+ 
+-- 
+1.8.4.rc3
+

Modified: desktop/trunk/libxfce4ui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/patches/series?rev=7981&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/patches/series	(original)
+++ desktop/trunk/libxfce4ui/debian/patches/series	Wed Oct  9 19:10:32 2013
@@ -1 +1,2 @@
 01_replace-ctrl-primary-gtk-shortcuts.patch
+02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch