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>
This commit is contained in:
parent
9d23459415
commit
00779932de
|
@ -1224,7 +1224,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
devs[count - 1] = xnfalloc(sizeof(InputInfoRec));
|
devs[count - 1] = xnfalloc(sizeof(InputInfoRec));
|
||||||
*devs[count - 1] = Pointer;
|
*devs[count - 1] = Pointer;
|
||||||
devs[count - 1]->options =
|
devs[count - 1]->options =
|
||||||
xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL);
|
xf86addNewOption(devs[count -1]->options,
|
||||||
|
xnfstrdup("CorePointer"), NULL);
|
||||||
devs[count] = NULL;
|
devs[count] = NULL;
|
||||||
servlayoutp->inputs = devs;
|
servlayoutp->inputs = devs;
|
||||||
}
|
}
|
||||||
|
@ -1364,7 +1365,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
devs[count - 1] = xnfalloc(sizeof(InputInfoRec));
|
devs[count - 1] = xnfalloc(sizeof(InputInfoRec));
|
||||||
*devs[count - 1] = Keyboard;
|
*devs[count - 1] = Keyboard;
|
||||||
devs[count - 1]->options =
|
devs[count - 1]->options =
|
||||||
xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL);
|
xf86addNewOption(devs[count - 1]->options,
|
||||||
|
xnfstrdup("CoreKeyboard"), NULL);
|
||||||
devs[count] = NULL;
|
devs[count] = NULL;
|
||||||
servlayoutp->inputs = devs;
|
servlayoutp->inputs = devs;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user