xserver/hw/xfree86/common
Matthieu Herrb 00779932de 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>
2011-02-28 09:48:44 +10:00
..
.gitignore
Makefile.am Remove SCO support 2010-12-20 12:11:11 -05:00
compiler.h Remove SCO support 2010-12-20 12:11:11 -05:00
extramodes
fourcc.h
modeline2c.awk
vesamodes
vidmodeproc.h
xf86.h xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86AutoConfig.c config: warning fixes 2010-12-31 12:36:44 +00:00
xf86Build.h.in
xf86Bus.c xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86Bus.h
xf86Config.c Don't clobber input device options from xorg.conf 2011-02-28 09:48:44 +10:00
xf86Config.h
xf86Configure.c Remove SCO support 2010-12-20 12:11:11 -05:00
xf86Cursor.c xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86DGA.c xfree86/dga: Remove DGAIsDgaEvent() 2011-01-27 14:22:03 +10:00
xf86DPMS.c
xf86Events.c xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86Globals.c xfree86: Remove unused xf86inSuspend 2010-12-20 12:09:16 -05:00
xf86Helper.c Convert alloc+sprintf pairs into asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
xf86InPriv.h
xf86Init.c xfree86: fix up an out-of-date comment. 2011-02-16 08:17:25 +10:00
xf86Mode.c xf86ValidateModes: xnfalloc(strlen) + strcpy => xnfstrdup 2010-11-30 16:25:10 -08:00
xf86Module.h xfree86: bump input minor ABI 2011-01-27 14:22:02 +10:00
xf86Opt.h xfree86: add xf86OptionListDuplicate() 2010-09-18 13:55:37 +02:00
xf86Option.c xfree86: swap the order to-be-merged lists in xf86CollectInputOptions. 2010-12-13 09:57:59 +10:00
xf86PM.c xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86PciInfo.h
xf86Priv.h xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86Privstr.h xfree86: rename allowEmptyInput to forceInputDevices. 2010-11-12 11:49:48 +10:00
xf86RandR.c
xf86ShowOpts.c Replace alloc+strcpy+strcat with asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
xf86VGAarbiter.c Add subWindowMode parameter to SourceValidate 2011-01-05 11:56:28 -08:00
xf86VGAarbiter.h
xf86VGAarbiterPriv.h Add subWindowMode parameter to SourceValidate 2011-01-05 11:56:28 -08:00
xf86VidMode.c xf86vidmode: warning fix 2011-02-08 12:40:14 -05:00
xf86Xinput.c xfree86/dga: Remove useless ifdefs 2011-01-27 14:22:03 +10:00
xf86Xinput.h xfree86: use xf86AllocateInput() for xorg.conf devices too. 2010-12-07 11:37:31 +10:00
xf86cmap.c
xf86cmap.h
xf86fbBus.c
xf86fbman.c
xf86fbman.h
xf86noBus.c
xf86pciBus.c Convert alloc+sprintf pairs into asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
xf86pciBus.h
xf86sbusBus.c Convert alloc+sprintf pairs into asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
xf86sbusBus.h
xf86str.h xfree86: Remove xf86EnterServerState 2010-12-20 12:14:32 -05:00
xf86xv.c xf86/xv: Only register PostValidateTree hook when there is work to do 2011-02-03 14:38:42 +02:00
xf86xv.h xf86/xv: Fill color key on expose 2011-02-03 14:38:10 +02:00
xf86xvmc.c
xf86xvmc.h
xf86xvpriv.h xf86/xv: Use PostValidateTree to do reput 2011-02-03 14:38:36 +02:00
xisb.c
xisb.h
xorgHelper.c
xorgVersion.h