subject:"xserver\-xorg\-input\-keyboard\: Changes to 'upstream\-unstable'"

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2016-11-17 Thread Timo Aaltonen

 configure.ac |4 -
 src/bsd_KbdMap.c |   30 ++--
 src/kbd.c|  189 +++
 3 files changed, 92 insertions(+), 131 deletions(-)

New commits:
commit 0c7f51291f91eee61fcaf05080001a5e9b22fb53
Author: Peter Hutterer 
Date:   Thu Nov 17 14:21:48 2016 +1000

keyboard 1.9.0

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 993d5a8..c3ebdf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-keyboard],
-[1.8.1],
+[1.9.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-keyboard])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 157e0631b12d0aae4a5f38b81bee615a7eaf553f
Author: Keith Packard 
Date:   Mon May 30 01:27:49 2016 -0700

Use xf86AddEnabledDevice with threaded input

We didn't use SIGIO input for keyboard processing, but we can use
threaded input.

Signed-off-by: Keith Packard 
Signed-off-by: Peter Hutterer 

diff --git a/src/kbd.c b/src/kbd.c
index e378dcc..be6948c 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -45,6 +45,10 @@
 #include "xkbstr.h"
 #include "xkbsrv.h"
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
+#define HAVE_THREADED_INPUT1
+#endif
+
 #define CAPSFLAG   1
 #define NUMFLAG2
 #define SCROLLFLAG 4
@@ -352,7 +356,11 @@ KbdProc(DeviceIntPtr device, int what)
  */
 if (pInfo->fd >= 0) {
xf86FlushInput(pInfo->fd);
+#if HAVE_THREADED_INPUT
+   xf86AddEnabledDevice(pInfo);
+#else
AddEnabledDevice(pInfo->fd);
+#endif
 }
 
 device->public.on = TRUE;
@@ -365,8 +373,13 @@ KbdProc(DeviceIntPtr device, int what)
 /*
  * Restore original keyboard directness and translation.
  */
-if (pInfo->fd != -1)
+if (pInfo->fd != -1) {
+#if HAVE_THREADED_INPUT
+  xf86RemoveEnabledDevice(pInfo);
+#else
   RemoveEnabledDevice(pInfo->fd);
+#endif
+}
 pKbd->KbdOff(pInfo, what);
 device->public.on = FALSE;
 break;

commit 9ab899863a61b800d58e078e936c0d8d88bc0893
Author: Alexandr Shadchin 
Date:   Tue Nov 24 12:46:44 2015 +0500

Remove support for X input ABI < 12

Signed-off-by: Alexandr Shadchin 
Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 6fd6576..993d5a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4] xproto inputproto)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
 
 # Define a configure option for an alternate input module directory
 AC_ARG_WITH(xorg-module-dir,
diff --git a/src/kbd.c b/src/kbd.c
index 1ce4ee6..e378dcc 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -53,11 +53,7 @@
 /* Used to know when the first DEVICE_ON after a DEVICE_INIT is called */
 #define INITFLAG   (1U << 31)
 
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
-#else
 static int KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
-#endif
 static int KbdProc(DeviceIntPtr device, int what);
 static void KbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
 static void KbdBell(int percent, DeviceIntPtr dev, pointer ctrl, int unused);
@@ -132,43 +128,8 @@ _X_EXPORT XF86ModuleData kbdModuleData = {
 NULL
 };
 
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-static int
-NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
-
-static InputInfoPtr
-KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
-{
-InputInfoPtr pInfo;
-
-if (!(pInfo = xf86AllocateInput(drv, 0)))
-   return NULL;
-
-pInfo->name = dev->identifier;
-pInfo->flags = XI86_KEYBOARD_CAPABLE;
-pInfo->conversion_proc = NULL;
-pInfo->reverse_conversion_proc = NULL;
-pInfo->private_flags = 0;
-pInfo->always_core_feedback = NULL;
-pInfo->conf_idev = dev;
-pInfo->close_proc = NULL;
-
-if (NewKbdPreInit(drv, pInfo, flags) == Success)
-{
-pInfo->flags |= XI86_CONFIGURED;
-return pInfo;
-}
-
-xf86DeleteInput(pInfo, 0);
-return NULL;
-}
-
-static int
-NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-#else
 static int
 KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-#endif
 {
 KbdDevPtr pKbd;
 char *s;
@@ -189,11 +150,7 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int 
flags)
 pInfo->dev = NULL;
 
 defaults = kbdDefaults;
-xf86CollectInputOptions(pInfo, defaults
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-, NULL
-#endif
-);
+

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2013-07-21 Thread Julien Cristau

 autogen.sh|4 +++-
 configure.ac  |5 ++---
 man/kbd.man   |2 +-
 src/Makefile.am   |1 +
 src/at_scancode.c |4 ++--
 src/kbd.c |   23 +--
 src/sun_kbd.c |   30 ++
 src/xf86OSKbd.h   |4 
 8 files changed, 52 insertions(+), 21 deletions(-)

New commits:
commit ec3ccb22d4e7348ac537100fcb1b7ddc07df57b8
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Mar 27 11:13:18 2013 +1000

keyboard 1.7.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 68b1b9e..c699f6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-keyboard],
-[1.6.2],
+[1.7.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-keyboard])
 AC_CONFIG_SRCDIR([Makefile.am])

commit ad2a1dd1aa1eb777f330242d46254b29b9cb
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Aug 17 14:07:12 2012 +1000

Use sigsafe logging for keyboard debug messages

This changes the log format to simple hex display, the server's signal-safe
printf implementation doesn't handle %2.2x.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/at_scancode.c b/src/at_scancode.c
index 7209c20..a519a6c 100644
--- a/src/at_scancode.c
+++ b/src/at_scancode.c
@@ -112,8 +112,8 @@ ATScancode(InputInfoPtr pInfo, int *scanCode)
 case 0x36:
 return TRUE;
 default:
- xf86MsgVerb(X_INFO, 4, Unreported Prefix0 scancode: 
0x%02x\n,
-*scanCode);
+ LogMessageVerbSigSafe(X_INFO, 4, Unreported Prefix0 
scancode: 0x%x\n,
+   *scanCode);
  *scanCode += 0x78;
   }
break;
diff --git a/src/kbd.c b/src/kbd.c
index 94523aa..9a013b7 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -410,9 +410,9 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, 
Bool down)
   int state;
 
 #ifdef DEBUG
-  ErrorF(kbd driver rec scancode: 0x02%x %s\n, scanCode, down?down:up);
+  LogMessageVerbSigSafe(X_INFO, -1, kbd driver rec scancode: 0x%x %s\n, 
scanCode, down ? down : up);
 #endif
- 
+
   /*
* First do some special scancode remapping ...
*/
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index f1e530e..2e7add6 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -459,20 +459,22 @@ ReadInput(InputInfoPtr pInfo)
case EINTR:  /* Interrupted, try again */
break;
case ENODEV: /* May happen when USB kbd is unplugged */
-   /* We use X_NONE here because it doesn't alloc since we
-  may be called from SIGIO handler */
-   xf86MsgVerb(X_NONE, 0,
-   %s: Device no longer present - removing.\n,
-   pInfo-name);
+   /* We use X_NONE here because it didn't alloc since we
+  may be called from SIGIO handler. No longer true for
+  sigsafe logging, but matters for older servers  */
+   LogMessageVerbSigSafe(X_NONE, 0,
+ %s: Device no longer present - 
removing.\n,
+ pInfo-name);
xf86RemoveEnabledDevice(pInfo);
priv-remove_timer = TimerSet(priv-remove_timer, 0, 1,
  RemoveKeyboard, pInfo);
return;
default: /* All other errors */
-   /* We use X_NONE here because it doesn't alloc since we
-  may be called from SIGIO handler */
-   xf86MsgVerb(X_NONE, 0, %s: Read error: %s\n, pInfo-name,
-   strerror(errno));
+   /* We use X_NONE here because it didn't alloc since we
+  may be called from SIGIO handler. No longer true for
+  sigsafe logging, but matters for older servers  */
+   LogMessageVerbSigSafe(X_NONE, 0, %s: Read error: %s\n, 
pInfo-name,
+ strerror(errno));
return;
}
} else { /* nBytes == 0, so nothing more to read */
diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
index cba049f..0d8792d 100644
--- a/src/xf86OSKbd.h
+++ b/src/xf86OSKbd.h
@@ -29,6 +29,10 @@
 
 #include xf86Xinput.h
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  18
+#define LogMessageVerbSigSafe xf86MsgVerb
+#endif
+
 Bool ATScancode(InputInfoPtr pInfo, int *scanCode);
 
 /* Public interface to OS-specific keyboard support. */

commit 4a954bc6a8fbc4aa50dfcabec011274252713204
Author: Colin Walters walt...@verbum.org
Date:   Wed Jan 4 17:37:06 2012 -0500

autogen.sh: Implement

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2012-03-20 Thread Cyril Brulebois

 configure.ac  |2 +-
 man/kbd.man   |   19 +++
 src/at_scancode.c |4 +---
 src/kbd.c |   31 ++-
 4 files changed, 23 insertions(+), 33 deletions(-)

New commits:
commit a6a0dee4178600a5a9403f69c22bd4eb483fbd34
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jan 4 10:45:09 2012 +1000

keyboard 1.6.1

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 8692836..4245955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-keyboard],
-[1.6.0],
+[1.6.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-keyboard])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 45f9f4552c4dab2efc29fd4d3d5c1a9dcd7c34b3
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Oct 4 09:16:17 2011 +1000

man: link to xkeyboard-config(7) (#14494)

X.Org Bug 14494 http://bugs.freedesktop.org/show_bug.cgi?id=14494

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Gaetan Nadon mems...@videotron.ca
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

diff --git a/man/kbd.man b/man/kbd.man
index 3d6bf21..c8d70cc 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -88,6 +88,9 @@ enhance the keyboard layout details.  Default: not set.
 .BI Option \*qXkbOptions\*q \*q options \*q
 specifies the XKB keyboard option components.  These can be used to
 enhance the keyboard behaviour.  Default: not set.
+.PP
+For a list of available XKB options, see
+.B xkeyboard-config(__miscmansuffix__).
 .SH EXAMPLE
 The following xorg.conf fragment ensures that user will be able to switch 
between
 .I us
@@ -129,3 +132,5 @@ __xservername__(__appmansuffix__), 
__xconfigfile__(__filemansuffix__),
 Xserver(__appmansuffix__), X(__miscmansuffix__).
 
 hal(__miscmansuffix__), hald(__adminmansuffix__), fdi(__filemansuffix__).
+
+xkeyboard-config(__miscmansuffix__).

commit 20beb15d24b5f8ab194b94f7e29f49e91ea38a8b
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Sep 26 09:56:17 2011 +1000

Remove calls to xf86IsPc98()

This call is being removed from the server and this isn't worth keeping
ifdefs around for.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Matthieu Herrb matthieu.he...@laas.fr
Tested-by: Alan Coopersmith alan.coopersm...@oracle.com
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

diff --git a/src/at_scancode.c b/src/at_scancode.c
index 245945c..7209c20 100644
--- a/src/at_scancode.c
+++ b/src/at_scancode.c
@@ -48,8 +48,7 @@ ATScancode(InputInfoPtr pInfo, int *scanCode)
   pKbd-scanPrefix = *scanCode;  /* special prefixes */
   return TRUE;
   }
-  if (!xf86IsPc98()) {
-switch (*scanCode) {
+  switch (*scanCode) {
  case 0x59: *scanCode = KEY_0x59; break;
  case 0x5a: *scanCode = KEY_0x5A; break;
  case 0x5b: *scanCode = KEY_0x5B; break;
@@ -78,7 +77,6 @@ ATScancode(InputInfoPtr pInfo, int *scanCode)
  case 0x74: *scanCode = KEY_0x74; break;
  case 0x75: *scanCode = KEY_0x75; break;
  case 0x76: *scanCode = KEY_0x76; break;
-}
   }
   break;
case KEY_Prefix0:
diff --git a/src/kbd.c b/src/kbd.c
index 19bafb8..e04c340 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -88,14 +88,6 @@ static const char *kbdDefaults[] = {
 NULL
 };
 
-static const char *kbd98Defaults[] = {
-Protocol,standard,
-XkbRules,xfree98,
-XkbModel,pc98,
-XkbLayout,   jp,
-NULL
-};
-
 static char *xkb_rules;
 static char *xkb_model;
 static char *xkb_layout;
@@ -158,10 +150,7 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int 
flags)
 pInfo-fd = -1;
 pInfo-dev = NULL;
 
-if (!xf86IsPc98())
-defaults = kbdDefaults;
-else
-defaults = kbd98Defaults;
+defaults = kbdDefaults;
 xf86CollectInputOptions(pInfo, defaults
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  12
 , NULL
@@ -399,6 +388,7 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, 
Bool down)
   KbdDevPtrpKbd = (KbdDevPtr) pInfo-private;
   DeviceIntPtr device = pInfo-dev;
   KeyClassRec  *keyc = device-key;
+  int state;
 
 #ifdef DEBUG
   ErrorF(kbd driver rec scancode: 0x02%x %s\n, scanCode, down?down:up);
@@ -425,16 +415,12 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, 
Bool down)
* physical keyboard key.
*/
 
-  if (!xf86IsPc98()) {
-int state;
-
-state = XkbStateFieldFromRec(keyc-xkbInfo-state);
+  state = XkbStateFieldFromRec(keyc-xkbInfo-state);
 
-if (((state  AltMask) == AltMask)  (scanCode == KEY_SysReqest))
-  scanCode =

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2011-03-07 Thread Cyril Brulebois

 configure.ac |2 +-
 man/kbd.man  |   11 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 0b9cd5121e1025e95a7e32addb675ab874bc6cb1
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Mar 8 09:38:29 2011 +1000

keyboard 1.6.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 522d2fe..8692836 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-keyboard],
-[1.5.99.901],
+[1.6.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-keyboard])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 24ee4f6738955d507f500a90fda8153f19dd5038
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Mar 7 12:05:48 2011 +1000

man: explain what grp_led:scroll does in the example conf section

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed by: Magnus Kessler magnus.kess...@gmx.net

diff --git a/man/kbd.man b/man/kbd.man
index 3b4617f..d224ce5 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -95,7 +95,8 @@ The following xorg.conf fragment ensures that user will be 
able to switch betwee
 .I us
 and
 .I sk
-layouts by pressing the menu key.
+layouts by pressing the menu key. The scroll lock LED shows which layout
+is currently active.
 .PP
 The
 .B XkbVariant

commit d5634b77b578721e2bb2734f5fd92090e9d4c330
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Mar 7 11:35:44 2011 +1000

man: list xorg.conf.d snippets as possible configuration location

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed by: Magnus Kessler magnus.kess...@gmx.net

diff --git a/man/kbd.man b/man/kbd.man
index 91c12bd..3b4617f 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -26,8 +26,9 @@ driver functions as a keyboard input device.
 .SH CONFIGURATION DETAILS
 .PP
 Depending on the X server version in use, input device options may be set
-in either a __xconfigfile__ file, or in the configuration files read by the
-Hardware Abstraction Layer (HAL) daemon, hald(1).
+in either a __xconfigfile__ file, an xorg.conf.d snippet, or in the
+configuration files read by the Hardware Abstraction Layer (HAL) daemon,
+hald(1).
 .PP
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details and for options that can be used with all input drivers.  This

commit 89358c49e519c7a1e0f9a9544f9c03b5d9c2115d
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Mar 7 11:34:21 2011 +1000

man: don't mention the core keyboard.

Core devices are an obsolete concept these days.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed by: Magnus Kessler magnus.kess...@gmx.net

diff --git a/man/kbd.man b/man/kbd.man
index 4fb2336..91c12bd 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -22,8 +22,7 @@ driver formerly included in __xservername__.
 .PP
 The
 .B kbd
-driver functions as a keyboard input device, and may be used as the
-X server's core keyboard.
+driver functions as a keyboard input device.
 .SH CONFIGURATION DETAILS
 .PP
 Depending on the X server version in use, input device options may be set


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwkrx-0006uq...@alioth.debian.org

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2011-02-20 Thread Cyril Brulebois

 .gitignore|   75 -
 COPYING   |   42 ++---
 Makefile.am   |   11 -
 configure.ac  |   93 ---
 man/Makefile.am   |   67 +++-
 man/kbd.man   |6 
 src/Makefile.am   |   12 -
 src/at_scancode.c |1 
 src/bsd_KbdMap.c  |  203 -
 src/bsd_kbd.c |   59 ++-
 src/bsd_kbd.h |2 
 src/hurd_kbd.c|   12 -
 src/kbd.c |  222 
 src/lnx_KbdMap.c  |   13 -
 src/lnx_kbd.c |   22 --
 src/lnx_kbd.h |2 
 src/sco_KbdMap.c  |  308 ---
 src/sco_kbd.c |  425 --
 src/sco_kbd.h |   20 --
 src/sun_kbd.c |   85 +++---
 src/sun_kbd.h |   43 ++---
 src/sun_kbdMap.c  |   26 ++-
 src/xf86Keymap.h  |  140 -
 src/xf86OSKbd.h   |   26 ---
 24 files changed, 310 insertions(+), 1605 deletions(-)

New commits:
commit 6496bb21074faff2642e09389b5476225dc4fdb3
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Feb 21 09:59:14 2011 +1000

keyboard 1.5.99.901

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index f6fdf26..522d2fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-keyboard],
-[1.5.0],
+[1.5.99.901],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-keyboard])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 15f0a4b71b4580c7dd9a0abd7b8fb92756b6733a
Author: Alexandr Shadchin alexandr.shadc...@gmail.com
Date:   Thu Feb 17 15:40:29 2011 +0500

Removed unnecessary code, since ABI_XINPUT_VERSION = 2

Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/kbd.c b/src/kbd.c
index e0f0d33..d89d234 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -276,51 +276,7 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
 static void
 InitKBD(InputInfoPtr pInfo, Bool init)
 {
-  xEvent  kevent;
   KbdDevPtr pKbd = (KbdDevPtr) pInfo-private;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  1
-  DeviceIntPtrpKeyboard = pInfo-dev;
-  KeyClassRec *keyc = pKeyboard-key;
-  KeySym  *map = keyc-curKeySyms.map;
-  unsigned inti;
-#endif
-
-  kevent.u.keyButtonPointer.time = GetTimeInMillis();
-  kevent.u.keyButtonPointer.rootX = 0;
-  kevent.u.keyButtonPointer.rootY = 0;
-
-/* The server does this for us with i-h. */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  1
-  /*
-   * Hmm... here is the biggest hack of every time !
-   * It may be possible that a switch-vt procedure has finished BEFORE
-   * you released all keys neccessary to do this. That peculiar behavior
-   * can fool the X-server pretty much, cause it assumes that some keys
-   * were not released. TWM may stuck alsmost completly
-   * OK, what we are doing here is after returning from the vt-switch
-   * exeplicitely unrelease all keyboard keys before the input-devices
-   * are reenabled.
-   */
-  for (i = keyc-curKeySyms.minKeyCode, map = keyc-curKeySyms.map;
-   i  keyc-curKeySyms.maxKeyCode;
-   i++, map += keyc-curKeySyms.mapWidth)
- if (KeyPressed(i))
-  {
-switch (*map) {
-/* Don't release the lock keys */
-case XK_Caps_Lock:
-case XK_Shift_Lock:
-case XK_Num_Lock:
-case XK_Scroll_Lock:
-case XK_Kana_Lock:
-  break;
-default:
-  kevent.u.u.detail = i;
-  kevent.u.u.type = KeyRelease;
-  (* pKeyboard-public.processInputProc)(kevent, pKeyboard, 1);
-}
-  }
-#endif
 
   pKbd-scanPrefix  = 0;
 

commit de7a5c120f646e293cc216007a5df865b41833b8
Author: Alexandr Shadchin alexandr.shadc...@gmail.com
Date:   Thu Feb 17 15:40:28 2011 +0500

Require server 1.4 or later

Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index f6ebb96..f6fdf26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server = 1.2.99.0] xproto inputproto)
+PKG_CHECK_MODULES(XORG, [xorg-server = 1.4] xproto inputproto)
 
 # Define a configure option for an alternate input module directory
 AC_ARG_WITH(xorg-module-dir,

commit a02757d7c3d8018f44c63553578763fcef41bcca
Author: Alexandr Shadchin alexandr.shadc...@gmail.com
Date:   Wed Feb 16 13:21:03 2011 +0500

Cleanup set the value of CustomKeycodes

Also, do not print values of variables CustomKeycodes twice.

Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 3b45e22..710470a

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2009-11-30 Thread Timo Aaltonen

 .gitignore   |4 
 README   |   20 ++
 configure.ac |   15 -
 man/.gitignore   |2 
 man/kbd.man  |   19 +-
 src/.gitignore   |6 
 src/bsd_kbd.c|   47 -
 src/hurd_kbd.c   |2 
 src/kbd.c|  470 +++
 src/lnx_kbd.c|  239 ---
 src/sco_kbd.c|   60 ---
 src/sun_kbd.c|  168 ---
 src/sun_kbd.h|1 
 src/sun_kbdMap.c |   10 -
 src/xf86Keymap.h |3 
 src/xf86OSKbd.h  |   11 -
 16 files changed, 253 insertions(+), 824 deletions(-)

New commits:
commit c66f4f9fcc7450f2c1378f6117bda4442d2af8ae
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Oct 7 10:53:14 2009 +1000

keyboard 1.4.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index cbcb0be..c26e402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-keyboard],
-1.3.99.1,
+1.4.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-keyboard)
 

commit 0c75afb4895b60aa08209ccfee9dfad4e4495f4d
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Oct 6 17:02:33 2009 +1000

Remove now un-used autorepeat field.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com

diff --git a/src/kbd.c b/src/kbd.c
index b2e858f..556d594 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -307,7 +307,6 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
leds = ctrl-leds  ~(XCAPS | XNUM | XSCR); /* ??? */
pKbd-leds = leds;
   pKbd-SetLeds(pInfo, pKbd-leds);
-  pKbd-autoRepeat = ctrl-autoRepeat;
 }
 
 static void
diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
index 2732649..daeabf1 100644
--- a/src/xf86OSKbd.h
+++ b/src/xf86OSKbd.h
@@ -69,7 +69,6 @@ typedef struct {
 
 intbell_pitch;
 intbell_duration;
-Bool   autoRepeat;
 unsigned long  leds;
 unsigned long  xledsMask;
 unsigned long  keyLeds;

commit adc1048980113b329d97ebf5b974ca4a50fc86ba
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Oct 6 17:00:58 2009 +1000

Don't use XKB_DFLT_RULES from the server.

On Linux, the server uses default rules of evdev which doesn't apply for
this driver. For all other cases, the server uses base, so let's just
hardcode it here too.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com

diff --git a/src/kbd.c b/src/kbd.c
index c86c2fc..b2e858f 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -113,12 +113,6 @@ static const OptionInfoRec KeyboardOptions[] = {
 { -1,  NULL, OPTV_NONE,{0}, FALSE }
 };
 
-/* Xorg 1.6 and earlier put the default XKB rules file in __XKBDEFRULES__
-   in xorg-server.h, later versions switched to XKB_DFLT_RULES */
-#if !defined(XKB_DFLT_RULES)  defined(__XKBDEFRULES__)
-# define XKB_DFLT_RULES __XKBDEFRULES__
-#endif
-
 static const char *kbdDefaults[] = {
 #ifdef XQUEUE 
 Protocol,Xqueue,
@@ -126,7 +120,7 @@ static const char *kbdDefaults[] = {
 Protocol,standard,
 #endif
 AutoRepeat,  500 30,
-XkbRules,XKB_DFLT_RULES,
+XkbRules,base,
 XkbModel,pc105,
 XkbLayout,   us,
 CustomKeycodes,  off,

commit ecd34ebd43d5a8c0db0a6dd132b61a4c663c7fd8
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Oct 6 17:05:56 2009 +1000

Require macros 1.3 for XORG_DEFAULT_OPTIONS

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 9b41f79..cbcb0be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,9 @@ AC_INIT([xf86-input-keyboard],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-keyboard)
 
-# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and
-# XORG_CHANGELOG macros
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2.1)
+# Require xorg-macros version 1.3 or newer for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR(.)
@@ -112,7 +111,7 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
 PKG_CHECK_MODULES(XORG, [xorg-server = 1.2.99.0] xproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 XORG_CFLAGS=$CWARNFLAGS $XORG_CFLAGS
 AC_SUBST([XORG_CFLAGS])
 
@@ -121,8 +120,4 @@ AC_SUBST([XORG_CFLAGS])
 # Checks for header files.
 AC_HEADER_STDC
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2009-04-09 Thread Julien Cristau

 .gitignore   |1 
 ChangeLog|   51 -
 Makefile.am  |   11 ++
 configure.ac |   18 ++-
 man/.cvsignore   |2 
 man/.gitignore   |2 
 src/.cvsignore   |6 -
 src/.gitignore   |6 +
 src/Makefile.am  |7 -
 src/atKeynames.h |  295 +++
 src/kbd.c|   52 +++--
 src/sun_kbd.c|8 +
 src/sun_kbd.h|2 
 13 files changed, 376 insertions(+), 85 deletions(-)

New commits:
commit 708ecbf8557d9e676e3bb07c1f83170f6d9f7cd7
Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
Date:   Wed Jan 7 15:09:01 2009 -0200

Update for servers newer then 1.5 or git master.

  The atKeynames.h header was moved to the kbd driver sources as
well as the xf86CommonSpecialKey() function. This problem probably
got unnoticed for quite sometime, mainly because most people doing
regular builds should either not have been building the kbd driver,
or had atKeynames.h in /usr/include/xorg from a previous install.

diff --git a/.gitignore b/.gitignore
index 2df4a8d..8cc2c1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ ltmain.sh
 missing
 stamp-h1
 *~
+kbd.4
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ce3cf1c..000
--- a/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-2006-04-06  Adam Jackson  a...@freedesktop.org
-
-   * configure.ac:
-   * src/kbd.c:
-   Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-2005-12-20  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * configure.ac:
-   Update package version for X11R7 release.
-
-2005-12-19  Alan Coopersmith  alan.coopersm...@sun.com
-
-   * man/kbd.man: 
-   * man/keyboard.man:
-   Correct documentation of XKB default settings
-   
-2005-12-14  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
-
-2005-12-06  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * man/Makefile.am:
-   Change *man_SOURCES == *man_PRE to fix autotools warnings.
-
-2005-12-03  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
-
-2005-12-01  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * configure.ac:
-   Remove extraneous AC_MSG_RESULT.
-
-2005-11-29  Adam Jackson  a...@freedesktop.org
-
-   * configure.ac:
-   Only build dlloader modules by default.
-
-2005-11-09  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * configure.ac:
-   Update package version number for X11R7 RC2 release.
-
-2005-11-01  Kevin E. Martin  kem-at-freedesktop-dot-org
-
-   * configure.ac:
-   Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..aec514f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,14 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
+
+EXTRA_DIST = ChangeLog
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+   $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index c5ca5ac..aab639c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,15 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-keyboard],
-1.3.1,
+1.3.2,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-keyboard)
 
+# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and
+# XORG_CHANGELOG macros
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2.1)
+
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -44,8 +49,6 @@ AC_PROG_CC
 
 AH_TOP([#include xorg-server.h])
 
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], 
m4_defn([AC_HELP_STRING]))])
-
 case $host_os in
   linux*)
 IS_LINUX=yes
@@ -98,8 +101,7 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
 [moduledir=$withval],
 [moduledir=$libdir/xorg/modules])
-inputdir=${moduledir}/input
-AC_SUBST(inputdir)
+AC_SUBST(moduledir)
 
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -110,8 +112,9 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
 PKG_CHECK_MODULES(XORG, [xorg-server = 1.2.99.0] xproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-CFLAGS=$CFLAGS $XORG_CFLAGS ' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
+XORG_CWARNFLAGS
+XORG_CFLAGS=$CWARNFLAGS $XORG_CFLAGS
+AC_SUBST([XORG_CFLAGS])
 
 # Checks for libraries.
 
@@ -120,5 +123,6 @@ AC_HEADER_STDC
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a589cb..823a9db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,10

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2008-05-28 Thread Brice Goglin

 .cvsignore   |   19 -
 .gitignore   |   20 +
 COPYING  |  234 ++-
 configure.ac |2 
 man/Makefile.am  |5 
 man/kbd.man  |   50 ++-
 man/keyboard.man |  108 --
 src/Makefile.am  |2 
 src/bsd_kbd.c|2 
 src/kbd.c|   24 +
 src/lnx_kbd.c|4 
 src/sun_kbd.c|  299 ---
 src/sun_kbd.h|   33 --
 src/sun_kbdEv.c  |  855 ---
 src/sun_kbdMap.c |  671 +++
 src/xf86Keymap.h |  146 -
 16 files changed, 1129 insertions(+), 1345 deletions(-)

New commits:
commit ef7873db2861a9aa103eaabbe84b4396e64ff3a1
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed May 21 15:39:59 2008 -0400

keyboard 1.3.1

diff --git a/configure.ac b/configure.ac
index 34ef70d..c5ca5ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-keyboard],
-1.3.0,
+1.3.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-keyboard)
 

commit a1866e2e73f0b401cd8e92fc9ee8db1791585936
Author: Paulo Cesar Pereira de Andrade [EMAIL PROTECTED]
Date:   Wed Apr 9 14:36:58 2008 -0300

Don't send events in DEVICE_INIT, only after DEVICE_ON.

See http://bugs.freedesktop.org/show_bug.cgi?id=2243#c15 for a description 
of
the problem fixed in this patch.

Now only the driver leds state is synched with virtual console state, and if
required, events are post in DEVICE_ON.
This also defines an internal INITFLAG state to know when DEVICE_ON is 
called
after DEVICE_INIT, otherwise, it will only send events for leds that changed
state while the device was in DEVICE_OFF state.

Signed-off-by: Peter Hutterer [EMAIL PROTECTED]

diff --git a/src/kbd.c b/src/kbd.c
index dc9ea7a..969d64c 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -59,6 +59,8 @@ extern int XkbDfltRepeatInterval;
 #define SCROLLFLAG 4
 #define MODEFLAG   8
 #define COMPOSEFLAG16
+/* Used to know when the first DEVICE_ON after a DEVICE_INIT is called */
+#define INITFLAG   (1  31)
 
 static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
 static int KbdProc(DeviceIntPtr device, int what);
@@ -472,15 +474,7 @@ InitKBD(InputInfoPtr pInfo, Bool init)
   if (init) {
   pKbd-keyLeds = pKbd-GetLeds(pInfo);
   UpdateLeds(pInfo);
-  if (pKbd-keyLeds  CAPSFLAG) {
- pKbd-PostEvent(pInfo, KEY_CapsLock, TRUE);
- pKbd-PostEvent(pInfo, KEY_CapsLock, FALSE);
-  }
-  if (pKbd-keyLeds  NUMFLAG) {
- pKbd-PostEvent(pInfo, KEY_NumLock, TRUE);
- pKbd-PostEvent(pInfo, KEY_NumLock, FALSE);
-  }
-
+  pKbd-keyLeds |= INITFLAG;
   if( pKbd-delay = 375) rad = 0x00;
   else if (pKbd-delay = 625) rad = 0x20;
   else if (pKbd-delay = 875) rad = 0x40;
@@ -489,8 +483,22 @@ InitKBD(InputInfoPtr pInfo, Bool init)
   else if (pKbd-rate = 30)   rad |= 0x00;
   else rad |= ((58 / pKbd-rate) - 2);
   pKbd-SetKbdRepeat(pInfo, rad);
-  } else
+  } else {
+  int leds = pKbd-keyLeds;
+
+  pKbd-keyLeds = pKbd-GetLeds(pInfo);
   UpdateLeds(pInfo);
+  if ((pKbd-keyLeds  CAPSFLAG) !=
+ ((leds  INITFLAG) ? 0 : (leds  CAPSFLAG))) {
+ pKbd-PostEvent(pInfo, KEY_CapsLock, TRUE);
+ pKbd-PostEvent(pInfo, KEY_CapsLock, FALSE);
+  }
+  if ((pKbd-keyLeds  NUMFLAG) !=
+ (leds  INITFLAG ? 0 : leds  NUMFLAG)) {
+ pKbd-PostEvent(pInfo, KEY_NumLock, TRUE);
+ pKbd-PostEvent(pInfo, KEY_NumLock, FALSE);
+  }
+  }
 }
 
 static int

commit 86b16003ef1134a2471cd3f7ac217db574fa714c
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Thu Mar 20 16:05:05 2008 -0400

keyboard 1.3.0

diff --git a/configure.ac b/configure.ac
index 6c81ded..34ef70d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-keyboard],
-1.2.2,
+1.3.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-keyboard)
 

commit af3adb8e24c03fcd86ad63208ce525cd4db876ac
Author: Alan Coopersmith [EMAIL PROTECTED]
Date:   Mon Mar 17 19:19:45 2008 -0700

Correct COPYING file and note which notices apply to which code/OS'es

diff --git a/COPYING b/COPYING
index 17b278e..1e67ee7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,32 @@
+Code common to all operating systems is covered by these notices:
+
+Copyright (c) 1992-2003 by The XFree86 Project, Inc.
+Copyright 1997 by Metro Link, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the Software),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2007-06-13 Thread Drew Parsons

 src/kbd.c |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 36cf953910002a00a3694033d49c6c38319b0283
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Jun 13 23:02:58 2007 +1000

Keep module version up-to-date using PACKAGE_VERSION_*

diff --git a/src/kbd.c b/src/kbd.c
index 24fe6f6..c1daa4b 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -849,7 +849,7 @@ static XF86ModuleVersionInfo xf86KbdVersionRec =
 MODINFOSTRING1,
 MODINFOSTRING2,
 XORG_VERSION_CURRENT,
-1, 1, 0,
+PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
 ABI_CLASS_XINPUT,
 ABI_XINPUT_VERSION,
 MOD_CLASS_XINPUT,

commit 05dd89ef03cee6853e7c2db518b6b22785cc3e7c
Author: Samuel Thibault [EMAIL PROTECTED]
Date:   Mon Feb 5 14:29:54 2007 -0800

Fix key led update

Cf: https://bugs.freedesktop.org/show_bug.cgi?id=313
https://bugs.freedesktop.org/attachment.cgi?id=8396action=view

 --- Comment  #8 From Samuel Thibault  2007-01-14 14:28:16  [reply] 
---

Created an attachment (id=8396) [details]
fix key led update

Ok, found the problem: when XKB is used (!pKbd-noXkb), pKbd-keyLeds is not
updated, so that UpdateLeds(), even if it called at the right places, 
actually
just clears all LEDs.  Here is a patch.

diff --git a/src/kbd.c b/src/kbd.c
index 7d402d5..24fe6f6 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -383,7 +383,22 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
InputInfoPtr pInfo = (InputInfoPtr) device-public.devicePrivate;
KbdDevPtr pKbd = (KbdDevPtr) pInfo-private;
 
-   if ( ctrl-leds  XCOMP ) {
+   if ( ctrl-leds  XLED1) {
+   pKbd-keyLeds |= CAPSFLAG;
+   } else {
+   pKbd-keyLeds = ~CAPSFLAG;
+   }
+   if ( ctrl-leds  XLED2) {
+   pKbd-keyLeds |= NUMFLAG;
+   } else {
+   pKbd-keyLeds = ~NUMFLAG;
+   }
+   if ( ctrl-leds  XLED3) {
+   pKbd-keyLeds |= SCROLLFLAG;
+   } else {
+   pKbd-keyLeds = ~SCROLLFLAG;
+   }
+   if ( ctrl-leds  (XCOMP|XLED4) ) {
pKbd-keyLeds |= COMPOSEFLAG;
} else {
pKbd-keyLeds = ~COMPOSEFLAG;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

2007-01-28 Thread David Nusinow

New branch 'upstream-unstable' available with the following commits:
commit caeb0f364c1a95a9ad3e64dd722c8ddc88077a86
Author: Daniel Stone [EMAIL PROTECTED]
Date:   Fri Dec 8 09:09:24 2006 +0200

don't release keys on newer servers
On newer servers, we take care of the key release over VT switch already,
so don't do it twice; that will lead to hilarious results.

commit fd51e4d27d7a31ed9d4a075c3814b36320af4612
Author: Daniel Stone [EMAIL PROTECTED]
Date:   Tue Nov 7 00:10:54 2006 +0200

add xf86Keymap.h, fix _SOURCES - _SRCS in Makefile.am

commit 976e12d85920d5bd09f6d0ba005835f733b296b7
Author: Daniel Stone [EMAIL PROTECTED]
Date:   Sat Nov 4 21:01:55 2006 +0200

bump to 1.2.1

commit 08aa290b0125eb681f872ef821ecffd5818caeb6
Author: Daniel Stone [EMAIL PROTECTED]
Date:   Sat Nov 4 21:01:49 2006 +0200

add xf86OSKbd.h to build system, _SOURCES - _SRCS
Add xf86OSKbd.h to the build system, and change _SOURCES use to _SRCS,
except when explicitly referring to a target.  This keeps automake 1.10
happy.

commit 95e5d2521fc39a661e13b313e5aa2514ddac9a5e
Author: Daniel Stone [EMAIL PROTECTED]
Date:   Thu Nov 2 00:24:24 2006 +0200

move os keyboard layer into kbd driver, remove legacy keyboard driver
Completely remove the old 'keyboard' driver.
Move the OS keyboard layer from the Xorg DDX into the kbd driver.  Right
now, BSD, Linux, SCO, and Solaris, have been dragged over.
Bump to 1.2.0, as we'll collide badly with the existing OS keyboard layer.

commit 3bfed2fc2e401bc4b5f74a3f20014d4a5c7dad30
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Fri Oct 13 18:26:38 2006 -0400

Bump to 1.1.1

commit d3c6014290a90a985679c9258fe65be3d89bf7b9
Author: Tilman Sauerbeck [EMAIL PROTECTED]
Date:   Sun Jul 9 19:57:36 2006 +0200

Added some missing includes.

commit c94229993dc2a8672802ef8ab35717089b74ab80
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Fri Apr 7 17:47:17 2006 +

Unlibcwrap. Bump server version requirement. Bump to 1.1.0.

commit 01744910cd7c4034fa1dd14ef734d7087832647d
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Wed Dec 21 02:29:57 2005 +

Update package version for X11R7 release.

commit 9bd0521c65760d4e555ac992a92ce74ce8d55437
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Mon Dec 19 16:25:51 2005 +

Stub COPYING files

commit 75d352b91ff79b5b55dbd7c5d3952470de87704f
Author: Alan Coopersmith [EMAIL PROTECTED]
Date:   Mon Dec 19 09:07:50 2005 +

Typo fixes, mailing list  url updates, and other changes to prepare for
X11R6.9  7.0 releases.

commit 29309dd08deb535262625c2eb73558c6eae69336
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Thu Dec 15 00:24:14 2005 +

Update package version number for final X11R7 release candidate.

commit a459e2028834e76e21117070d073cc9489b0d65f
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Tue Dec 6 22:48:30 2005 +

Change *man_SOURCES == *man_PRE to fix autotools warnings.

commit 9c5c0e3d211fcce658aa667d8be7f979b9cb83cd
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Sat Dec 3 05:49:31 2005 +

Update package version number for X11R7 RC3 release.

commit edb6ec6c311543686230a43885183071e92dc60d
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Fri Dec 2 02:16:05 2005 +

Remove extraneous AC_MSG_RESULT.

commit 0721c4b4a75fe836d17445550746ed415f06d126
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Tue Nov 29 23:29:56 2005 +

Only build dlloader modules by default.

commit 9885aa10eeb6e42212a0e21861790b72adc3ce71
Author: Alan Coopersmith [EMAIL PROTECTED]
Date:   Mon Nov 28 22:04:07 2005 +

Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)

commit ec4425c0ddb1dd45fb24e3984d490a68ff211b08
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Mon Nov 21 10:49:05 2005 +

Add .cvsignores for drivers.

commit e5451950a80744b183f5e8f4259ff2e596952a13
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Wed Nov 9 21:31:23 2005 +

Bump version numbers for X11R6.9/X11R7 RC2.

commit 066e7c7d2768dec2c033a2ce723abbe31495f6d0
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Wed Nov 9 21:15:12 2005 +

Update package version number for X11R7 RC2 release.

commit 4442fdf90f51cc265679b61cc341f6ed32e134a1
Author: Kean Johnson [EMAIL PROTECTED]
Date:   Tue Nov 8 06:33:28 2005 +

See ChangeLog entry 2005-11-07 for details.

commit 85dfda745021f49f01424d6a01c6396865d1723d
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Tue Nov 1 15:08:50 2005 +

Update pkgcheck depedencies to work with separate build roots.

commit 288c4a7f79b9fb4b0531fe7cf21dec7f7f4a3668
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Wed Oct 19 02:48:00 2005 +

Update package version number for RC1 release.

commit 4861d1586d6ce54a8563047fa01016b658517d8f
Author: Kevin E Martin [EMAIL PROTECTED]
Date:   Tue Oct 18 15:46:36 2005 +

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

10 matches

Site Navigation

Mail list logo

Footer information