diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2011-02-27 20:16:03 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-28 09:48:44 +1000 |
| commit | 00779932de861bf7ac8c625802f1afed75d01b6f (patch) | |
| tree | 87cb05c8c09a802e37cea18af7abeb9366befa89 /hw/xfree86/common/xf86Config.c | |
| parent | 9d23459415b84606ee4f38bb2d19054c432c8552 (diff) | |
Don't clobber input device options from xorg.conf
Since commit b8d9c5ff removed commonOptions, we now
need to append the "Core{Keyboard,Pointer}" options to
the existing list.
Fixes passing options to devices confirured in xorg.conf
on systems where autoaddevices is false.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xfree86/common/xf86Config.c')
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 49d8fa84a..9602e899f 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1224,7 +1224,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) devs[count - 1] = xnfalloc(sizeof(InputInfoRec)); *devs[count - 1] = Pointer; devs[count - 1]->options = - xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL); + xf86addNewOption(devs[count -1]->options, + xnfstrdup("CorePointer"), NULL); devs[count] = NULL; servlayoutp->inputs = devs; } @@ -1364,7 +1365,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) devs[count - 1] = xnfalloc(sizeof(InputInfoRec)); *devs[count - 1] = Keyboard; devs[count - 1]->options = - xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL); + xf86addNewOption(devs[count - 1]->options, + xnfstrdup("CoreKeyboard"), NULL); devs[count] = NULL; servlayoutp->inputs = devs; } |