frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xfree86/common
History
Peter Hutterer beea2378f1 xfree86: don't overwrite option list (#32115) 
Options set in the configuration file were unconditionally overwritten by
the server. Merge the already existing options and the new options together
instead of just overwriting ones.

Introduced in commit 2199842ed5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Sep 2 10:52:54 2010 +1000

    xfree86: remove extraOptions field from IDevRec.

X.Org Bug 32115 <http://bugs.freedesktop.org/show_bug.cgi?id=32115>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: David Ronis <ronis@ronispc.chem.mcgill.ca>
 		2010-12-07 08:09:10 +10:00
..
.gitignore .gitignore: use common defaults with custom section #24239 2009-11-11 21:40:20 -08:00
Makefile.am xfree86: remove two unused variables from Makefile.am 2010-11-05 09:30:14 +10:00
compiler.h xfree86: nds32: add nds32 support for compiler related mmio codes 2010-09-23 15:36:40 -07:00
extramodes Remove some default modes that really shouldn't be in the default set. 2008-06-24 10:40:36 -04:00
fourcc.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
modeline2c.awk Remove some OS/2 leftovers. 2009-04-06 10:58:47 -04:00
scoasm.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
vesamodes Fix standard VESA modes. 2006-11-03 14:06:32 -08:00
vidmodeproc.h Rework symbol visibility for easier maintenance 2008-12-03 05:43:34 -02:00
xf86.h xfree86: Remove unused xf86PixmapKeyRec 2010-11-30 13:46:09 -05:00
xf86AutoConfig.c Remove unnecessary parentheses around return values in functions 2010-06-10 06:42:42 -07:00
xf86Build.h.in Print the build time as well as the date if we can. 2007-06-04 02:03:44 -04:00
xf86Bus.c Remove unnecessary parentheses around return values in functions 2010-06-10 06:42:42 -07:00
xf86Bus.h xfree86: bus: remove useless field from EntityRec 2010-05-24 19:17:04 +03:00
xf86Config.c xfree86: don't overwrite option list (#32115) 2010-12-07 08:09:10 +10:00
xf86Config.h xfree86: "Staticize" functions in xf86AutoConfig.c 2009-07-24 13:25:42 +03:00
xf86Configure.c xfree86: configure: move buses references to their own location 2010-09-14 18:51:59 +03:00
xf86Cursor.c Remove more superfluous if(p) checks around free(p) 2010-06-06 20:27:18 +07:00
xf86DGA.c xfree86: set mask for valuators 0/1 when emulating core events (#30267) 2010-10-20 08:02:38 +10:00
xf86DPMS.c Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
xf86Events.c xfree86: add a hook to replace the new console handler. 2010-09-10 09:09:47 +10:00
xf86Globals.c xfree86: Remove unused xf86PixmapKeyRec 2010-11-30 13:46:09 -05:00
xf86Helper.c Merge branch 'master' into input-api 2010-10-15 13:46:59 +10:00
xf86InPriv.h xfree86: make xf86ActivateDevice static. 2010-09-01 15:26:47 +10:00
xf86Init.c xfree86: Remove unused xf86PixmapKeyRec 2010-11-30 13:46:09 -05:00
xf86Mode.c xfree86: Bump classic driver default to 1024x768 2010-11-30 13:24:23 -08:00
xf86Module.h Merge branch 'master' into input-api 2010-10-15 13:46:59 +10:00
xf86Opt.h xfree86: add xf86OptionListDuplicate() 2010-09-18 13:55:37 +02:00
xf86Option.c xfree86: add xf86OptionListDuplicate() 2010-09-18 13:55:37 +02:00
xf86PM.c xf86 ddx: add vga arbiter support. 2009-08-28 11:39:42 +10:00
xf86PciInfo.h No more "-scanpci" given that we already have it in libpciaccess. 2008-02-25 17:08:07 -03:00
xf86Priv.h xfree86: use xf86PciIsolateDevice to get PCI config information 2010-09-14 18:42:54 +03:00
xf86Privstr.h xfree86: rename allowEmptyInput to forceInputDevices. 2010-11-12 11:49:48 +10:00
xf86RandR.c Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
xf86ShowOpts.c xfree86: Add option parsing for percent options. 2010-05-18 15:43:51 -07:00
xf86VGAarbiter.c Merge remote branch 'jamey/reviewed' 2010-09-13 16:48:33 -07:00
xf86VGAarbiter.h xfree86: vgaarb: fix device decoding interface to send resources type properly 2010-08-26 18:17:12 +03:00
xf86VGAarbiterPriv.h xfree86: vgaarb: remove useless macro 2010-08-26 18:16:59 +03:00
xf86VidMode.c Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
xf86Xinput.c xfree86: add option "Floating", deprecate SendCoreEvents and friends. 2010-12-07 08:08:15 +10:00
xf86Xinput.h Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api 2010-11-11 12:54:46 +10:00
xf86cmap.c Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998 2010-07-13 09:58:04 -07:00
xf86cmap.h Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
xf86fbBus.c xserver: remove RAC/resource handling code. 2009-07-28 15:14:28 +10:00
xf86fbman.c Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
xf86fbman.h Rework symbol visibility for easier maintenance 2008-12-03 05:43:34 -02:00
xf86noBus.c xserver: remove RAC/resource handling code. 2009-07-28 15:14:28 +10:00
xf86pciBus.c xfree86: delete useless "Primary device is not PCI" message 2010-09-14 18:53:31 +03:00
xf86pciBus.h xfree86: configure: move buses references to their own location 2010-09-14 18:51:59 +03:00
xf86sbusBus.c xfree86: configure: move buses references to their own location 2010-09-14 18:51:59 +03:00
xf86sbusBus.h xfree86: configure: move buses references to their own location 2010-09-14 18:51:59 +03:00
xf86str.h xfree86/modes: Provide a ModeSet hook in ScrnInfo 2010-11-26 18:01:06 +02:00
xf86xv.c xfree86/xv: Provide a ModeSet hook 2010-11-26 18:01:06 +02:00
xf86xv.h xfree86/xv: Pass all coordinate arguments to ReputImage 2010-11-26 18:01:05 +02:00
xf86xvmc.c Change the devPrivates API to require dixRegisterPrivateKey 2010-06-05 19:23:03 -07:00
xf86xvmc.h Rework symbol visibility for easier maintenance 2008-12-03 05:43:34 -02:00
xf86xvpriv.h xfree86/xv: Provide a ModeSet hook 2010-11-26 18:01:06 +02:00
xisb.c Remove unnecessary parentheses around return values in functions 2010-06-10 06:42:42 -07:00
xisb.h Rework symbol visibility for easier maintenance 2008-12-03 05:43:34 -02:00
xorgHelper.c xfree86: ANSI cleanups 2009-01-11 08:54:11 +01:00
xorgVersion.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00