rpms/vino/FC-4 vino-2.10.0-fix-over-eager-key-repeat.patch, 1.1, 1.2 vino.spec, 1.23, 1.24

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 30 10:06:19 UTC 2005


Author: markmc

Update of /cvs/dist/rpms/vino/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29831

Modified Files:
	vino-2.10.0-fix-over-eager-key-repeat.patch vino.spec 
Log Message:
* Fri Sep 30 2005 Mark McLoughlin <markmc at redhat.com> 2.10.0-4.1
- Add another keyboard handling fix. Patch from Alexandre Oliva
  in bug #158713


vino-2.10.0-fix-over-eager-key-repeat.patch:
 vino-input.c |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

Index: vino-2.10.0-fix-over-eager-key-repeat.patch
===================================================================
RCS file: /cvs/dist/rpms/vino/FC-4/vino-2.10.0-fix-over-eager-key-repeat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vino-2.10.0-fix-over-eager-key-repeat.patch	20 May 2005 16:58:46 -0000	1.1
+++ vino-2.10.0-fix-over-eager-key-repeat.patch	30 Sep 2005 10:06:17 -0000	1.2
@@ -1,6 +1,17 @@
---- vino-2.10.0/server/vino-input.c.fix-over-eager-key-repeat	2005-05-20 12:52:40.000000000 -0400
-+++ vino-2.10.0/server/vino-input.c	2005-05-20 12:52:58.000000000 -0400
-@@ -294,7 +294,15 @@
+--- vino-2.10.0/server/vino-input.c.fix-over-eager-key-repeat	2005-09-30 05:39:16.000000000 -0400
++++ vino-2.10.0/server/vino-input.c	2005-09-30 05:40:59.000000000 -0400
+@@ -49,6 +49,10 @@
+  */
+ #define VINO_IS_LATIN1_KEYSYM(k) ((k) != NoSymbol && ((k) & 0x0f00) == 0)
+ 
++#define VINO_IS_MODIFIER_KEYSYM(k) (((k) >= XK_Shift_L && (k) <= XK_Hyper_R) || \
++                                     (k) == XK_Mode_switch                   || \
++                                     (k) == XK_ISO_Level3_Shift)
++
+ typedef enum
+ {
+   VINO_LEFT_SHIFT  = 1 << 0,
+@@ -294,7 +298,15 @@
  {
  #ifdef HAVE_XTEST
    Display *xdisplay;
@@ -11,13 +22,13 @@
 +   * and ignore key releases. The exception is modifiers.
 +   */
 +
-+  if (!key_press && !(keysym >= XK_Shift_L && keysym <= XK_Hyper_R))
++  if (!key_press && !VINO_IS_MODIFIER_KEYSYM (keysym))
 +    return;
 +
    xdisplay = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
    
    vino_input_update_modifier_state (&global_input_data,
-@@ -316,16 +324,17 @@
+@@ -316,16 +328,17 @@
  
        if (keycode != NoSymbol)
  	{
@@ -40,12 +51,12 @@
  	}
      }
    else if (keysym != XK_Caps_Lock)
-@@ -338,8 +347,16 @@
+@@ -338,8 +351,16 @@
  		   keysym, key_press ? "press" : "release", keycode);
  
  	  XTestFakeKeyEvent (xdisplay, keycode, key_press, CurrentTime);
 +
-+	  if (key_press && !(keysym >= XK_Shift_L && keysym <= XK_Hyper_R))
++	  if (key_press && !VINO_IS_MODIFIER_KEYSYM (keysym))
 +	    {
 +	      XTestFakeKeyEvent (xdisplay, keycode, FALSE, CurrentTime);
 +	    }


Index: vino.spec
===================================================================
RCS file: /cvs/dist/rpms/vino/FC-4/vino.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vino.spec	20 May 2005 16:58:46 -0000	1.23
+++ vino.spec	30 Sep 2005 10:06:17 -0000	1.24
@@ -7,7 +7,7 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.10.0
-Release: 4
+Release: 4.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -39,6 +39,8 @@
 Patch3: vino-2.10.0-fix-broken-shift-with-some-keys.patch
 
 # https://bugzilla.redhat.com/134451 (upstreamed)
+# and later
+# https://bugzilla.redhat.com/158713 (also upstreamed)
 Patch4: vino-2.10.0-fix-over-eager-key-repeat.patch
 
 %description
@@ -51,7 +53,7 @@
 %patch1 -p1 -b .nohelp
 %patch2 -p1 -b .fix-caps-lock
 %patch3 -p1 -b .fix-broken-shift-with-some-keys
-%patch4 -p1 -b .fix-over-eager-key-repeat.patch
+%patch4 -p1 -b .fix-over-eager-key-repeat
 
 %build
 %configure --disable-gnutls --disable-session-support --disable-http-server
@@ -107,6 +109,10 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Fri Sep 30 2005 Mark McLoughlin <markmc at redhat.com> 2.10.0-4.1
+- Add another keyboard handling fix. Patch from Alexandre Oliva
+  in bug #158713
+
 * Fri May 20 2005 Mark McLoughlin <markmc at redhat.com> 2.10.0-4
 - Fix various keyboarding handling issues:
    + bug #142974: caps lock not working




More information about the fedora-cvs-commits mailing list