andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: when implicitly choosing a core device, set the option to a value

Browse Source 
Devices are core pointers/keyboards by default now anyway, but let's set the
option to some value instead of just NULL.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-07-04 13:46:24 +10:00
parent 44d53728a6
commit 4527e2b776
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Config.c
View File

@ -1216,7 +1216,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
*devs[count - 1] = Pointer; *devs[count - 1] = Pointer;
devs[count - 1]->options = devs[count - 1]->options =
xf86addNewOption(devs[count -1]->options, xf86addNewOption(devs[count -1]->options,
xnfstrdup("CorePointer"), NULL); xnfstrdup("CorePointer"), "on");
devs[count] = NULL; devs[count] = NULL;
servlayoutp->inputs = devs; servlayoutp->inputs = devs;
} }
@ -1261,7 +1261,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
Pointer.fd = -1; Pointer.fd = -1;
*devs[count - 1] = Pointer; *devs[count - 1] = Pointer;
devs[count - 1]->options = devs[count - 1]->options =
xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL); xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), "on");
devs[count] = NULL; devs[count] = NULL;
servlayoutp->inputs = devs; servlayoutp->inputs = devs;
} }
@ -1359,7 +1359,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
*devs[count - 1] = Keyboard; *devs[count - 1] = Keyboard;
devs[count - 1]->options = devs[count - 1]->options =
xf86addNewOption(devs[count - 1]->options, xf86addNewOption(devs[count - 1]->options,
xnfstrdup("CoreKeyboard"), NULL); xnfstrdup("CoreKeyboard"), "on");
devs[count] = NULL; devs[count] = NULL;
servlayoutp->inputs = devs; servlayoutp->inputs = devs;
} }