[PATCH:xf86-input-keyboard] Solaris: ensure "Device" option is set, even if HAL didn't set it for us

Alan Coopersmith alan.coopersmith at oracle.com
Mon Apr 30 19:39:58 PDT 2012


Handles fallback to default /dev/kbd when AutoAddDevices is False and
Device option is not manually set in xorg.conf, so that xinput device
node property can be correctly set to it.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/sun_kbd.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index 5f7b5c6..f1e530e 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -497,6 +497,8 @@ OpenKeyboard(InputInfoPtr pInfo)
 		    kbdPath);
 	pInfo->read_input = ReadInput;
 	ret = TRUE;
+	/* in case it wasn't set and we fell back to default */
+	xf86ReplaceStrOption(pInfo->options, "Device", kbdPath);
     }
 
     free(kbdPath);
-- 
1.7.9.2



More information about the xorg-devel mailing list