frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export device path key options to be called by the command line of server.

This commit is contained in:
Tiago Vignatti 2007-08-07 22:59:12 -03:00
parent aee3588a4a
commit 7d1a749b21
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/kdrive/src/kinput.c
View File

@ -1162,6 +1162,8 @@ KdParseKbdOptions (KdKeyboardInfo *ki)
ki->xkbVariant = option->value; ki->xkbVariant = option->value;
else if (strcasecmp(option->key, "XkbOptions") == 0) else if (strcasecmp(option->key, "XkbOptions") == 0)
ki->xkbOptions = option->value; ki->xkbOptions = option->value;
else if (!strcasecmp (option->key, "device"))
ki->path = KdSaveString(option->value);
else else
#endif #endif
ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
@ -1259,6 +1261,8 @@ KdParsePointerOptions (KdPointerInfo *pi)
pi->transformCoordinates = TRUE; pi->transformCoordinates = TRUE;
else if (!strcmp (option->key, "rawcoord")) else if (!strcmp (option->key, "rawcoord"))
pi->transformCoordinates = FALSE; pi->transformCoordinates = FALSE;
else if (!strcasecmp (option->key, "device"))
pi->path = KdSaveString(option->value);
else else
ErrorF("Pointer option key (%s) of value (%s) not assigned!\n", ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",
option->key, option->value); option->key, option->value);
@ -2429,6 +2433,8 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
return BadValue; return BadValue;
} }
/* FIXME: change this code below to use KdParseKbdOptions and
* KdParsePointerOptions */
for (option = options; option; option = option->next) { for (option = options; option; option = option->next) {
if (strcmp(option->key, "device") == 0) { if (strcmp(option->key, "device") == 0) {
if (pi && option->value) if (pi && option->value)