Commit Graph

68 Commits

Author SHA1 Message Date
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
Adam Jackson ebbdc1342a Remove calls to LoaderCheckUnresolved(), since it's now a stub. 2006-08-28 18:17:32 -04:00
Ian Romanick 21291d6ca7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-08-25 09:34:21 -07:00
Adam Jackson b879356ce9 More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER. 2006-08-24 15:50:15 -04:00
Daniel Stone 4adf9af313 Merge branch 'master' into input-hotplug 2006-08-24 10:59:33 +03:00
David Nusinow 733c4beb16 Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI 2006-08-23 22:39:42 +00:00
Ian Romanick 83ebf61ec0 Eliminate the last few places outside xf86pciBus.c that use
xf86PciVideoInfo.  In all cases this means converting the code to use
the pci_device_iterator interfaces.
2006-08-02 13:33:33 -07:00
Ian Romanick 380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
2006-07-25 11:30:04 -07:00
Daniel Stone 7465010d59 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
Ian Romanick 07ad92d2c4 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
2006-07-21 15:25:35 -07:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Kristian Høgsberg 3eeb62e8f5 bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
2006-07-21 16:33:28 -04:00
Daniel Stone 60ea7b51fe xorg ddx: move to new input API, remove old keyboard driver
Remove most of the rest of the old keyboard driver.
Move to the new Get{Keyboard,Pointer}Events API, which is mostly
complete at this stage: just missing the proximity events.
2006-07-21 15:23:37 -04:00
Daniel Stone c9a3d9baa8 xorg DDX: implement NewInputDeviceRequest
Implement NewInputDeviceRequest for Xorg, mainly written by Kristian Høgsberg.
Move MatchInput to xf86Helper.c, as xf86LookupInputDriver.
2006-07-21 15:19:50 -04:00
Daniel Stone 84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Ian Romanick 75398cff82 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c
2006-06-20 15:49:47 -07:00
Matthieu Herrb 2b58685402 Check setuid() return value. Bugzilla #7116. 2006-06-20 21:07:53 +02:00
Ian Romanick 8b6596b1e1 Move probe_devices_from_device_sections,
add_matching_devices_to_configure_list, and check_for_matching_devices
from xf86Helper.c to xf86Init.c.  These functions are only called from
a single place in xf86Init.c, so it makes sense for them to live
there.  They were originally in xf86Helper.c because they evolved out
another function that was already in that file.
2006-06-09 16:08:06 -07:00
Ian Romanick 46f55f5dea Initial batch of changes for PCI rework. All future changes will be
tracked individually.
2006-06-07 14:09:02 -07:00
Adam Jackson 07c731a2bc Bug #5089: Die, libbitmap, die! 2006-06-01 19:37:53 +00:00
Daniel Stone a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Adam Jackson 86ffb46358 Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer) 2006-05-09 18:04:29 +00:00
Adam Jackson 4c7da86118 Bug #5300: Fix missing spaces in the Build OS line in the log. (Egmont
Koblinger)
2006-04-04 14:17:04 +00:00
Adam Jackson a68c11bb1d Mark everything in xf86sym.c as _X_EXPORT. 2006-03-25 19:52:05 +00:00
Adam Jackson 6eb4e2303a Bug #6213: Check geteuid's return value, not its address, otherwise
unprivileged users can set the modulepath and run arbitrary code. Patch
    from Matthieu Herrb. (CVE-2006-0745, Coverity #4)
2006-03-20 14:01:05 +00:00
Ian Romanick 2e6f801fe1 Numerous amounts refactoring and comment adding (see ChangeLog for file by
file details). The primary intention for these changes is to pave the
    way for the new device probing and PCI configuration code that I'm
    working on.
2006-03-07 23:58:22 +00:00
Benjamin Herrenschmidt 2dc7b5e0d9 Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove
stubs in other DDX.
2006-02-13 04:43:40 +00:00
Adam Jackson f1ba3b4f33 Bug #4718: Command line flag to disable ACPI. 2005-12-14 20:11:16 +00:00
Kean Johnson 5390c7ab05 See ChangeLog entry 2005-11-07 for details. 2005-11-08 06:33:30 +00:00
Alan Coopersmith 70aedcf32a Bug #4948: <https://bugs.freedesktop.org/show_bug.cgi?id=4948> Incorrect
URL in log file for Xorg CVS. Also fixed wording of statement to not
    refer to monolithic CVS since modular uses the same code, so it was
    appearing in modular builds too.
2005-11-05 18:56:50 +00:00
Alan Coopersmith a6cbe0776f Fix the rest of the XFree86 DDX options that require an argument to say so
instead of reporting "unrecognized option" when the argument is
    missing. Also give correct error instead of "unrecognized option" for
    options only available to root.
2005-10-05 16:39:09 +00:00
Alan Coopersmith 9e8b5f3d47 Make Xorg -config stop lying to people and claiming it doesn't exist when
you fail to specify a file name. Also, include it in the list of
    available options for non-root users when listing all available flags.
2005-10-05 01:38:50 +00:00
Alan Coopersmith 5f5117729d Fix segfault when "kbd" fails to load and "keyboard" driver is not
configured.
2005-08-12 01:17:58 +00:00
Alan Coopersmith fc29d014aa Merge in patch release RC handling code from 6.8.2 (Kevin Martin) 2005-08-06 16:29:20 +00:00
Kevin E Martin 2654f88cee Fix code to handle printing 7.0 release candidates properly. 2005-07-29 18:40:54 +00:00
Adam Jackson 7586ac6ede Bug #2216: Multiseat support. From various Debian and Ubuntu patches by
Aivils Stoss, Andreas Schuldei, Branden Robinson, and Daniel Stone.
2005-07-04 18:41:04 +00:00
Daniel Stone a107f59951 Predicate usage of xf86OSPM functions on #ifdef XF86PM.
Remove needless include of ../input/mouse/mouse.h.
2005-07-03 09:39:54 +00:00
Daniel Stone e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone 292c4cff26 Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
Egbert Eich d23c46dd3e Modifying X.Org Xserver DDX to allow to run X with ordinary user
permissions when no access to HW registers is required. For API changes
    which mostly involve the modifications to make the RRFunc (introduced
    with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch
    applies changes to OS specific files for other OSes which I cannot
    test.
2005-01-28 16:13:00 +00:00
Alan Coopersmith 3035739e5b Bug #2123 <https://bugs.freedesktop.org/show_bug.cgi?id=2123> Attachment
#1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587> Call to
    uname should not check for return == 0, but for >= 0 instead
2004-12-22 08:28:16 +00:00