On 07/26/13 02:24 PM, Thomas Klausner wrote:
Only default to /dev/wskbd if Protocol is set to wskbd. Now Protocol
"standard" should work again.
From Michael Lorenz <macal...@netbsd.org>
Signed-off-by: Thomas Klausner <w...@netbsd.org>
---
src/bsd_kbd.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 6a3ca79..b9cca5f 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -359,20 +359,18 @@ OpenKeyboard(InputInfoPtr pInfo)
}
free(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);
+
Minor style nit - it seems odd to bracket the first one-line else
clause but not the second. I personally tend towards bracketing
both, but I believe the current X.Org style recommendation would
bracket neither, as in:
+ if (prot == PROT_WSCONS)
+ s = xf86SetStrOption(pInfo->options, "Device", "/dev/wskbd");
+ else
+ s = xf86SetStrOption(pInfo->options, "Device", NULL);
--
-Alan Coopersmith- alan.coopersm...@oracle.com
Oracle Solaris Engineering - http://blogs.oracle.com/alanc
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
