xserver/hw/xfree86
Peter Hutterer 9db9e964f6 xfree86: swap the order to-be-merged lists in xf86CollectInputOptions.
Current order causes the user-configured option list to be overwritten with
the default list supplied by the driver. Swap around so we overwrite the
driver's default values instead.

This only affected options supplied by the driver such as XkbLayout in the
case of evdev.

Reported-by: Sebastian Glita <glseba@yahoo.com>
Reported-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Sebastian Glita <glseba@yahoo.com>
2010-12-13 09:57:59 +10:00
..
common xfree86: swap the order to-be-merged lists in xf86CollectInputOptions. 2010-12-13 09:57:59 +10:00
ddc ddc: Don't probe for DDC/CI or EEPROM 2010-10-18 15:42:54 -04:00
dixmods Replace alloc+strcpy+strcat with asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
doc xfree86: add option "Floating", deprecate SendCoreEvents and friends. 2010-12-07 08:08:15 +10:00
dri Convert alloc+sprintf pairs into asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
dri2 DRI2: Avoid call to NULL pointer 2010-11-10 14:38:09 -08:00
exa Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
fbdevhw xfree86: Remove useless module setup functions where appropriate 2010-09-22 10:57:22 -04:00
i2c xfree86: Remove useless module setup functions where appropriate 2010-09-22 10:57:22 -04:00
int10 Merge remote branch 'ajax/less-loader' 2010-09-28 08:15:07 -07:00
loader Replace alloc+strcpy+strcat with asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
modes Convert cvt code to use XNFasprintf() 2010-12-07 11:10:36 -08:00
os-support Sun's copyrights now belong to Oracle 2010-12-07 11:10:35 -08:00
parser Convert hw/xfree86/parser code to use asprintf() calls 2010-12-07 11:10:35 -08:00
ramdac Enable silent rules for cat and echo. 2010-12-07 18:42:44 +01:00
shadowfb xfree86: Kill pixmapPrivate with a vengeance (v2) 2010-09-28 08:07:21 -07:00
utils Convert cvt code to use XNFasprintf() 2010-12-07 11:10:36 -08:00
vbe Convert alloc+sprintf pairs into asprintf() & XNFasprintf() calls 2010-12-07 11:10:35 -08:00
vgahw xfree86: nds32: add nds32 definition for vgaHW support. 2010-09-23 15:36:19 -07:00
x86emu x86emu: fix jump_near_IMM to handle DATA: flag correctly. 2010-11-10 14:56:57 -08:00
xaa Enable silent rules for cat and echo. 2010-12-07 18:42:44 +01:00
.gitignore .gitignore: use common defaults with custom section #24239 2009-11-11 21:40:20 -08:00
Makefile.am xfree86: Remove the xf8_16bpp overlay module 2010-11-30 14:26:58 -05:00
xorgconf.cpp Update xorg.conf man page & sample for changes in Xorg 1.7 2009-09-14 16:03:18 +10:00