CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Dec 18 19:37:40 UTC 2019
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c
Log Message:
add some missing translations for japanese keyboards
from Yasushi Oshima via PR54784
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.13 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.14
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.13 Fri Aug 25 21:27:34 2017
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Wed Dec 18 19:37:40 2019
@@ -581,20 +581,20 @@ static CARD8 wsXtMap[] = {
/* 109 */ KEY_NOTUSED,
/* 110 */ KEY_NOTUSED,
/* 111 */ KEY_NOTUSED,
- /* 112 */ KEY_NOTUSED,
+ /* 112 */ KEY_HKTG,
/* 113 */ KEY_NOTUSED,
/* 114 */ KEY_NOTUSED,
- /* 115 */ KEY_NOTUSED,
+ /* 115 */ KEY_BSlash2,
/* 116 */ KEY_NOTUSED,
/* 117 */ KEY_NOTUSED,
/* 118 */ KEY_NOTUSED,
/* 119 */ KEY_NOTUSED,
/* 120 */ KEY_NOTUSED,
- /* 121 */ KEY_NOTUSED,
+ /* 121 */ KEY_XFER,
/* 122 */ KEY_NOTUSED,
- /* 123 */ KEY_NOTUSED,
+ /* 123 */ KEY_NFER,
/* 124 */ KEY_NOTUSED,
- /* 125 */ KEY_NOTUSED,
+ /* 125 */ KEY_Yen,
/* 126 */ KEY_NOTUSED,
/* 127 */ KEY_Pause,
/* 128 */ KEY_NOTUSED,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: macallan
Date: Fri Aug 25 21:27:34 UTC 2017
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c
Log Message:
fix tpyo
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.12 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.13
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.12 Sun Mar 5 08:05:23 2017
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Fri Aug 25 21:27:34 2017
@@ -1226,7 +1226,7 @@ static CARD8 wsSunMap[] = {
/* 0x01 */ KEY_L1, /* stop */
/* 0x02 */ KEY_AudioLower, /* BrightnessDown / S-VolumeDown */
/* 0x03 */ KEY_L2, /* again */
- /* 0x04 */ KEY_AudioRaise, /* BridgtnessUp / S-VolumeUp */
+ /* 0x04 */ KEY_AudioRaise, /* BrightnessUp / S-VolumeUp */
/* 0x05 */ KEY_F1,
/* 0x06 */ KEY_F2,
/* 0x07 */ KEY_F10,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: phx
Date: Thu Nov 12 12:03:58 UTC 2015
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c bsd_kbd.c
Log Message:
Scancode translation table for wskbd on Amiga keyboards.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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.10 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.11
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.10 Fri Apr 4 12:50:09 2014
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Thu Nov 12 12:03:58 2015
@@ -841,6 +841,122 @@ TransMapRec wsAdb = {
wsAdbMap
};
+/* Map for amiga keyboards */
+static CARD8 wsAmigaMap[] = {
+ /* 0 */ KEY_Tilde,
+ /* 1 */ KEY_1,
+ /* 2 */ KEY_2,
+ /* 3 */ KEY_3,
+ /* 4 */ KEY_4,
+ /* 5 */ KEY_5,
+ /* 6 */ KEY_6,
+ /* 7 */ KEY_7,
+ /* 8 */ KEY_8,
+ /* 9 */ KEY_9,
+ /* 10 */ KEY_0,
+ /* 11 */ KEY_Minus,
+ /* 12 */ KEY_Equal,
+ /* 13 */ KEY_BSlash, /* key in this position only on Amiga */
+ /* 14 */ KEY_NOTUSED,
+ /* 15 */ KEY_KP_0,
+ /* 16 */ KEY_Q,
+ /* 17 */ KEY_W,
+ /* 18 */ KEY_E,
+ /* 19 */ KEY_R,
+ /* 20 */ KEY_T,
+ /* 21 */ KEY_Y,
+ /* 22 */ KEY_U,
+ /* 23 */ KEY_I,
+ /* 24 */ KEY_O,
+ /* 25 */ KEY_P,
+ /* 26 */ KEY_LBrace,
+ /* 27 */ KEY_RBrace,
+ /* 28 */ KEY_NOTUSED,
+ /* 29 */ KEY_KP_1,
+ /* 30 */ KEY_KP_2,
+ /* 31 */ KEY_KP_3,
+ /* 32 */ KEY_A,
+ /* 33 */ KEY_S,
+ /* 34 */ KEY_D,
+ /* 35 */ KEY_F,
+ /* 36 */ KEY_G,
+ /* 37 */ KEY_H,
+ /* 38 */ KEY_J,
+ /* 39 */ KEY_K,
+ /* 40 */ KEY_L,
+ /* 41 */ KEY_SemiColon,
+ /* 42 */ KEY_Quote,
+ /* 43 */ KEY_BSlash, /* # on international keyboards */
+ /* 44 */ KEY_NOTUSED,
+ /* 45 */ KEY_KP_4,
+ /* 46 */ KEY_KP_5,
+ /* 47 */ KEY_KP_6,
+ /* 48 */ KEY_Less,
+ /* 49 */ KEY_Z,
+ /* 50 */ KEY_X,
+ /* 51 */ KEY_C,
+ /* 52 */ KEY_V,
+ /* 53 */ KEY_B,
+ /* 54 */ KEY_N,
+ /* 55 */ KEY_M,
+ /* 56 */ KEY_Comma,
+ /* 57 */ KEY_Period,
+ /* 58 */ KEY_Slash,
+ /* 59 */ KEY_NOTUSED,
+ /* 60 */ KEY_KP_Decimal,
+ /* 61 */ KEY_KP_7,
+ /* 62 */ KEY_KP_8,
+ /* 63 */ KEY_KP_9,
+ /* 64 */ KEY_Space,
+ /* 65 */ KEY_BackSpace,
+ /* 66 */ KEY_Tab,
+ /* 67 */ KEY_KP_Enter,
+ /* 68 */ KEY_Enter,
+ /* 69 */ KEY_Escape,
+ /* 70 */ KEY_Delete,
+ /* 71 */ KEY_NOTUSED,
+ /* 72 */ KEY_NOTUSED,
+ /* 73 */ KEY_NOTUSED,
+ /* 74 */ KEY_KP_Minus,
+ /* 75 */ KEY_NOTUSED,
+ /* 76 */ KEY_Up,
+ /* 77 */ KEY_Down,
+ /* 78 */ KEY_Right,
+ /* 79 */ KEY_Left,
+ /* 80 */ KEY_F1,
+ /* 81 */ KEY_F2,
+ /* 82 */ KEY_F3,
+ /* 83 */ KEY_F4,
+ /* 84 */ KEY_F5,
+ /* 85 */ KEY_F6,
+ /* 86 */ KEY_F7,
+ /* 87 */ KEY_F8,
+ /* 88 */ KEY_F9,
+ /* 89 */ KEY_F10,
+ /* 90 */ KEY_UNKNOWN, /* Keypad [ */
+ /* 91 */ KEY_UNKNOWN, /* Keypad ] */
+ /* 92 */ KEY_KP_Divide,
+ /* 93 */ KEY_KP_Multiply,
+ /* 94 */ KEY_KP_Plus,
+ /* 95 */ KEY_Help,
+ /* 96 */ KEY_ShiftL,
+ /* 97 */ KEY_ShiftR,
+ /* 98 */ KEY_NOTUSED,
+ /* 99 */ KEY_LCtrl,
+ /* 100 */ KEY_Alt,
+ /* 101 */ KEY_AltLang,
+ /* 102 */ KEY_LMeta,
+ /* 103 */ KEY_RMeta
+};
+#define WS_AMIGA_MAP_SIZE (sizeof(wsAmigaMap)/sizeof(*wsAmigaMap))
+
+static
+TransMapRec wsAmiga = {
+0,
+WS_AMIGA_MAP_SIZE,
+wsAmigaMap
+};
+
/* Map for LK201 keyboards */
static CARD8 wsLk201Map[] = {
/* 0 */ KEY_F1,
@@ -1386,6 +1502,11 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
pKbd->scancodeMap =
break;
#endif
+#ifdef WSKBD_TYPE_AMIGA
+ case WSKBD_TYPE_AMIGA:
+pKbd->scancodeMap =
+break;
+#endif
#ifdef WSKBD_TYPE_LK201
case WSKBD_TYPE_LK201:
pKbd->scancodeMap =
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.20 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.21
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.20 Thu Mar 20 10:27:39 2014
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Thu Nov 12 12:03:58 2015
@@ -459,6 +459,11 @@ OpenKeyboard(InputInfoPtr pInfo)
printWsType("ADB", pInfo->name);
break;
#endif
+#ifdef WSKBD_TYPE_AMIGA
+ case WSKBD_TYPE_AMIGA:
+ printWsType("Amiga", pInfo->name);
+ break;
+#endif
#ifdef WSKBD_TYPE_LK201
case WSKBD_TYPE_LK201:
printWsType("LK201", pInfo->name);
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: christos
Date: Fri Apr 4 12:50:09 UTC 2014
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c
Log Message:
PR/48347: Yasushi Oshima: Cannot input Japanese special keys of JP106 keyboard
with NetBSD/evbarm(RPI) or some arch.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.9 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.10
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.9 Thu Mar 20 02:40:47 2014
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Fri Apr 4 08:50:09 2014
@@ -345,17 +345,33 @@ static CARD8 wsUsbMap[] = {
/* 132 */ KEY_NOTUSED,
/* 133 */ KEY_NOTUSED,
/* 134 */ KEY_NOTUSED,
- /* 135 */ KEY_NOTUSED,
- /* 136 */ KEY_NOTUSED,
- /* 137 */ KEY_NOTUSED,
- /* 138 */ KEY_NOTUSED,
- /* 139 */ KEY_NOTUSED,
+/*
+ * Special keycode for For Japanese keyboard
+ * Override atKeyname HKTG and BSlash2 code to unique for JP106 keybaord
+ */
+#undef KEY_HKTG
+#define KEY_HKTG 200 /* Japanee Hiragana Katakana Toggle */
+#undef KEY_BSlash2
+#define KEY_BSlash2 203 /* Japanese '\_' key */
+
+ /* 135 */ KEY_BSlash2, /* Japanese 106 kbd: '\_' */
+ /* 136 */ KEY_HKTG, /* Japanese 106 kbd: Hiragana Katakana toggle */
+ /* 137 */ KEY_Yen, /* Japanese 106 kbd: '\|' */
+ /* 138 */ KEY_XFER, /* Japanese 106 kbd: Henkan */
+ /* 139 */ KEY_NFER, /* Japanese 106 kbd: Muhenkan */
/* 140 */ KEY_NOTUSED,
/* 141 */ KEY_NOTUSED,
/* 142 */ KEY_NOTUSED,
/* 143 */ KEY_NOTUSED,
- /* 144 */ KEY_NOTUSED,
- /* 145 */ KEY_NOTUSED,
+/*
+ * Special keycode for For Korean keyboard
+ * Define Hangul and Hangul_Hanja unique key code
+ * These keys also use KANA and EISU on some Macintosh Japanese USB Keyboards
+ */
+#define KEY_Hangul 201 /* Also KANA Key on Mac JP USB kbd */
+#define KEY_Hangul_Hanja 202 /* Also EISU Key on Mac JP USB kbd */
+ /* 144 */ KEY_Hangul, /* Korean 106 kbd: Hangul */
+ /* 145 */ KEY_Hangul_Hanja, /* Korean 106 kbd: Hangul Hanja */
/* 146 */ KEY_NOTUSED,
/* 147 */ KEY_NOTUSED,
/* 148 */ KEY_NOTUSED,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 06:40:47 UTC 2014
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c bsd_kbd.c
Log Message:
merge xf86-input-keyboard 1.8.0.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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.8 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.9
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.8 Mon Jul 16 12:49:42 2012
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Thu Mar 20 06:40:47 2014
@@ -260,7 +260,6 @@ static CARD8 wsUsbMap[] = {
/* 47 */ KEY_LBrace, /* [ { */
/* 48 */ KEY_RBrace, /* ] } */
/* 49 */ KEY_BSlash, /* \ | */
- /* this was KEY_BSlash2 which seems bogus */
/* 50 */ KEY_BSlash,/* \ _ # ~ on some keyboards */
/* 51 */ KEY_SemiColon, /* ; : */
/* 52 */ KEY_Quote, /* ' */
@@ -444,7 +443,7 @@ static CARD8 wsUsbMap[] = {
/* 230 */ KEY_AltLang, /* Right Alt, AKA AltGr */
/* 231 */ KEY_LMeta, /* Right Meta XXX */
};
-#define WS_USB_MAP_SIZE (sizeof(wsUsbMap)/sizeof(unsigned char))
+#define WS_USB_MAP_SIZE (sizeof(wsUsbMap)/sizeof(*wsUsbMap))
static
TransMapRec wsUsb = {
@@ -458,7 +457,7 @@ static CARD8 wsXtMap[] = {
/* 1 */ KEY_Escape,
/* 2 */ KEY_1,
/* 3 */ KEY_2,
- /* 4 */ KEY_3,
+ /* 4 */ KEY_3,
/* 5 */ KEY_4,
/* 6 */ KEY_5,
/* 7 */ KEY_6,
@@ -677,7 +676,7 @@ static CARD8 wsXtMap[] = {
/* 220 */ KEY_RMeta,
/* 221 */ KEY_Menu,
};
-#define WS_XT_MAP_SIZE (sizeof(wsXtMap)/sizeof(unsigned char))
+#define WS_XT_MAP_SIZE (sizeof(wsXtMap)/sizeof(*wsXtMap))
static
TransMapRec wsXt = {
@@ -817,7 +816,7 @@ static CARD8 wsAdbMap[] = {
/* 126 */ KEY_NOTUSED,
/* 127 */ KEY_Power
};
-#define WS_ADB_MAP_SIZE (sizeof(wsAdbMap)/sizeof(unsigned char))
+#define WS_ADB_MAP_SIZE (sizeof(wsAdbMap)/sizeof(*wsAdbMap))
static
TransMapRec wsAdb = {
@@ -1081,7 +1080,7 @@ static CARD8 wsLk201Map[] = {
/* 250 */ KEY_NOTUSED,
/* 251 */ KEY_NOTUSED,
};
-#define WS_LK201_MAP_SIZE (sizeof(wsLk201Map)/sizeof(unsigned char))
+#define WS_LK201_MAP_SIZE (sizeof(wsLk201Map)/sizeof(*wsLk201Map))
static
TransMapRec wsLk201 = {
@@ -1220,7 +1219,7 @@ static CARD8 wsSunMap[] = {
/* 0x7e */ KEY_NOTUSED,
/* 0x7f */ KEY_NOTUSED
};
-#define WS_SUN_MAP_SIZE (sizeof(wsSunMap)/sizeof(unsigned char))
+#define WS_SUN_MAP_SIZE (sizeof(wsSunMap)/sizeof(*wsSunMap))
static
TransMapRec wsSun = {
@@ -1373,7 +1372,7 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
#endif
#ifdef WSKBD_TYPE_LK201
case WSKBD_TYPE_LK201:
-pKbd-scancodeMap = wsLk201;
+pKbd-scancodeMap = wsLk201;
break;
#endif
#ifdef WSKBD_TYPE_SUN
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.18 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.19
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.18 Mon Mar 18 11:50:08 2013
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Thu Mar 20 06:40:47 2014
@@ -39,6 +39,21 @@ typedef struct {
struct termios kbdtty;
} BsdKbdPrivRec, *BsdKbdPrivPtr;
+#ifdef WSCONS_SUPPORT
+static Bool
+WSSetVersion(int fd, const char *name)
+{
+#ifdef WSKBDIO_SETVERSION
+int version = WSKBDIO_EVENT_VERSION;
+if (ioctl(fd, WSKBDIO_SETVERSION, version) == -1) {
+xf86Msg(X_WARNING, %s: cannot set version\n, name);
+return FALSE;
+}
+#endif
+return TRUE;
+}
+#endif
+
static
int KbdInit(InputInfoPtr pInfo, int what)
{
@@ -54,7 +69,7 @@ int KbdInit(InputInfoPtr pInfo, int what
#if defined WSCONS_SUPPORT
case WSCONS:
#endif
- tcgetattr(pInfo-fd, (priv-kbdtty));
+ tcgetattr(pInfo-fd, (priv-kbdtty));
#endif
break;
}
@@ -173,8 +188,8 @@ KbdOn(InputInfoPtr pInfo, int what)
xf86Msg(X_ERROR, KbdOn: tcsetattr: %s\n,
strerror(errno));
}
- break;
-#endif
+ break;
+#endif
}
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT)
switch (pKbd-consType) {
@@ -208,18 +223,17 @@ KbdOn(InputInfoPtr pInfo, int what)
switch (pKbd-consType) {
#ifdef WSCONS_SUPPORT
case WSCONS:
- if ((pKbd-wsKbdDev[0] != 0) (pInfo-fd == -1)) {
- xf86Msg(X_INFO, opening %s\n, pKbd-wsKbdDev);
- pInfo-fd = open(pKbd-wsKbdDev, O_RDONLY | O_NONBLOCK | O_EXCL);
-#ifdef WSKBDIO_SETVERSION
- int version = WSKBDIO_EVENT_VERSION;
- if
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: wiz
Date: Thu Mar 20 10:27:39 UTC 2014
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
Remove obsolete chunk.
No diffs to upstream remaining :)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.19 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.20
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.19 Thu Mar 20 06:40:47 2014
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Thu Mar 20 10:27:39 2014
@@ -438,12 +438,6 @@ OpenKeyboard(InputInfoPtr pInfo)
close(pInfo-fd);
return FALSE;
}
- /* If wsKbdType==0, no keyboard attached to the mux. Assume USB. */
- if (pKbd-wsKbdType == 0) {
- xf86Msg(X_WARNING, %s: No keyboard attached, assuming USB\n,
- pInfo-name);
- pKbd-wsKbdType = WSKBD_TYPE_USB;
- }
switch (pKbd-wsKbdType) {
case WSKBD_TYPE_PC_XT:
printWsType(XT, pInfo-name);
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: wiz Date: Fri Jul 26 20:37:00 UTC 2013 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.h Log Message: Remove unnecessary include, to reduce diffs to upstream. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h 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_kbd.h diff -u 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.4 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.3 Mon Nov 22 07:29:09 2010 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h Fri Jul 26 20:37:00 2013 @@ -1,6 +1,3 @@ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); -#ifdef __NetBSD__ -#include dev/wscons/wsconsio.h -#endif
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: jmcneill
Date: Mon Mar 18 11:50:08 UTC 2013
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
If WSKBDIO_GTYPE succeeds and returns type=0, it is a mux with no keyboard
attached. In this case, assume USB.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.17 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.18
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.17 Thu Feb 14 20:53:26 2013
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Mon Mar 18 11:50:08 2013
@@ -429,6 +429,12 @@ OpenKeyboard(InputInfoPtr pInfo)
close(pInfo-fd);
return FALSE;
}
+ /* If wsKbdType==0, no keyboard attached to the mux. Assume USB. */
+ if (pKbd-wsKbdType == 0) {
+ xf86Msg(X_WARNING, %s: No keyboard attached, assuming USB\n,
+ pInfo-name);
+ pKbd-wsKbdType = WSKBD_TYPE_USB;
+ }
switch (pKbd-wsKbdType) {
case WSKBD_TYPE_PC_XT:
printWsType(XT, pInfo-name);
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Feb 14 20:53:27 UTC 2013
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c xf86OSKbd.h
Log Message:
when using /dev/wskbd* we need to close the device when VT switching out of
X, and open it again when switching back
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h
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_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.16 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.17
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.16 Sat Jul 21 10:19:40 2012
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Thu Feb 14 20:53:26 2013
@@ -204,6 +204,24 @@ KbdOn(InputInfoPtr pInfo, int what)
#endif
}
#endif
+} else {
+switch (pKbd-consType) {
+#ifdef WSCONS_SUPPORT
+case WSCONS:
+ if ((pKbd-wsKbdDev[0] != 0) (pInfo-fd == -1)) {
+ xf86Msg(X_INFO, opening %s\n, pKbd-wsKbdDev);
+ pInfo-fd = open(pKbd-wsKbdDev, O_RDONLY | O_NONBLOCK | O_EXCL);
+#ifdef WSKBDIO_SETVERSION
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(pInfo-fd, WSKBDIO_SETVERSION, version) == -1) {
+ xf86Msg(X_WARNING, %s: cannot set version\n, pInfo-name);
+ return FALSE;
+ }
+#endif
+ }
+ break;
+#endif
+ }
}
return Success;
}
@@ -238,7 +256,20 @@ KbdOff(InputInfoPtr pInfo, int what)
break;
#endif
}
-}
+} else {
+ switch (pKbd-consType) {
+#ifdef WSCONS_SUPPORT
+case WSCONS:
+ if ((pKbd-wsKbdDev[0] != 0) (pInfo-fd != -1)) {
+ xf86Msg(X_INFO, closing %s\n, pKbd-wsKbdDev);
+ /* need to close the fd while we're gone */
+ close(pInfo-fd);
+ pInfo-fd = -1;
+ }
+ break;
+#endif
+}
+}
return Success;
}
@@ -368,6 +399,7 @@ OpenKeyboard(InputInfoPtr pInfo)
pInfo-fd = xf86Info.consoleFd;
pKbd-isConsole = TRUE;
pKbd-consType = xf86Info.consType;
+ pKbd-wsKbdDev[0] = 0;
} else {
pInfo-fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL);
if (pInfo-fd == -1) {
@@ -376,6 +408,7 @@ OpenKeyboard(InputInfoPtr pInfo)
return FALSE;
}
pKbd-isConsole = FALSE;
+ strncpy(pKbd-wsKbdDev, s, 256);
pKbd-consType = xf86Info.consType;
free(s);
}
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h:1.1.1.3 xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h:1.2
--- xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h:1.1.1.3 Sun Jul 24 00:04:34 2011
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h Thu Feb 14 20:53:26 2013
@@ -78,6 +78,7 @@ typedef struct {
pointer private;
int consType;
int wsKbdType;
+char wsKbdDev[256];
} KbdDevRec, *KbdDevPtr;
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: tsutsui Date: Sat Jul 21 10:19:40 UTC 2012 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: Don't return FALSE in OpenKeyboard() even if wskbd type is unknown so that we can still setup keyboard map manually by xmodmap(1) etc. on poor Tier II machines. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.15 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.16 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.15 Mon Jul 16 12:50:25 2012 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Sat Jul 21 10:19:40 2012 @@ -432,10 +432,10 @@ OpenKeyboard(InputInfoPtr pInfo) break; #endif default: - xf86Msg(X_ERROR, %s: Unsupported wskbd type \%d\, -pInfo-name, pKbd-wsKbdType); - close(pInfo-fd); - return FALSE; + xf86Msg(X_WARNING, %s: Unsupported wskbd type \%d\\n, + pInfo-name, pKbd-wsKbdType); + printWsType(Unknown wskbd, pInfo-name); + break; } } #endif
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: abs
Date: Mon Jul 16 12:49:42 UTC 2012
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c
Log Message:
Add a basic map for an LK201 keyboard
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.7 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.8
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.7 Sat Feb 25 15:38:46 2012
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Mon Jul 16 12:49:42 2012
@@ -826,6 +826,270 @@ TransMapRec wsAdb = {
wsAdbMap
};
+/* Map for LK201 keyboards */
+static CARD8 wsLk201Map[] = {
+ /* 0 */ KEY_F1,
+ /* 1 */ KEY_F2,
+ /* 2 */ KEY_F3,
+ /* 3 */ KEY_F4,
+ /* 4 */ KEY_F5,
+ /* 5 */ KEY_NOTUSED,
+ /* 6 */ KEY_NOTUSED,
+ /* 7 */ KEY_NOTUSED,
+ /* 8 */ KEY_NOTUSED,
+ /* 9 */ KEY_NOTUSED,
+ /* 10 */ KEY_NOTUSED,
+ /* 11 */ KEY_NOTUSED,
+ /* 12 */ KEY_NOTUSED,
+ /* 13 */ KEY_NOTUSED,
+ /* 14 */ KEY_F6,
+ /* 15 */ KEY_F7,
+ /* 16 */ KEY_F8,
+ /* 17 */ KEY_F9,
+ /* 18 */ KEY_F10,
+ /* 19 */ KEY_NOTUSED,
+ /* 20 */ KEY_NOTUSED,
+ /* 21 */ KEY_NOTUSED,
+ /* 22 */ KEY_NOTUSED,
+ /* 23 */ KEY_NOTUSED,
+ /* 24 */ KEY_NOTUSED,
+ /* 25 */ KEY_NOTUSED,
+ /* 26 */ KEY_NOTUSED,
+ /* 27 */ KEY_F11,
+ /* 28 */ KEY_F12,
+ /* 29 */ KEY_F13,
+ /* 30 */ KEY_F14,
+ /* 31 */ KEY_NOTUSED,
+ /* 32 */ KEY_NOTUSED,
+ /* 33 */ KEY_NOTUSED,
+ /* 34 */ KEY_NOTUSED,
+ /* 35 */ KEY_NOTUSED,
+ /* 36 */ KEY_NOTUSED,
+ /* 37 */ KEY_NOTUSED,
+ /* 38 */ KEY_Help,
+ /* 39 */ KEY_F16, /* Do */
+ /* 40 */ KEY_NOTUSED,
+ /* 41 */ KEY_NOTUSED,
+ /* 42 */ KEY_F17,
+ /* 43 */ KEY_L8, /* F18 */
+ /* 44 */ KEY_L9, /* F19 */
+ /* 45 */ KEY_L10, /* F20 */
+ /* 46 */ KEY_NOTUSED,
+ /* 47 */ KEY_NOTUSED,
+ /* 48 */ KEY_NOTUSED,
+ /* 49 */ KEY_NOTUSED,
+ /* 50 */ KEY_NOTUSED,
+ /* 51 */ KEY_NOTUSED,
+ /* 52 */ KEY_Home, /* Find */
+ /* 53 */ KEY_Insert, /* Insert Here */
+ /* 54 */ KEY_Delete, /* Re-move */
+ /* 55 */ KEY_End, /* Select */
+ /* 56 */ KEY_PgUp, /* Prev-Screen */
+ /* 57 */ KEY_PgDown, /* Next-Screen */
+ /* 58 */ KEY_NOTUSED,
+ /* 59 */ KEY_NOTUSED,
+ /* 60 */ KEY_KP_0,
+ /* 61 */ KEY_NOTUSED,
+ /* 62 */ KEY_KP_Decimal,
+ /* 63 */ KEY_KP_Enter,
+ /* 64 */ KEY_KP_1,
+ /* 65 */ KEY_KP_2,
+ /* 66 */ KEY_KP_3,
+ /* 67 */ KEY_KP_4,
+ /* 68 */ KEY_KP_5,
+ /* 69 */ KEY_KP_6,
+ /* 70 */ KEY_KP_Plus, /* KP Comma */
+ /* 71 */ KEY_KP_7,
+ /* 72 */ KEY_KP_8,
+ /* 73 */ KEY_KP_9,
+ /* 74 */ KEY_KP_Minus,
+ /* 75 */ KEY_L1, /* PF1 */
+ /* 76 */ KEY_L2, /* PF2 */
+ /* 77 */ KEY_L3, /* PF3 */
+ /* 78 */ KEY_L4, /* PF4 */
+ /* 79 */ KEY_NOTUSED,
+ /* 80 */ KEY_NOTUSED,
+ /* 81 */ KEY_Left,
+ /* 82 */ KEY_Right,
+ /* 83 */ KEY_Down,
+ /* 84 */ KEY_Up,
+ /* 85 */ KEY_NOTUSED,
+ /* 86 */ KEY_NOTUSED,
+ /* 87 */ KEY_NOTUSED,
+ /* 88 */ KEY_ShiftL,
+ /* 89 */ KEY_LCtrl,
+ /* 90 */ KEY_CapsLock,
+ /* 91 */ KEY_Alt, /* Compose */
+ /* 92 */ KEY_NOTUSED,
+ /* 93 */ KEY_NOTUSED,
+ /* 94 */ KEY_NOTUSED,
+ /* 95 */ KEY_NOTUSED,
+ /* 96 */ KEY_NOTUSED,
+ /* 97 */ KEY_NOTUSED,
+ /* 98 */ KEY_NOTUSED,
+ /* 99 */ KEY_NOTUSED,
+ /* 100 */ KEY_NOTUSED,
+ /* 101 */ KEY_NOTUSED,
+ /* 102 */ KEY_Delete,
+ /* 103 */ KEY_Enter,
+ /* 104 */ KEY_Tab,
+ /* 105 */ KEY_Escape, /* tilde */
+ /* 106 */ KEY_1,
+ /* 107 */ KEY_Q,
+ /* 108 */ KEY_A,
+ /* 109 */ KEY_Z,
+ /* 110 */ KEY_NOTUSED,
+ /* 111 */ KEY_2,
+ /* 112 */ KEY_W,
+ /* 113 */ KEY_S,
+ /* 114 */ KEY_X,
+ /* 115 */ KEY_Less,
+ /* 116 */ KEY_NOTUSED,
+ /* 117 */ KEY_3,
+ /* 118 */ KEY_E,
+ /* 119 */ KEY_D,
+ /* 120 */ KEY_C,
+ /* 121 */ KEY_NOTUSED,
+ /* 122 */ KEY_4,
+ /* 123 */ KEY_R,
+ /* 124 */ KEY_F,
+ /* 125 */ KEY_V,
+ /* 126 */ KEY_Space,
+ /* 127 */ KEY_NOTUSED,
+ /* 128 */ KEY_5,
+ /* 129 */ KEY_T,
+ /* 130 */ KEY_G,
+ /* 131 */ KEY_B,
+ /* 132 */ KEY_NOTUSED,
+ /* 133 */ KEY_6,
+ /* 134 */ KEY_Y,
+ /* 135 */ KEY_H,
+ /* 136 */ KEY_N,
+ /* 137 */ KEY_NOTUSED,
+ /* 138 */ KEY_7,
+ /* 139 */ KEY_U,
+ /* 140 */ KEY_J,
+ /* 141 */ KEY_M,
+ /* 142 */ KEY_NOTUSED,
+ /* 143 */ KEY_8,
+ /* 144 */ KEY_I,
+ /* 145 */ KEY_K,
+ /* 146 */ KEY_Comma,
+ /* 147 */ KEY_NOTUSED,
+ /* 148 */ KEY_9,
+ /* 149 */ KEY_O,
+ /* 150 */ KEY_L,
+ /* 151 */ KEY_Period,
+ /* 152 */ KEY_NOTUSED,
+ /* 153 */ KEY_0,
+ /* 154 */ KEY_P,
+ /* 155 */ KEY_NOTUSED,
+ /* 156 */ KEY_SemiColon,
+ /* 157 */ KEY_Slash,
+ /* 158 */ KEY_NOTUSED,
+ /* 159 */ KEY_Equal,
+ /* 160 */ KEY_RBrace,
+ /* 161 */ KEY_BSlash,
+ /* 162 */ KEY_NOTUSED,
+ /* 163 */ KEY_Minus,
+ /* 164 */ KEY_LBrace,
+ /* 165 */ KEY_Quote,
+ /* 166 */ KEY_NOTUSED,
+ /* 167 */ KEY_NOTUSED,
+ /* 168 */ KEY_NOTUSED,
+ /* 169 */ KEY_NOTUSED,
+ /* 170 */ KEY_NOTUSED,
+ /* 171 */ KEY_NOTUSED,
+ /* 172
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: abs Date: Mon Jul 16 12:50:25 UTC 2012 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: Add WSKBD_TYPE_LK201 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.15 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14 Sun Jul 24 00:45:04 2011 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Mon Jul 16 12:50:25 2012 @@ -411,6 +411,11 @@ OpenKeyboard(InputInfoPtr pInfo) printWsType(ADB, pInfo-name); break; #endif +#ifdef WSKBD_TYPE_LK201 + case WSKBD_TYPE_LK201: + printWsType(LK201, pInfo-name); + break; +#endif #ifdef WSKBD_TYPE_MAPLE case WSKBD_TYPE_MAPLE: printWsType(Maple, pInfo-name);
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: martin
Date: Sat Feb 25 15:38:46 UTC 2012
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c
Log Message:
Fix scan code 50 key on non-us-USB keyboards (BSlash2 - BSlash).
From macallan.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.6 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.7
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.6 Sun Jul 24 00:06:38 2011
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Sat Feb 25 15:38:46 2012
@@ -260,7 +260,8 @@ static CARD8 wsUsbMap[] = {
/* 47 */ KEY_LBrace, /* [ { */
/* 48 */ KEY_RBrace, /* ] } */
/* 49 */ KEY_BSlash, /* \ | */
- /* 50 */ KEY_BSlash2, /* \ _ # ~ on some keyboards */
+ /* this was KEY_BSlash2 which seems bogus */
+ /* 50 */ KEY_BSlash,/* \ _ # ~ on some keyboards */
/* 51 */ KEY_SemiColon, /* ; : */
/* 52 */ KEY_Quote, /* ' */
/* 53 */ KEY_Tilde, /* ` ~ */
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 24 00:06:38 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c bsd_kbd.c
kbd.c
Log Message:
merge xf86-input-keyboard-1.6.0
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-input-keyboard/dist/src/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.5 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.6
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.5 Mon Apr 18 23:31:06 2011
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Sun Jul 24 00:06:38 2011
@@ -189,98 +189,6 @@
NoSymbol, NoSymbol, NoSymbol, NoSymbol
};
-#ifdef __OpenBSD__
-/* don't mark AltR and CtrlR for remapping, since they
- * cannot be remapped by pccons */
-static unsigned char pccons_remap[128] = {
- 0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00 - 0x07 */
- 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08 - 0x0f */
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10 - 0x17 */
- 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 0x18 - 0x1f */
- 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 - 0x27 */
- 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 0x28 - 0x2f */
- 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,0, /* 0x30 - 0x37 */
- 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 0x38 - 0x3f */
- 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,0, /* 0x40 - 0x47 */
- 0,0,0,0,0,0,0,0, /* 0x48 - 0x4f */
- 0,0,0,0,0,0, 0x56, 0x57, /* 0x50 - 0x57 */
- 0x58,0,0,0,0,0,0,0, /* 0x58 - 0x5f */
- 0,0,0,0,0,0,0,0, /* 0x60 - 0x67 */
- 0,0,0,0,0,0,0,0, /* 0x68 - 0x6f */
- 0,0,0,0,0,0,0,0, /* 0x70 - 0x77 */
- 0,0,0,0,0,0,0,0, /* 0x78 - 0x7f */
-};
-
-/* This table assumes an iso8859_1 encoding for the characters
- * 80, as returned by pccons */
-static KeySym latin1_to_x[256] = {
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- XK_BackSpace, XK_Tab, XK_Linefeed, NoSymbol,
- NoSymbol, XK_Return, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, XK_Escape,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- XK_space, XK_exclam, XK_quotedbl, XK_numbersign,
- XK_dollar, XK_percent, XK_ampersand, XK_apostrophe,
- XK_parenleft, XK_parenright, XK_asterisk, XK_plus,
- XK_comma, XK_minus, XK_period, XK_slash,
- XK_0, XK_1, XK_2, XK_3,
- XK_4, XK_5, XK_6, XK_7,
- XK_8, XK_9, XK_colon, XK_semicolon,
- XK_less, XK_equal, XK_greater, XK_question,
- XK_at, XK_A, XK_B, XK_C,
- XK_D, XK_E, XK_F, XK_G,
- XK_H, XK_I, XK_J, XK_K,
- XK_L, XK_M, XK_N, XK_O,
- XK_P, XK_Q, XK_R, XK_S,
- XK_T, XK_U, XK_V, XK_W,
- XK_X, XK_Y, XK_Z, XK_bracketleft,
- XK_backslash, XK_bracketright,XK_asciicircum, XK_underscore,
- XK_grave, XK_a, XK_b, XK_c,
- XK_d, XK_e, XK_f, XK_g,
- XK_h, XK_i, XK_j, XK_k,
- XK_l, XK_m, XK_n, XK_o,
- XK_p, XK_q, XK_r, XK_s,
- XK_t, XK_u, XK_v, XK_w,
- XK_x, XK_y, XK_z, XK_braceleft,
- XK_bar, XK_braceright, XK_asciitilde, XK_Delete,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
- XK_nobreakspace,XK_exclamdown, XK_cent, XK_sterling,
- XK_currency, XK_yen, XK_brokenbar, XK_section,
- XK_diaeresis, XK_copyright, XK_ordfeminine, XK_guillemotleft,
- XK_notsign, XK_hyphen, XK_registered, XK_macron,
- XK_degree, XK_plusminus, XK_twosuperior, XK_threesuperior,
- XK_acute, XK_mu, XK_paragraph, XK_periodcentered,
- XK_cedilla, XK_onesuperior, XK_masculine, XK_guillemotright,
- XK_onequarter, XK_onehalf, XK_threequarters,XK_questiondown,
- XK_Agrave, XK_Aacute, XK_Acircumflex, XK_Atilde,
- XK_Adiaeresis, XK_Aring, XK_AE, XK_Ccedilla,
- XK_Egrave, XK_Eacute, XK_Ecircumflex, XK_Ediaeresis,
- XK_Igrave, XK_Iacute, XK_Icircumflex, XK_Idiaeresis,
- XK_ETH, XK_Ntilde, XK_Ograve, XK_Oacute,
- XK_Ocircumflex, XK_Otilde, XK_Odiaeresis, XK_multiply,
- XK_Ooblique, XK_Ugrave, XK_Uacute, XK_Ucircumflex,
- XK_Udiaeresis, XK_Yacute, XK_THORN,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Jul 24 00:45:04 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: vtSwitchSupported no longer exists; don't try to set it To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.13 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.13 Sun Jul 24 00:06:38 2011 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Sun Jul 24 00:45:04 2011 @@ -435,12 +435,14 @@ } #endif +#if 0 /* no more vtSwitchSupported in xf86-input-keyboard-1.6.0 */ #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT) if ((pKbd-isConsole ((pKbd-consType == SYSCONS) || (pKbd-consType == PCVT))) || (pKbd-consType == WSCONS)) pKbd-vtSwitchSupported = TRUE; #endif +#endif return TRUE; }
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Apr 28 23:27:02 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: kbd.c
Log Message:
default to wskbd only if DEFAULT_TO_WSKBD is defined
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-keyboard/dist/src/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/kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.3 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.4
--- xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.3 Mon Apr 18 23:30:11 2011
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c Thu Apr 28 23:27:02 2011
@@ -79,7 +79,11 @@
static const char *kbdDefaults[] = {
#ifdef __NetBSD__
+#ifdef DEFAULT_TO_WSKBD
Protocol, wskbd,
+#else
+Protocol, standard,
+#endif
#else /* NetBSD */
#ifdef XQUEUE
Protocol, Xqueue,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: macallan
Date: Mon Apr 18 23:30:11 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c kbd.c
Log Message:
be less braindead about the Device option - only default to /dev/wskbd if
Protocol is set to wskbd. Now Protocol standard should work again.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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/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_kbd.c
diff -u 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.12
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.11 Mon Nov 22 07:29:09 2010
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Mon Apr 18 23:30:11 2011
@@ -383,20 +383,18 @@
xf86Msg(X_CONFIG, %s: Protocol: %s\n, pInfo-name, s);
xfree(s);
-s = xf86SetStrOption(pInfo-options, Device, NULL);
+if (prot == PROT_WSCONS) {
+ s = xf86SetStrOption(pInfo-options, Device, /dev/wskbd);
+} else
+ s = xf86SetStrOption(pInfo-options, Device, NULL);
+
if (s == NULL) {
- if (prot == PROT_WSCONS) {
- xf86Msg(X_ERROR,A \device\ option is required with
- the \wskbd\ keyboard protocol\n);
- return FALSE;
- } else {
- pInfo-fd = xf86Info.consoleFd;
- pKbd-isConsole = TRUE;
- pKbd-consType = xf86Info.consType;
- }
+ pInfo-fd = xf86Info.consoleFd;
+ pKbd-isConsole = TRUE;
+ pKbd-consType = xf86Info.consType;
} else {
pInfo-fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL);
- if (pInfo-fd == -1) {
+ if (pInfo-fd == -1) {
xf86Msg(X_ERROR, %s: cannot open \%s\\n, pInfo-name, s);
xfree(s);
return FALSE;
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.2 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.3
--- xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.2 Wed Apr 13 16:23:29 2011
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c Mon Apr 18 23:30:11 2011
@@ -80,7 +80,6 @@
static const char *kbdDefaults[] = {
#ifdef __NetBSD__
Protocol, wskbd,
-Device, /dev/wskbd,
#else /* NetBSD */
#ifdef XQUEUE
Protocol, Xqueue,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: macallan Date: Mon Apr 18 23:31:06 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c Log Message: add a couple mappings for keys found on Sun keyboards To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.4 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.5 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.4 Mon Nov 22 07:29:09 2010 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Mon Apr 18 23:31:06 2011 @@ -404,34 +404,34 @@ /* 99 */ KEY_KP_Decimal, /* Keypad . Del */ /* 100 */ KEY_Less, /* on some keyboards */ /* 101 */ KEY_Menu, /* Menu */ - /* 102 */ KEY_NOTUSED, + /* 102 */ KEY_Power, /* sleep key on Sun USB */ /* 103 */ KEY_KP_Equal, /* Keypad = on Mac keyboards */ - /* 104 */ KEY_NOTUSED, - /* 105 */ KEY_NOTUSED, - /* 106 */ KEY_NOTUSED, - /* 107 */ KEY_NOTUSED, + /* 104 */ KEY_F13, + /* 105 */ KEY_F14, + /* 106 */ KEY_F15, + /* 107 */ KEY_F16, /* 108 */ KEY_NOTUSED, - /* 109 */ KEY_NOTUSED, + /* 109 */ KEY_Power, /* 110 */ KEY_NOTUSED, /* 111 */ KEY_NOTUSED, /* 112 */ KEY_NOTUSED, /* 113 */ KEY_NOTUSED, /* 114 */ KEY_NOTUSED, /* 115 */ KEY_NOTUSED, - /* 116 */ KEY_NOTUSED, - /* 117 */ KEY_NOTUSED, - /* 118 */ KEY_NOTUSED, - /* 119 */ KEY_NOTUSED, - /* 120 */ KEY_NOTUSED, - /* 121 */ KEY_NOTUSED, - /* 122 */ KEY_NOTUSED, - /* 123 */ KEY_NOTUSED, - /* 124 */ KEY_NOTUSED, - /* 125 */ KEY_NOTUSED, - /* 126 */ KEY_NOTUSED, - /* 127 */ KEY_NOTUSED, - /* 128 */ KEY_NOTUSED, - /* 129 */ KEY_NOTUSED, + /* 116 */ KEY_L7, + /* 117 */ KEY_Help, + /* 118 */ KEY_L3, + /* 119 */ KEY_L5, + /* 120 */ KEY_L1, + /* 121 */ KEY_L2, + /* 122 */ KEY_L4, + /* 123 */ KEY_L10, + /* 124 */ KEY_L6, + /* 125 */ KEY_L8, + /* 126 */ KEY_L9, + /* 127 */ KEY_Mute, + /* 128 */ KEY_AudioRaise, + /* 129 */ KEY_AudioLower, /* 130 */ KEY_NOTUSED, /* 131 */ KEY_NOTUSED, /* 132 */ KEY_NOTUSED,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Apr 13 16:23:29 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: kbd.c
Log Message:
default to wskbd
tested on amd64, sparc(64), shark
Now X without a config file should work on most hardware
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-input-keyboard/dist/src/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/kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.1.1.4 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.2
--- xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.1.1.4 Mon Nov 22 07:27:28 2010
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c Wed Apr 13 16:23:29 2011
@@ -78,11 +78,16 @@
};
static const char *kbdDefaults[] = {
+#ifdef __NetBSD__
+Protocol, wskbd,
+Device, /dev/wskbd,
+#else /* NetBSD */
#ifdef XQUEUE
Protocol, Xqueue,
#else
Protocol, standard,
#endif
+#endif /* NetBSD */
XkbRules, base,
XkbModel, pc105,
XkbLayout, us,
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
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);
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: tsutsui Date: Sun Nov 7 15:44:04 UTC 2010 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: Recognize WSKBD_TYPE_MAPLE for dreamcast. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.9 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.9 Fri Oct 29 10:51:41 2010 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Sun Nov 7 15:44:04 2010 @@ -431,6 +431,11 @@ printWsType(ADB, pInfo-name); break; #endif +#ifdef WSKBD_TYPE_MAPLE + case WSKBD_TYPE_MAPLE: + printWsType(Maple, pInfo-name); + break; +#endif #ifdef WSKBD_TYPE_SUN case WSKBD_TYPE_SUN: printWsType(Sun, pInfo-name);
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: tsutsui Date: Sun Nov 7 15:48:18 UTC 2010 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c Log Message: Use existing wscons USB keymap for WSKBD_TYPE_MAPLE on dreamcast. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.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.2 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.2 Wed Oct 22 03:16:28 2008 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Sun Nov 7 15:48:17 2010 @@ -1297,6 +1297,9 @@ pKbd-scancodeMap = wsXt; break; case WSKBD_TYPE_USB: +#ifdef WSKBD_TYPE_MAPLE + case WSKBD_TYPE_MAPLE: +#endif pKbd-scancodeMap = wsUsb; break; #ifdef WSKBD_TYPE_ADB
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: tsutsui Date: Fri Oct 29 10:51:42 UTC 2010 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: Fix an incorrect warning fix in previous. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.8 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.9 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.8 Sun Oct 24 07:44:19 2010 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Fri Oct 29 10:51:41 2010 @@ -451,9 +451,9 @@ #endif #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT) -if (pKbd-isConsole -((pKbd-consType == SYSCONS) || (pKbd-consType == PCVT) || - (pKbd-consType == WSCONS))) +if ((pKbd-isConsole + ((pKbd-consType == SYSCONS) || (pKbd-consType == PCVT))) || + (pKbd-consType == WSCONS)) pKbd-vtSwitchSupported = TRUE; #endif
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: tsutsui
Date: Sun Oct 24 07:44:19 UTC 2010
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
Make this compile with WARNS=2.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.7 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.8
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.7 Sat May 22 21:20:17 2010
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Sun Oct 24 07:44:19 2010
@@ -338,9 +338,9 @@
}
static void
-printWsType(char *type, char *devname)
+printWsType(const char *type, char *name)
{
-xf86Msg(X_PROBED, %s: Keyboard type: %s\n, devname, type);
+xf86Msg(X_PROBED, %s: Keyboard type: %s\n, name, type);
}
#endif
@@ -452,8 +452,8 @@
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT)
if (pKbd-isConsole
-((pKbd-consType == SYSCONS) || (pKbd-consType == PCVT)) ||
- ((pKbd-consType == WSCONS)))
+((pKbd-consType == SYSCONS) || (pKbd-consType == PCVT) ||
+ (pKbd-consType == WSCONS)))
pKbd-vtSwitchSupported = TRUE;
#endif
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sat May 22 21:20:17 UTC 2010
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
merge xf86-input-keyboard 1.4.0
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.6 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.7
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.6 Tue Aug 18 13:54:53 2009
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Sat May 22 21:20:17 2010
@@ -299,53 +299,6 @@
}
}
-#define ModifierSet(k) ((modifiers (k)) == (k))
-
-static
-Bool SpecialKey(InputInfoPtr pInfo, int key, Bool down, int modifiers)
-{
- KbdDevPtr pKbd = (KbdDevPtr) pInfo-private;
-
- if(!pKbd-vtSwitchSupported)
- return FALSE;
-
- if ((ModifierSet(ControlMask | AltMask)) ||
- (ModifierSet(ControlMask | AltLangMask))) {
- if (VTSwitchEnabled !xf86Info.vtSysreq !xf86Info.dontVTSwitch) {
- switch (key) {
- case KEY_F1:
- case KEY_F2:
- case KEY_F3:
- case KEY_F4:
- case KEY_F5:
- case KEY_F6:
- case KEY_F7:
- case KEY_F8:
- case KEY_F9:
- case KEY_F10:
-#ifdef VT_ACTIVATE
- if (down) {
-ioctl(xf86Info.consoleFd, VT_ACTIVATE, key - KEY_F1 + 1);
-return TRUE;
- }
-#endif
- case KEY_F11:
- case KEY_F12:
-#ifdef VT_ACTIVATE
- if (down) {
-ioctl(xf86Info.consoleFd, VT_ACTIVATE, key - KEY_F11 + 11);
-return TRUE;
- }
-#else
- ;
-#endif
- }
- }
-}
-
-return FALSE;
-}
-
static void
stdReadInput(InputInfoPtr pInfo)
{
@@ -520,10 +473,8 @@
pKbd-GetLeds = GetKbdLeds;
pKbd-SetKbdRepeat = SetKbdRepeat;
pKbd-KbdGetMapping = KbdGetMapping;
-pKbd-SpecialKey = SpecialKey;
pKbd-RemapScanCode = NULL;
-pKbd-GetSpecialKey = NULL;
pKbd-OpenKeyboard = OpenKeyboard;
pKbd-vtSwitchSupported = FALSE;
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: martin Date: Tue Aug 18 13:54:53 UTC 2009 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: for consistency use printWsType() to print Sun5 keyboard type To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_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_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.5 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.6 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.5 Fri Jun 12 01:55:07 2009 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Tue Aug 18 13:54:53 2009 @@ -485,8 +485,8 @@ #endif #ifdef WSKBD_TYPE_SUN5 case WSKBD_TYPE_SUN5: - xf86Msg(X_PROBED, Keyboard type: Sun5\n); - break; + printWsType(Sun5, pInfo-name); + break; #endif default: xf86Msg(X_ERROR, %s: Unsupported wskbd type \%d\,
