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
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
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