Module Name: xsrc
Committed By: mrg
Date: Mon Nov 22 07:29:09 UTC 2010
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c bsd_kbd.c
bsd_kbd.h
Removed Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: sco_KbdMap.c sco_kbd.c
sco_kbd.h
Log Message:
merge xf86-input-keyboard 1.5.0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/sco_KbdMap.c \
xsrc/external/mit/xf86-input-keyboard/dist/src/sco_kbd.h
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/sco_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.3 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.4
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.3 Sun Nov 7 15:48:17 2010
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Mon Nov 22 07:29:09 2010
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
/*
* Slightly modified xf86KbdBSD.c which is
*
@@ -12,6 +10,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include <X11/X.h>
#include <X11/Xmd.h>
#include "input.h"
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.10 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.11
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.10 Sun Nov 7 15:44:04 2010
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Mon Nov 22 07:29:09 2010
@@ -8,12 +8,11 @@
* Copyright 1993 by David Dawes <da...@xfree86.org>
*/
-#define NEED_EVENTS
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <xorg-server.h>
#include <X11/X.h>
#include <termios.h>
@@ -87,8 +86,10 @@
switch (pKbd->consType) {
+#ifdef PCCONS_SUPPORT
case PCCONS:
break;
+#endif
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
case SYSCONS:
case PCVT:
@@ -110,8 +111,11 @@
int leds = 0, real_leds = 0;
switch (pKbd->consType) {
+
+#ifdef PCCONS_SUPPORT
case PCCONS:
break;
+#endif
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
case SYSCONS:
case PCVT:
@@ -144,8 +148,10 @@
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
switch (pKbd->consType) {
+#ifdef PCCONS_SUPPORT
case PCCONS:
break;
+#endif
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
case SYSCONS:
case PCVT:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.2 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.3
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.2 Sat Aug 2 06:35:41 2008
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h Mon Nov 22 07:29:09 2010
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */
-
extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
CARD8 *pModMap);
