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) KbdDevPtr pKbd = (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 = KEY_Print; - else if (scanCode == KEY_Break) - scanCode = KEY_Pause; - } + if (((state & AltMask) == AltMask) && (scanCode == KEY_SysReqest)) + scanCode = KEY_Print; + else if (scanCode == KEY_Break) + scanCode = KEY_Pause; xf86PostKeyboardEvent(device, scanCode + MIN_KEYCODE, down); } commit 38e4defe795776479594825859e101cd7cb5aa17 Author: Terry Lambert <tlamb...@chromium.org> Date: Fri Jul 15 17:23:22 2011 -0700 Return proper default for unknown values in pInfo->device_control. Signed-off-by: Terry Lambert <tlamb...@chromium.org> Reviewed-by: Stephane Marchesin <marc...@chromium.org> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/kbd.c b/src/kbd.c index d89d234..19bafb8 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -385,6 +385,9 @@ KbdProc(DeviceIntPtr device, int what) pKbd->KbdOff(pInfo, what); device->public.on = FALSE; break; + + default: + return BadValue; } return (Success); } commit e8aa2ff0629111fbc32d71bbbc46b469c0c9a996 Author: Matthieu Herrb <matthieu.he...@laas.fr> Date: Sat Jun 11 10:26:46 2011 +0200 man: update "rules" default value for xkeyboard-config. xkeyboard-config is using "base" not "xorg" as default rules. While there remove references to unmaintained PC98 settings. Signed-off-by: Matthieu Herrb <matthieu.he...@laas.fr> Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/man/kbd.man b/man/kbd.man index d224ce5..3d6bf21 100644 --- a/man/kbd.man +++ b/man/kbd.man @@ -67,21 +67,19 @@ specifies which XKB rules file to use for interpreting the .BR XkbVariant , and .B XkbOptions -settings. Default: "xorg" for most platforms, but "xfree98" for the -Japanese PC-98 platforms. If you use the "xorg" value then you can +settings. Default: "base" for most platforms. +If you use the "base" value then you can find listing of all valid values for these four options in the .I -__xkb_path__/rules/xorg.lst +__xkb_path__/rules/base.lst file. .TP 7 .BI "Option \*qXkbModel\*q \*q" modelname \*q -specifies the XKB keyboard model name. Default: "pc105" for most platforms, -but "pc98" for the Japanese PC-98 platforms. +specifies the XKB keyboard model name. Default: "pc105" for most platforms. .TP 7 .BI "Option \*qXkbLayout\*q \*q" layoutname \*q specifies the XKB keyboard layout name. This is usually the country or -language type of the keyboard. Default: "us" for most platforms, but -"jp" for the Japanese PC-98 platforms. +language type of the keyboard. Default: "us" for most platforms. .TP 7 .BI "Option \*qXkbVariant\*q \*q" variants \*q specifies the XKB keyboard variant components. These can be used to @@ -117,7 +115,7 @@ Section \*qInputDevice\*q Identifier "Generic Keyboard" Driver "kbd" Option "CoreKeyboard" -Option "XkbRules" "xorg" +Option "XkbRules" "base" Option "XkbModel" "pc105" Option "XkbLayout" "us,sk" Option "XkbVariant" ",qwerty" -- 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/e1sa6ns-0002px...@vasks.debian.org