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",

Reply via email to