frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,208 Commits 293 Branches 13 Tags 61 MiB
Commit Graph

108 Commits

Author SHA1 Message Date
Tiago Vignatti 81272f7ec9 Some doc clean up: 
clean up legacy things in os-support/bus/Pci.c.

    Put InitOutput() comment to its right place.
 2008-02-25 17:39:33 -03:00
Tiago Vignatti 9727db88d5 No more "-scanpci" given that we already have it in libpciaccess. 
(Yeah, lets nuke dead code!)
 2008-02-25 17:08:07 -03:00
Peter Hutterer 67a78e84a8 Revert "xfree86: plug a memory leak in xf86LoadModules." 
This reverts commit 3abce3ea2b and
6cbaf15e61.

The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.

For further reference: hw/xfree86/common/xf86Helper.c
    Input drivers: xf86InputDriverList[blah]->module = module;
    Output drivers: xf86DriverList[blah]->module = module;

Unloading the module would not look pretty then.
 2008-02-19 21:31:50 +10:30
Peter Hutterer 6cbaf15e61 xfree86: guard against NULL-pointer dereferences in xf86LoadModules. 
Should have been part of 3abce3ea2b, but I
forgot to git-update-index before I committed.

Thanks to Bill Crawford for pointing it out.
 2008-02-19 12:05:13 +10:30
Arjan van de Ven 3abce3ea2b xfree86: plug a memory leak in xf86LoadModules. 
LoadModule() returns the only reference to a fresh piece of memory (a
ModuleDescPtr). Sadly, xf86LoadModules dropped the return value on the floor
leaking memory for each module it loaded.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-02-18 18:14:40 +10:30
Adam Jackson 0bdd20a045 Eradicate the VTInit code. 
"This option should rarely be used."  Never sounds like a better idea.
 2008-02-14 07:52:46 +11:00
Adam Jackson 24089b0624 Don't bother warning people about the keyboard driver rename, just do it. 2008-02-14 07:52:33 +11:00
Adam Jackson 2aaf6ac134 Don't even attempt to parse -bpp in xfree86 DDX option parsing. 
This hasn't been valid since 1999.  Get with the times, man.
 2008-02-14 07:52:26 +11:00
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
 2007-12-13 18:38:25 -05:00
Adam Jackson 1faba797cb Death to libcwrapper. 
This has been deprecated since 1.1.  Since we're breaking ABI again anyway,
remove it entirely.
 2007-12-03 14:12:58 -05:00
Eamon Walsh 2d17f47cc7 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
 2007-11-19 18:10:46 -05:00
Adam Jackson 2c01a49bf0 Don't sleep(1) at exit on any platform. 2007-11-15 13:32:59 -05:00
Adam Jackson cecac79445 Don't sleep(1) at server exit. 2007-11-14 14:46:22 -05:00
Eamon Walsh c3f7b86255 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	os/access.c
 2007-10-17 15:00:54 -04:00
David Nusinow 6033d8150b First pass at improved video driver autoloading 
This is what we're currently shipping in Debian. Enables the ability for
drivers to ship a text file listing PCI ID's they support, and have the
server read them on startup when no driver is specified. This works, but
isn't the final solution.
 2007-10-09 22:13:15 -04:00
Eamon Walsh 97c150b61b Merge branch 'master' into XACE-SELINUX 
Conflicts:

	afb/afbpntwin.c
	afb/afbscrinit.c
	afb/afbwindow.c
	cfb/cfb.h
	cfb/cfballpriv.c
	cfb/cfbscrinit.c
	cfb/cfbwindow.c
	configure.ac
	fb/wfbrename.h
	hw/xfree86/xf4bpp/ppcIO.c
	hw/xfree86/xf4bpp/ppcPntWin.c
	hw/xfree86/xf4bpp/ppcWindow.c
	hw/xfree86/xf8_32bpp/cfbscrinit.c
	mfb/mfb.h
	mfb/mfbpntwin.c
	mfb/mfbscrinit.c
	mfb/mfbwindow.c
	mi/miexpose.c

Note: conflicts caused by devPrivates rework vs. paintwindow changes.
 2007-09-19 07:25:55 -04:00
Eric Anholt 47300ed2be Fix server version reporting to be the server package version. 
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense.  Instead, just
report the package version.

When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch).  The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).

This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now.  While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.
 2007-09-05 12:43:28 -07:00
Eamon Walsh 4017d31902 devPrivates rework: since API is already broken, switch everything 
over to new system.

Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
 2007-08-28 09:28:25 -04:00
Eamon Walsh 8554707326 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	include/miscstruct.h
	mi/mibstore.c
	mi/midispcur.c
	os/Makefile.am
 2007-08-28 07:25:21 -04:00
David Nusinow bf0883ae50 Fix bug in debugging info related to pci-rework merge 2007-08-25 14:53:17 -04:00
Ian Romanick 8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/generic.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/loader/xf86sym.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/Pci.h
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/int10/linux.c
 2007-08-23 18:19:17 -07:00
Eamon Walsh b82557c9fb xace: add hooks + new access codes: core protocol screensaver requests 2007-08-16 10:36:05 -04:00
Daniel Stone 4d3379d418 Fonts: Fix builtin fonts 
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
 2007-08-01 01:53:31 +03:00
Adam Jackson 0a63d874e9 Always normalize the module name. 2007-07-18 15:44:45 -04:00
Adam Jackson 9a1c6afd12 Remove dead code for screen crossing. 2007-07-18 15:44:44 -04:00
Adam Jackson 8ca2fe8914 Delete dead module test code. 2007-07-18 15:44:44 -04:00
Adam Jackson e2413cc7ca Remove MEMDEBUG 
This existed (but may not have worked) in the monolith, but is gone now.
 2007-07-18 15:43:40 -04:00
Adam Jackson d1d65a8415 Dead ifdefs for BITMAP_SCANLINE_UNIT == 64 
This appears to be a legacy of cfb24 not being smart enough to deal with this
case.  But since cfb24 unexists, die die die.
 2007-07-18 15:42:30 -04:00
Keith Packard ac979c1651 MakeAtom needs length without trailing NUL. sizeof("string") includes NUL. 
I made a mistake in some new code using MakeAtom, passing the size of the
string instead of the length of the string. Figuring there might be other
such mistakes, I reviewed the server code and found four bugs of the same
form.
 2007-07-14 12:13:17 -07:00
Alan Coopersmith 031b009ea6 Use %S instead of %s for strftime seconds when printing build time 2007-07-13 14:54:45 -07:00
Alan Coopersmith 6b4231e3b5 Use kbd driver when xorg.conf specifies "keyboard" or "Keyboard" (bug #11301) 
X.Org Bug #11301 <https://bugs.freedesktop.org/show_bug.cgi?id=11301>
Sun Bug #6560332 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6560332>
 2007-07-12 16:36:27 -07:00
Adam Jackson f7f3fe7fe7 Remove the remnants of OS/2 support. 
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
 2007-06-28 18:59:05 -04:00
Peter Hutterer 93ca526892 Split up memory for devices configured in the config file. 
If we're using a continuous block here, we segfault when a device removal
triggers an xfree call.
 2007-06-25 09:35:30 +09:30
Ian Romanick ab7a6d860d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
 2007-06-18 16:51:13 -07:00
Clark Rawlins 8d5f4368ea Really make sure BUILD_TIME doesn't have a leading zero. 
date +'%k%M%S' still gives a leading zero in the hour after midnight...

Add a leading 1 and remove it in xf86PrintBanner().
 2007-06-11 16:53:38 +02:00
Zephaniah E. Hull 0cbc3a4da2 Print the build time as well as the date if we can. 2007-06-04 02:03:44 -04:00
Ian Romanick 2c6d471088 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
 2007-03-28 08:08:04 -07:00
Ben Byer cf4994b0db dix mods for Darwin 2007-02-17 01:21:43 -08:00
Ian Romanick 88f248e671 Replace PciBusId with 'struct pci_device *' 
There's no need to store the slot information for a PCI device as its
ID.  Instead, skip the middle man and just store a pointer to the
pci_device structure.
 2007-01-17 14:04:43 -08:00
Ian Romanick 0361611080 Convert xf86IsolateDevice to a 'struct pci_slot_match'. 
This change was accidentally not committed on the previous commit.
 2007-01-17 13:06:04 -08:00
Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
 2006-12-08 17:24:15 -08:00
Michel Dänzer 729fca33a4 Revert "xfree86 DDX: Delete DDX screens in ddxGiveUp()." 
This reverts commit a6381e6984.

See https://bugs.freedesktop.org/show_bug.cgi?id=9224 .
 2006-12-07 12:09:18 +01:00
Michel Dänzer a6381e6984 xfree86 DDX: Delete DDX screens in ddxGiveUp(). 
This allows video drivers to clean up in the FreeScreen hook things they set up
in the PreInit hook.
 2006-11-29 19:25:09 +01:00
Aaron Plattner 64de3baf85 Add a -showDefaultLibPath option. 
A corollary to the previous change, this option prints $libdir.
 2006-11-22 14:46:51 -08:00
Aaron Plattner 0a2a6e4070 Add a -showDefaultModulePath option. 
As discussed on the mailing list, people would rather have an X command-line
option to print the module path so installers can know where to put modules,
rather than the installers using `pkg-config --variable=moduledir xorg-server`,
since some distros choose not to install xorg-server.pc.
 2006-11-22 14:43:37 -08:00
Ian Romanick 8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/scanpci/extrapci.ids
	hw/xfree86/scanpci/pci.ids
	hw/xfree86/scanpci/pciid2c.pl
	hw/xfree86/scanpci/xf86PciStdIds.h
 2006-10-24 08:57:59 -07:00
Alan Coopersmith b0780312d8 Pre-release message should tell users to check git, not CVS, for updates 2006-10-20 00:43:10 +03:00
Alan Coopersmith e1dd1904c6 Pre-release message should tell users to check git, not CVS, for updates 2006-10-19 14:27:15 -07:00
Daniel Stone be8dfafd1d warning cleanups 
Fix still more warnings.
 2006-10-08 20:32:16 +03:00
Daniel Stone 7fa3383e3c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-08-29 15:16:01 +03:00