summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Vignatti <tiagov@balalaika.(none)>2007-08-07 22:59:12 -0300
committerTiago Vignatti <tiagov@balalaika.(none)>2007-08-07 22:59:12 -0300
commit7d1a749b210ba5b9f8d0e5a1feb9a9ef9fa4d992 (patch)
tree7f8b6eef63ed31248e2376f23f2645f223818783
parentaee3588a4a6829326770c84b860061f47f2cbcae (diff)
Export device path key options to be called by the command line of server.
-rw-r--r--hw/kdrive/src/kinput.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 8fe605e53..6c247c185 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1162,6 +1162,8 @@ KdParseKbdOptions (KdKeyboardInfo *ki)
ki->xkbVariant = option->value;
else if (strcasecmp(option->key, "XkbOptions") == 0)
ki->xkbOptions = option->value;
+ else if (!strcasecmp (option->key, "device"))
+ ki->path = KdSaveString(option->value);
else
#endif
ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
@@ -1259,6 +1261,8 @@ KdParsePointerOptions (KdPointerInfo *pi)
pi->transformCoordinates = TRUE;
else if (!strcmp (option->key, "rawcoord"))
pi->transformCoordinates = FALSE;
+ else if (!strcasecmp (option->key, "device"))
+ pi->path = KdSaveString(option->value);
else
ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",
option->key, option->value);
@@ -2429,6 +2433,8 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
return BadValue;
}
+ /* FIXME: change this code below to use KdParseKbdOptions and
+ * KdParsePointerOptions */
for (option = options; option; option = option->next) {
if (strcmp(option->key, "device") == 0) {
if (pi && option->value)