xserver-xorg-input-keyboard: Changes to 'upstream-experimental'
.cvsignore | 19
.gitignore | 20
COPYING | 234 +++++++++++
configure.ac | 77 ++-
man/Makefile.am | 9
man/kbd.man | 50 ++
man/keyboard.man | 108 -----
src/Makefile.am | 41 +-
src/at_scancode.c | 131 ++++++
src/bsd_KbdMap.c | 1087 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/bsd_kbd.c | 527 ++++++++++++++++++++++++++
src/bsd_kbd.h | 5
src/hurd_kbd.c | 176 ++++++++
src/kbd.c | 102 +----
src/lnx_KbdMap.c | 605 ++++++++++++++++++++++++++++++
src/lnx_kbd.c | 484 ++++++++++++++++++++++++
src/lnx_kbd.h | 5
src/sco_KbdMap.c | 308 +++++++++++++++
src/sco_kbd.c | 485 ++++++++++++++++++++++++
src/sco_kbd.h | 20
src/sun_kbd.c | 441 +++++++++++++++++++++
src/sun_kbd.h | 44 ++
src/sun_kbdMap.c | 671 +++++++++++++++++++++++++++++++++
src/xf86Keymap.h | 308 +++++++++++++++
src/xf86OSKbd.h | 132 ++++++
25 files changed, 5832 insertions(+), 257 deletions(-)
New commits:
commit 86b16003ef1134a2471cd3f7ac217db574fa714c
Author: Adam Jackson <ajax@redhat.com>
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 <alan.coopersmith@sun.com>
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 furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+
Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
Copyright 1993 by David Dawes <dawes@xfree86.org>
@@ -20,55 +49,34 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Copyright 2004-2005 Sun Microsystems, Inc. All rights reserved.
+Code for BSD operating systems is additionally covered by this notice:
-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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
-Copyright 2005 by J. Kean Johnston <jkj@sco.com>
+Copyright 1992 by Rich Murphey <Rich@Rice.edu>
+Copyright 1993 by David Dawes <dawes@xfree86.org>
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
-documentation, and that the name J. Kean Johnston not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. J. Kean Johnston makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
+documentation, and that the names of Rich Murphey and David Dawes
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission. Rich Murphey and
+David Dawes make no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
+implied warranty.
+
+RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+Code for the GNU Hurd operating system is additionally covered by this notice:
+
Copyright 1997,1998 by UCHIYAMA Yasushi
Permission to use, copy, modify, distribute, and sell this software and its
@@ -90,32 +98,87 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Copyright (c) 1994-2003 by The XFree86 Project, 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 furnished to do so, subject to the following conditions:
+Code for Linux operating systems is additionally covered by these notices:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Based on the code from lnx_io.c which is
+Copyright 1992 by Orest Zborowski <obz@Kodak.com>
+Copyright 1993 by David Dawes <dawes@xfree86.org>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Orest Zborowski and David Dawes
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission. Orest Zborowski
+and David Dawes make no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
+implied warranty.
-Except as contained in this notice, the name of the copyright holder(s)
-and author(s) shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Software without prior written
-authorization from the copyright holder(s) and author(s).
+OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Portions based on kbdrate.c from util-linux 2.9t, which is
+Copyright 1992 Rickard E. Faith. Distributed under the GPL.
+This program comes with ABSOLUTELY NO WARRANTY.
+
+
+
+Code for SCO operating systems is additionally covered by these notices:
+
+Copyright 2003, 2005 by J. Kean Johnston <jkj@sco.com>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name J. Kean Johnston not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. J. Kean Johnston makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Based on lnx_kbd.c which is
+Copyright 1992 by Orest Zborowski <obz@Kodak.com>
+Copyright 1993 by David Dawes <dawes@xfree86.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Orest Zborowski and David Dawes
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission. Orest Zborowski
+and David Dawes make no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
+implied warranty.
+
+OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Code for Solaris operating systems is additionally covered by these notices:
+
Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
Copyright 1993 by David Dawes <dawes@XFree86.org>
Copyright 1999 by David Holland <davidh@iquest.net)
@@ -139,3 +202,29 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Copyright 2004-2007 Sun Microsystems, Inc. All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
commit 49bf7022f85886d06ba4991364e6e28f17d78f2b
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Mon May 21 13:53:01 2007 -0800
Bug 11026: xf86-input-keyboard COPYING file
X.Org Bugzilla #11026 <https://bugs.freedesktop.org/show_bug.cgi?id=11026>
diff --git a/COPYING b/COPYING
index 7f33cbf..17b278e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,141 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+Copyright 1993 by David Dawes <dawes@xfree86.org>
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the names of Thomas Roell and David Dawes not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. Thomas Roell and David Dawes make no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THOMAS ROELL AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+IN NO EVENT SHALL THOMAS ROELL OR DAVID DAWES BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 2004-2005 Sun Microsystems, Inc. All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+
+Copyright 2005 by J. Kean Johnston <jkj@sco.com>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name J. Kean Johnston not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. J. Kean Johnston makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1997,1998 by UCHIYAMA Yasushi
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of UCHIYAMA Yasushi not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. UCHIYAMA Yasushi makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (c) 1994-2003 by The XFree86 Project, 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 furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1993 by David Dawes <dawes@XFree86.org>
+Copyright 1999 by David Holland <davidh@iquest.net)
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the names of Thomas Roell, David Dawes, and David Holland not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission. Thomas Roell, David Dawes, and
+David Holland make no representations about the suitability of this software
+for any purpose. It is provided "as is" without express or implied
+warranty.
+
+THOMAS ROELL, DAVID DAWES, AND DAVID HOLLAND DISCLAIM ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THOMAS ROELL, DAVID DAWES, OR DAVID HOLLAND
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
commit 0382ed1c0c29ee19cfa8bff213ee32a7d0c06da9
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Feb 8 19:00:57 2008 -0200
Alternate patch to preserve NumLock & CapsLock leds at X Server startup.
This patch requires reverting commits:
7148a0c3e04668b7608295ebdf94579f6acfa544 and
0f3716db01681876cc385727beeb842af5b950d3
Also, it is assumed that the os specific GetLeds will properly
use bit 0 for caps lock and bit 1 for num lock.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/kbd.c b/src/kbd.c
index 68d29c2..dc9ea7a 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -470,9 +470,16 @@ InitKBD(InputInfoPtr pInfo, Bool init)
pKbd->scanPrefix = 0;
if (init) {
- pKbd->keyLeds = 0;
-
+ 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);
+ }
if( pKbd->delay <= 375) rad = 0x00;
else if (pKbd->delay <= 625) rad = 0x20;
commit 382ad4ef28b8393b385ac1d2426c5b22076ea165
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 17 18:48:47 2008 -0700
Revert previous attempts to sync lock state & LEDs
See next commit for improved fix
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index 964dbe9..d3f29e5 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -243,7 +243,6 @@ SetKbdRepeat(InputInfoPtr pInfo, char rad)
typedef struct {
int kbdtrans;
struct termios kbdtty;
- unsigned char oleds; /* Original LED state */
} LnxKbdPrivRec, *LnxKbdPrivPtr;
static int
@@ -255,7 +254,6 @@ KbdInit(InputInfoPtr pInfo, int what)
if (pKbd->isConsole) {
ioctl (pInfo->fd, KDGKBMODE, &(priv->kbdtrans));
tcgetattr (pInfo->fd, &(priv->kbdtty));
- ioctl (pInfo->fd, KDGETLED, &priv->oleds);
}
if (!pKbd->CustomKeycodes) {
pKbd->RemapScanCode = ATScancode;
@@ -287,19 +285,6 @@ KbdOn(InputInfoPtr pInfo, int what)
cfsetispeed(&nTty, 9600);
cfsetospeed(&nTty, 9600);
tcsetattr(pInfo->fd, TCSANOW, &nTty);
-
- /* If Caps Lock or Num Lock LEDs are on when server starts,
- * send a fake key down on those keys to set the server state
- * to match the LED's.
- */
- if (priv->oleds & LED_CAP) {
- pKbd->PostEvent(pInfo, KEY_CapsLock, TRUE); /* Press */
- pKbd->PostEvent(pInfo, KEY_CapsLock, FALSE); /* Release */
- }
- if (priv->oleds & LED_NUM) {
- pKbd->PostEvent(pInfo, KEY_NumLock, TRUE); /* Press */
- pKbd->PostEvent(pInfo, KEY_NumLock, FALSE); /* Release */
- }
}
return Success;
}
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index 4f0626d..f8eedfe 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -59,7 +59,6 @@
#include "xf86_OSlib.h"
#include "xf86OSKbd.h"
#include "sun_kbd.h"
-#include "atKeynames.h"
#include <sys/stropts.h>
#include <sys/vuid_event.h>
@@ -208,42 +207,6 @@ KbdOn(InputInfoPtr pInfo, int what)
return BadImplementation;
}
- /* If Caps Lock or Num Lock LEDs are on when server starts,
- * send a fake key down on those keys to set the server state
- * to match the LED's.
- */
- if ( priv->oleds & (LED_CAPS_LOCK | LED_NUM_LOCK) ) {
- int capslock = -1;
- int numlock = -1;
- int j;
- TransMapPtr kmap = pKbd->scancodeMap;
-
- for (j = kmap->begin; j < kmap->end ; j++) {
- switch (kmap->map[j]) {
- case KEY_CapsLock:
- capslock = j;
- break;
- case KEY_NumLock:
- numlock = j;
- break;
- default:
- /* nothing to do */
- break;
- }
- if ((capslock >= 0) && (numlock >= 0)) {
- break;
- }
- }
- if ((priv->oleds & LED_CAPS_LOCK) && (capslock > 0)) {
- pKbd->PostEvent(pInfo, capslock, TRUE); /* Press */
- pKbd->PostEvent(pInfo, capslock, FALSE); /* Release */
- }
- if ((priv->oleds & LED_NUM_LOCK) && (numlock > 0)) {
- pKbd->PostEvent(pInfo, numlock, TRUE); /* Press */
- pKbd->PostEvent(pInfo, numlock, FALSE); /* Release */
- }
- }
-
return Success;
}
commit 0c8220690c726d61a250ad5aec9171009f523043
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 17 18:46:15 2008 -0700
Use $(XKBPATH) for xkb file path in man page
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..ecb0c87 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -40,12 +40,16 @@ SED = sed
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
+# should allow configure override like xserver's configure.ac does
+XKBPATH=${datadir}/X11/xkb
+
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__xkb_path__|$(XKBPATH)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
diff --git a/man/kbd.man b/man/kbd.man
index d315204..9971b91 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -76,7 +76,7 @@ settings. Default: "xorg" for most platforms, but "xfree98" for the
Japanese PC-98 platforms. If you use the "xorg" value then you can
find listing of all valid values for these four options in the
.I
-/usr/share/X11/xkb/rules/xorg.lst
+__xkb_path__/rules/xorg.lst
file.
.TP 7
.BI "Option \*qXkbModel\*q \*q" modelname \*q
commit e32e610b719c7dc7a78a1b991b12521863877e51
Author: Matej Kosik <kosik@fiit.stuba.sk>
Date: Fri Feb 15 08:53:48 2008 -0800
Add information & example of XKB options to man page
diff --git a/man/kbd.man b/man/kbd.man
index 78e13cf..d315204 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -73,7 +73,11 @@ specifies which XKB rules file to use for interpreting the
and
.B XkbOptions
settings. Default: "xorg" for most platforms, but "xfree98" for the
-Japanese PC-98 platforms.
+Japanese PC-98 platforms. If you use the "xorg" value then you can
+find listing of all valid values for these four options in the
+.I
+/usr/share/X11/xkb/rules/xorg.lst
+file.
.TP 7
.BI "Option \*qXkbModel\*q \*q" modelname \*q
specifies the XKB keyboard model name. Default: "pc105" for most platforms,
@@ -95,6 +99,41 @@ enhance the keyboard behaviour. Default: not set.
Some other XKB-related options are available, but they are incompatible
with the ones listed above and are not recommended, so they are not
documented here.
+.SH EXAMPLE
+The following xorg.conf fragment ensures that user will be able to switch between
+.I us
+and
+.I sk
+layouts by pressing the "menu" key.
+.PP
+The
+.B XkbVariant
+option defines which variants of the two layouts should be used. In case of the
+.I us
+layout
+its default variant is used. In case of the
+.I sk
+layout
+its
+.I qwerty
+variant is used.
+.PP
+.nf
+.RS 4
+Section \*qInputDevice\*q
+.RS 4
+Identifier "Generic Keyboard"
+Driver "kbd"
+Option "CoreKeyboard"
+Option "XkbRules" "xorg"
+Option "XkbModel" "pc105"
+Option "XkbLayout" "us,sk"
+Option "XkbVariant" ",qwerty"
+Option "XkbOptions" "grp:menu_toggle,grp_led:scroll"
+.RE
+EndSection
+.RE
+.fi
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
commit ea46dd17058f6a880ed38102d1fde1dcba1f8215
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:04:13 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 0f3716db01681876cc385727beeb842af5b950d3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jan 16 10:18:59 2008 +1030
lnx: Automatically inherit the vt's numlock and capslock status (Bug #2243)
X.Org Bug #2243 <https://bugs.freedesktop.org/show_bug.cgi?id=2243>
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index d3f29e5..964dbe9 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -243,6 +243,7 @@ SetKbdRepeat(InputInfoPtr pInfo, char rad)
typedef struct {
int kbdtrans;
struct termios kbdtty;
+ unsigned char oleds; /* Original LED state */
} LnxKbdPrivRec, *LnxKbdPrivPtr;
static int
@@ -254,6 +255,7 @@ KbdInit(InputInfoPtr pInfo, int what)
if (pKbd->isConsole) {
ioctl (pInfo->fd, KDGKBMODE, &(priv->kbdtrans));
tcgetattr (pInfo->fd, &(priv->kbdtty));
+ ioctl (pInfo->fd, KDGETLED, &priv->oleds);
}
if (!pKbd->CustomKeycodes) {
pKbd->RemapScanCode = ATScancode;
@@ -285,6 +287,19 @@ KbdOn(InputInfoPtr pInfo, int what)
cfsetispeed(&nTty, 9600);
cfsetospeed(&nTty, 9600);
tcsetattr(pInfo->fd, TCSANOW, &nTty);
+
+ /* If Caps Lock or Num Lock LEDs are on when server starts,
+ * send a fake key down on those keys to set the server state
+ * to match the LED's.
+ */
+ if (priv->oleds & LED_CAP) {
+ pKbd->PostEvent(pInfo, KEY_CapsLock, TRUE); /* Press */
+ pKbd->PostEvent(pInfo, KEY_CapsLock, FALSE); /* Release */
+ }
+ if (priv->oleds & LED_NUM) {
+ pKbd->PostEvent(pInfo, KEY_NumLock, TRUE); /* Press */
+ pKbd->PostEvent(pInfo, KEY_NumLock, FALSE); /* Release */
+ }
}
return Success;
}
commit 882b28a452db6ebe1499d9558d0028cebb0e032f
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Wed Dec 12 22:43:04 2007 +0100
Fix parameters order for printWsType().
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 912879a..ff20d92 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -385,7 +385,7 @@ WSReadInput(InputInfoPtr pInfo)
static void
printWsType(char *type, char *devname)
{
- xf86Msg(X_PROBED, "%s: Keyboard type: %s\n", type, devname);
+ xf86Msg(X_PROBED, "%s: Keyboard type: %s\n", devname, type);
}
#endif
commit b139da4553e71896689e8f522e5cff58f5bb7674
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 11:57:40 2007 -0500
Don't sleep(1) on VT entry.
diff --git a/src/kbd.c b/src/kbd.c
index c1daa4b..68d29c2 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -543,7 +543,6 @@ KbdProc(DeviceIntPtr device, int what)
* passing on parts of the VT switch sequence.
*/
if (pInfo->fd >= 0) {
- sleep(1);
xf86FlushInput(pInfo->fd);
AddEnabledDevice(pInfo->fd);
}
commit ec247cd91cf147a8d1e79b0746680b049269798f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 11 16:42:33 2007 -0700
Update kbd man page to say it has replaced keyboard driver now.
diff --git a/man/kbd.man b/man/kbd.man
index dad80eb..78e13cf 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -17,10 +17,10 @@ kbd \- Keyboard input driver
.B kbd
is an __xservername__ input driver for keyboards. The driver supports the standard
OS-provided keyboard interface, but these are currently only available to
-this driver module for Linux, BSD, and Solaris. This driver is planned to
-replace the built-in
+this driver module for Linux, BSD, and Solaris. This driver is the
+replacement for the built-in
.B keyboard
-driver in a future release of __xservername__.
+driver formerly included in __xservername__.
.PP
The
.B kbd
@@ -96,4 +96,5 @@ Some other XKB-related options are available, but they are incompatible
with the ones listed above and are not recommended, so they are not
documented here.
.SH "SEE ALSO"
-keyboard(__drivermansuffix__), __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
+xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
commit 278c7d8f44ba7393a95ab1a4a557d6f385044022
Author: David Marx <david.marx@sun.com>
Date: Wed Oct 10 16:18:12 2007 -0700
Sun bug #6425775 Xserver is blocked when a program rings keyboard-bell
Use KIOCMKTONE ioctl instead on Solaris versions that have it
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6425775>
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index c9dc274..4f0626d 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -301,9 +301,39 @@ SoundKbdBell(InputInfoPtr pInfo, int loudness, int pitch, int duration)
sunKbdPrivPtr priv = (sunKbdPrivPtr) pKbd->private;
int kbdCmd, i;
+#ifdef KIOCMKTONE
+ int cycles;
+ int mktonevalue;
+#endif
if (loudness && pitch)
{
+#ifdef KIOCMKTONE
+ if (pitch == 0)
+ cycles = UINT16_MAX;
+ else if (pitch >= UINT16_MAX)
+ cycles = 0;
+ else {
+ cycles = (PIT_HZ + pitch / 2) / pitch;
+ if (cycles > UINT16_MAX)
+ cycles = UINT16_MAX;
+ }
+
+ mktonevalue = cycles | (((duration * loudness * 20) / 1000) << 16);
+
+ errno = 0;
+ SYSCALL(i = ioctl (pInfo->fd, KIOCMKTONE, mktonevalue));
+ if (i == 0)
+ return;
+
+ if (errno != EINVAL) {
+ if (errno != EAGAIN)
+ xf86Msg(X_ERROR, "%s: Failed to activate bell: %s\n",
+ pInfo->name, strerror(errno));
+ return;
+ }
+#endif
+
kbdCmd = KBD_CMD_BELL;
SYSCALL(i = ioctl (pInfo->fd, KIOCCMD, &kbdCmd));
commit 10792dc1eebf9f718e0cad0b425a8b8307a7ebc7
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 6 18:41:28 2007 +0200
Remove the legacy keyboard driver's manpage
diff --git a/man/keyboard.man b/man/keyboard.man
deleted file mode 100644
index 4c0154f..0000000
--- a/man/keyboard.man
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" $XdotOrg: $
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH KEYBOARD __drivermansuffix__ __vendorversion__
-.SH NAME
-keyboard \- Keyboard input driver
-.SH SYNOPSIS
-.nf
-.B "Section \*qInputDevice\*q"
-.BI " Identifier \*q" idevname \*q
-.B " Driver \*qkeyboard\*q"
-\ \ ...
-.B EndSection
-.fi
-.SH DESCRIPTION
-.B keyboard
-is an __xservername__ input driver for keyboards. The driver supports the standard
-OS-provided keyboard interface.
-.PP
-The
-.B keyboard
-driver functions as a keyboard input device, and may be used as the
-X server's core keyboard.
-.PP
-This driver is built-in to the core X server, and multiple instances are not
-supported. A loadable driver,
-.BR kbd ,
-is available, and is planned to replace the
-.B keyboard
-driver in a future release of the __xservername__ server.
-.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-details and for options that can be used with all input drivers. This
-section only covers configuration details specific to this driver.
-.PP
-The following driver
-.B Options
-are supported:
-.TP 7
-.BI "Option \*qProtocol\*q \*q" string \*q
-Specify the keyboard protocol. Valid protocol types include:
-.PP
-.RS 12
-Standard, Xqueue.
-.RE
-.PP
-.RS 7
-Not all protocols are supported on all platforms. Default: "Standard".
-.RE
-.TP 7
-.BI "Option \*qAutoRepeat\*q \*q" "delay rate" \*q
-sets the auto repeat behaviour for the keyboard. This is not implemented
-on all platforms.
-.I delay
-is the time in milliseconds before a key starts repeating.
-.I rate
-is the number of times a key repeats per second. Default: "500 30".
-.TP 7
-.BI "Option \*qXLeds\*q \*q" ledlist \*q
-makes the keyboard LEDs specified in
-.I ledlist
-available for client use instead of their traditional function
-(Scroll Lock, Caps Lock and Num Lock). The numbers in the list are
-in the range 1 to 3. Default: empty list.
-.TP 7
-.BI "Option \*qXkbDisable\*q \*q" boolean \*q
-disable/enable the XKEYBOARD extension. The \-kb command line
-option overrides this config file option. Default: XKB is enabled.
-.PP
-.RS 7
-NOTE: This option should be specified in the
-.B ServerFlags
-section rather than here. It's use here is deprecated.
-.RE
-.TP 7
-.BI "Option \*qXkbRules\*q \*q" rules \*q
-specifies which XKB rules file to use for interpreting the
-.BR XkbModel ,
-.BR XkbLayout ,
-.BR XkbVariant ,
Reply to: