Author: branden
Date: 2004-01-19 16:11:25 -0500 (Mon, 19 Jan 2004)
New Revision: 935
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab from upstream CVS HEAD a patch to the DIX layer to work around
spurious repeated keyboard events during sync grabs when using the XKB
extension (thanks to Mark Histed for the tip). (Closes: #142569)
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-19 21:06:40 UTC (rev 934)
+++ branches/4.3.0/sid/debian/changelog 2004-01-19 21:11:25 UTC (rev 935)
@@ -110,6 +110,11 @@
- debian/control
- debian/patches/003a_damn_cpp_3.3_to_hell.diff: deleted
+ * Grab from upstream CVS HEAD a patch to the DIX layer to work around
+ spurious repeated keyboard events during sync grabs when using the XKB
+ extension (thanks to Mark Histed for the tip). (Closes: #142569)
+ - debian/patches/000_stolen_from_HEAD.diff
+
-- Branden Robinson <[EMAIL PROTECTED]> Fri, 16 Jan 2004 17:46:47 -0500
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-19
21:06:40 UTC (rev 934)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-19
21:11:25 UTC (rev 935)
@@ -55,6 +55,10 @@
748. Allow rstartd.real to be installed into a location other than LIBDIR
(#6034, Luke Mewburn).
+xc/programs/Xserver/dix/events.c @ 3.47
+ 60. Fix for spontaneous repeated keyboard events during sync grab (#A.1713,
+ Michal Marüka).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -796,3 +800,31 @@
-exec LIBDIR/SERVERNAME.real -c LIBDIR/config
+exec BINDIR/SERVERNAME.real -c LIBDIR/config
+Index: xc/programs/Xserver/dix/events.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/dix/events.c,v
+retrieving revision 3.46
+retrieving revision 3.47
+diff -u -r3.46 -r3.47
+--- xc/programs/Xserver/dix/events.c 17 Sep 2002 01:15:09 -0000 3.46
++++ xc/programs/Xserver/dix/events.c 5 Apr 2003 18:15:47 -0000 3.47
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.46 2002/09/17 01:15:09
dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.47 2003/04/05 18:15:47
dawes Exp $ */
+ /************************************************************
+
+ Copyright 1987, 1998 The Open Group
+@@ -988,6 +988,13 @@
+ xEvent *qxE;
+
+ NoticeTime(xE);
++
++#ifdef XKB
++ /* Fix for key repeating bug. */
++ if (xE->u.u.type == KeyRelease)
++ AccessXCancelRepeatKey(device->key->xkbInfo, xE->u.u.detail);
++#endif
++
+ if (DeviceEventCallback)
+ {
+ DeviceEventInfoRec eventinfo;
