Attachment 1484 Details for Bug 1651 – [FIXED_X11R68x] Hmm this is the correct patch, relative to 6.8.1.

[patch] [FIXED_X11R68x] Hmm this is the correct patch, relative to 6.8.1.

kbd-repeat-fix3 (text/plain), 1.94 KB, created by Matthieu Herrb on 2004-12-06 13:59:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Herrb

Created: 2004-12-06 13:59:50 UTC

Size: 1.94 KB

patch

obsolete

>Index: kbd.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v
>retrieving revision 1.6
>retrieving revision 1.8
>diff -u -r1.6 -r1.8
>--- kbd.c	31 Aug 2004 01:36:13 -0000	1.6
>+++ kbd.c	6 Dec 2004 21:51:11 -0000	1.8
>@@ -1,4 +1,4 @@
>-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.6 2004/08/31 01:36:13 kem Exp $ */
>+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2004/12/06 21:51:11 herrb Exp $ */
> /* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */
> 
> /*
>@@ -12,7 +12,7 @@
>  * xf86Events.c and xf86Io.c which are
>  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
>  */
>-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.6 2004/08/31 01:36:13 kem Exp $ */
>+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2004/12/06 21:51:11 herrb Exp $ */
>   
> #define NEED_EVENTS
> #include "X.h"
>@@ -135,7 +135,7 @@
>     "Protocol",		"standard",
>     "AutoRepeat",	"500 30",
>     "XkbRules",		__XKBDEFRULES__,
>-    "XkbModel",		"pc101",
>+    "XkbModel",		"pc105",
>     "XkbLayout",	"us",
>     "Panix106",		"off",
>     "CustomKeycodes",	"off",
>@@ -372,6 +372,7 @@
>   }
> #endif
>   pKbd->SetLeds(pInfo, pKbd->leds);
>+  pKbd->autoRepeat = ctrl->autoRepeat;
> 
>   return (Success);
> }
>@@ -720,14 +721,14 @@
>   /*
>    * check for an autorepeat-event
>    */
>-  if (down) {
>+  if (down && KeyPressed(keycode)) {
>       int num = keycode >> 3;
>       int bit = 1 << (keycode & 7);
>-      if ((keyc->down[num] & bit) &&
>-          ((kbdfeed->ctrl.autoRepeat != AutoRepeatModeOn) ||
>-            keyc->modifierMap[keycode] ||
>-            !(kbdfeed->ctrl.autoRepeats[num] & bit)))
>-          return;
>+
>+      if ((pKbd->autoRepeat != AutoRepeatModeOn) ||
>+	  keyc->modifierMap[keycode] ||
>+	  !(kbdfeed->ctrl.autoRepeats[num] & bit))
>+	  return;
>   }
> 
>    if (UsePrefix) {

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1651: 1320 | 1483 | 1484

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.