Matthias Hopf
26d2e45bdb
Bug #9023 : Only check mice for "mouse" or "void" if identifier is != NULL.
2006-11-14 15:33:07 +01:00
Jeremy C. Reed
a724b7f130
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-11-13 20:32:26 -06:00
Jeremy C. Reed
6facd958c2
On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
...
TODO: use autoconf to handle this so the code is not platform
based but feature based.
2006-11-13 20:23:06 -06:00
George Sapountzis
5bfe7f4dfc
DRI: call drmSetServerInfo() before drmOpen().
...
Also, remove some libdrm remnants.
2006-11-13 01:54:32 +02:00
Eric Anholt
28337cc106
Fix typo before the last commit.
2006-11-09 19:51:17 -08:00
Eric Anholt
e1720b1089
Bug #8868 : Remove drm from SUBDIRS now that the directory is gone.
2006-11-09 18:53:37 -08:00
Keith Packard
ec77a95a02
Allow RandR objects to be created before the associated ScreenRec.
...
xf86 drivers need to create RandR object in the PreInit stage,
before the ScreenRec is allocated. Changing the RandR DIX code
to permit this required the addition of functions that later associate the
objects with the related screen.
An additional change is that modes are now global, and no longer associated
with a specific screen. This change actually makes mode management cleaner
as there is no more per-screen list of modes to deal with.
This changes the RandR 1.2 ABI/API for drivers.
2006-11-08 21:36:35 -08:00
Dave Airlie
fd91630b73
make X server use system libdrm - this requires libdrm >= 2.3.0
...
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
2006-11-09 09:30:33 +11:00
Adam Jackson
0409e1627a
'make dist' fixes.
2006-11-08 16:17:20 -05:00
Bram Verweij
0567a6337b
xfree86/linux acpi: fix tokenising
...
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
2006-11-08 18:00:52 +02:00
Daniel Stone
e7900d68c3
remove trailing whitespace
...
Whitespace police in full effect.
2006-11-08 15:36:47 +02:00
Daniel Stone
2035f115b7
xfree86: remove xf86Keymap.h
2006-11-08 15:30:03 +02:00
Daniel Stone
809e2841aa
xfree86: add general handler, port ACPI to it (bug #5665 )
...
Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this.
2006-11-08 15:30:03 +02:00
Daniel Stone
332f179db7
kdrive/sdl: fix compilation
2006-11-08 15:30:03 +02:00
Daniel Stone
844090a5b5
xfree86/xf86misc: warning fixes
2006-11-08 15:29:15 +02:00
Daniel Stone
61b570d0c1
xfree86/os-support: update prototype for OSRingBell
2006-11-08 15:29:15 +02:00
Erik Andren
96f78e3886
remove XFree86 changelogs (bug #7262 )
...
Without being able to tie these to specific commits, the text changelog is
useless, as well as being huge.
2006-11-08 15:29:15 +02:00
Adam Jackson
05f1c30246
Merge branch 'autoconfig-for-7.2'
2006-11-07 18:42:54 -05:00
Eric Anholt
4e6e4baead
Fix build on FreeBSD after input-hotplug.
2006-11-07 13:36:54 -08:00
Keith Packard
20e9144c07
Add $(DIX_CFLAGS) to remaining Makefile.am files
2006-11-07 12:49:28 -08:00
Keith Packard
c20d3bf753
Merge branch 'origin' into randr-1.2
2006-11-07 01:21:28 -08:00
Juliusz Chroboczek
aa0261a98e
Improve vm86 error handling in Xvesa.
2006-11-06 02:29:49 +01:00
Juliusz Chroboczek
6b2c65fdd1
Fix typo in Xvesa: incorrect reporting of DAC capabilities.
2006-11-06 00:30:09 +01:00
Keith Packard
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
Keith Packard
8b87ce1974
Allow X server to build against libdrm 2.1
2006-11-04 17:41:25 -08:00
Keith Packard
7ffbe9d232
Add DIX_CFLAGS to hw/vfb/Makefile.am
2006-11-04 17:41:09 -08:00
Bernhard Rosenkraenzer
8deaaa312a
automake: avoid use of reserved _SOURCES keyword (bug #8866 )
...
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
2006-11-04 19:08:28 +02:00
Samuel Thibault
f72927d26c
xfree86/hurd: remove OsMouseProc (bug #5613 )
...
Remove OsMouseProc, let the mouse driver deal with it.
2006-11-04 19:08:27 +02:00
Samuel Thibault
0273610578
xfree86/hurd: add bell support, remove SERVER/LOADER defines (bug #5613 )
...
Add no-op bell ringing support, and remove obsolete @SERVER_DEFINES@ and
@LOADER_DEFINES@ from CFLAGS.
2006-11-04 19:08:25 +02:00
Samuel Thibault
412e93349e
kdrive: make building of Linux support conditional (bug #5613 )
...
Only try to build Linux support on Linux. We should probably disable all
OS-dependent DDXes if we don't have a workable OS (and only build
Xephyr/Xfake), but that's future work.
2006-11-04 19:08:23 +02:00
Aaron Plattner
97fd471a62
Fix standard VESA modes.
...
The built-in mode timings were off slightly for the 640x480@60, 640x480@72,
and 1024x768@75 modes.
2006-11-03 14:06:32 -08:00
Bjorn Helgaas
bd0c829654
Do not map full 0-1MB legacy range
...
If we're mapping something in the "legacy range" (0-1Mb), we shouldn't
expand the requested range to the entire 0-1Mb range. Typically this
is for mapping the VGA frame buffer, and some platforms support mmap of
the frame buffer but not the entire 0-1Mb range.
For example, HP sx1000 and sx2000 ia64 platforms can have memory from
0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from
0xc0000-0xfffff. On these platforms, we can't map the entire 0-1Mb
range with the same attribute because the memory only supports WB,
while the frame buffer supports only UC. But an mmap of just the
frame buffer should work fine.
2006-11-03 18:59:52 +01:00
Egbert Eich
c1828a8ff5
Fixing mach64 driver bailing out on ia64
...
Mach64 driver bails out on ia64 because it cannot map device
memory. It turns out that some bogus and unneeded code attempts
to find the root bridge of the device and fails to do so proberly
as there this host-to-pci bridge is not existant. This code has
been around for years although it completely unclear what it had
been intended for. Fixing this by eliminating the bogus code.
2006-11-03 18:59:52 +01:00
Matthias Hopf
d50fc413b3
Fix device path in altixPCI.c to be domain aware.
2006-11-03 18:59:52 +01:00
Matthias Hopf
1d731fc54a
Add domain support to linuxPciOpenFile().
...
Loosely based on patch from David S. Miller <davem@davemloft.net>
See also bug #2368 .
2006-11-03 18:59:51 +01:00
Matthias Hopf
caaa113acf
Fixing domain support for ia64
...
ia64 specific functions + defines.
Still uses /proc interface for some scaning code.
Based on code from Egbert Eich <eich@freedesktop.org>.
2006-11-03 18:59:51 +01:00
Matthias Hopf
16c5043fc0
Fix 2 warnings.
2006-11-03 18:59:51 +01:00
Matthias Hopf
072c022e73
Fix obviously wrong boundary checks + cleanup unused vars.
...
Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree.
2006-11-03 18:59:51 +01:00
Matthias Hopf
5afc6c1a14
Added linux 2.6 compatible domain aware device scanning code.
...
Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn.
2006-11-03 18:59:51 +01:00
Egbert Eich
6319f7d713
Make int10 fully domain aware.
2006-11-03 18:59:51 +01:00
Matthias Hopf
f4dd2665b0
Added missing domain stripping in already domain aware code.
2006-11-03 18:59:51 +01:00
Matthias Hopf
46901063e8
Build with -D_PC on ix86 only.
2006-11-03 18:59:51 +01:00
Keith Packard
543b397277
Merge branch 'origin' into randr-1.2
2006-11-02 19:00:35 -08:00
Alan Coopersmith
037f23e6f8
Convert Xprt DDX to new motion history api
2006-11-02 18:30:58 -08:00
Alan Coopersmith
7dc54a40e9
Remove references to xf86Info.kbd* from solaris code
2006-11-02 16:38:47 -08:00
Alan Coopersmith
e46f7f78b3
sun_bell.c needs to #include "xf86_OSlib.h"
2006-11-02 16:38:12 -08:00
Daniel Stone
01afa533aa
xfree86/os-support: axe more unused files
2006-11-02 04:32:37 +02:00
Daniel Stone
57c1409151
xfree86/os-support: remove unused file from dist
2006-11-02 04:21:06 +02:00
Daniel Stone
1d65429a9e
xfree86: don't attempt to enable and disable non-DIX devices
...
Don't try to enable and disable devices with no entry in the DIX, such as
the evdev brain.
2006-11-02 04:12:55 +02:00
Daniel Stone
18c246a13b
Merge branch 'input-hotplug'
2006-11-02 03:21:37 +02:00
Daniel Stone
ba9f5138fc
xfree86: allow starting with no input devices
...
Add a server flag (AllowEmptyInput), which will inhibit adding the
standard keyboard and mouse drivers, if there are no input devices in the
config file.
2006-11-02 03:16:10 +02:00
Daniel Stone
be291a6d97
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:15:25 +02:00
Daniel Stone
a2d6242106
kdrive:remove Change{Keyboard,Pointer}Device
...
This was removed in the DIX, so just axe it.
2006-11-02 00:46:33 +02:00
Daniel Stone
81728558a0
input: add non-keyboard bell ringing function
...
Add a generic 'ring the bell' function (console bell on Linux and BSD,
/dev/audio on Solaris), and add DDX functions for this. Make this the
core keyboard's bell.
Port Xvfb and Xnest to this.
Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris
taken from foo_io.c in the old layer.
2006-11-01 23:10:26 +02:00
Daniel Stone
3df454719f
kdrive: add KdRingBell prototype
2006-11-01 23:02:57 +02:00
Alan Coopersmith
c03311a1e7
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
2006-10-31 16:05:48 -08:00
Matthieu Herrb
645d057620
Handle building in a separate objdir
2006-10-29 18:19:56 +01:00
Matthieu Herrb
59584c375f
kill GNU-make'ism.
2006-10-29 17:49:46 +01:00
Thomas Hellstrom
06b6b971d0
Make sure we have 64-bit file-offsets in libdrm.
2006-10-29 15:22:37 +01:00
Daniel Stone
644ee2434a
kdrive: avoid null dereferences
...
Avoid jumping into NULL pointers for OS or card functions which do not
exist.
2006-10-29 03:52:11 +03:00
Daniel Stone
738d2e8817
kdrive: move bell ringing into an OS function
...
Move the bell into an OS function, and use that if it's declared; else,
fall back to using the driver's function.
Remove the Linux keyboard bell function; just move it into the OS layer.
Use named initialisers when converting the old structures, and eliminate
unused functions.
2006-10-29 03:48:02 +03:00
Daniel Stone
96e32805d1
Xi: disallow changing core keyboard and pointer
...
Just short-circuit the change core keyboard/pointer requests.
2006-10-29 03:43:34 +03:00
Thomas Hellstrom
92d04e746b
Import libdrm functions for the drm memory manager.
2006-10-27 18:26:30 +02:00
Myron Stowe
794f2e7291
xfree86: re-enable chipset-specific drivers for Linux/ia64
...
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
2006-10-26 20:38:58 +03:00
Daniel Stone
cdc8a4b7b2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-26 00:28:30 +03:00
Michel Dänzer
becbda6d51
Fix test for Option "IgnoreABI".
...
This option has plenty of potential for wasting the time of bug triagers
without pretending it's always on.
2006-10-25 11:39:27 +02:00
Keith Packard
59511974db
Merge branch 'master' into randr-1.2
2006-10-24 17:26:20 -07:00
Daniel Stone
65cd5aa4d7
kdrive/input: remove unnecessary #ifdef XINPUTs
...
Xi is now mandatory, so don't bother with the ifdefs.
2006-10-25 01:12:45 +03:00
Daniel Stone
0514d53e10
xfree86: remove motion history handling
...
Remove motion history handling, as we now deal with this in the DIX.
2006-10-25 01:10:44 +03:00
Daniel Stone
b1debebf8f
mi: remove mi motion history
...
This is now unneeded as we do motion history in the DIX.
2006-10-25 01:10:20 +03:00
Daniel Stone
b9e180e632
port all users to the new DIX motion history API
...
Port KDrive, Xvfb, and Xnest, as well as the virtual core devices, to the
new motion history API. Make GetPointerEvents also update the history.
2006-10-25 01:09:19 +03:00
Daniel Stone
2a74b8a91d
xfree86: re-bump input abi to 1.0, yet again
2006-10-25 01:04:53 +03:00
Ian Romanick
27d682fa03
Fix from HEAD accidentally reverted during merge.
2006-10-24 09:04:14 -07: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
Daniel Stone
0cd6a3d8ef
xfree86/input: add proximity support, free valuators
...
Re-add support for proximity events, and remember to both va_end our
varargs, and free our valuators.
2006-10-23 06:56:07 +03:00
Daniel Stone
a7c2d9a15d
kdrive: numerous warning fixes
2006-10-23 06:08:27 +03:00
Daniel Stone
c8f76fb3a4
xfree86/input: disallow pointer device changes, fix drag event calculation
...
Don't allow users to change the core pointer.
Fix xf86SendDragEvents to check the device button state, not the core
pointer's.
Remove unused xf86CheckButton.
2006-10-23 05:12:15 +03:00
Daniel Stone
c5b5b046e8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-23 02:58:30 +03:00
Daniel Stone
fab1d37ecb
xfree86/options: don't blindly dereference NULL pointers
...
Sure, conf_idev should be initialised, but if it's not, try to make the
best of a bad situation.
2006-10-23 02:57:00 +03:00
Daniel Stone
523fe64ba1
kdrive/lots of DDXes: make stubs use KdOsAddInputDrivers()
...
In theory, removing LinuxPciScan should make these drivers OS-independent.
2006-10-23 02:56:28 +03:00
Daniel Stone
57f98e2b72
kdrive/tslib: port to new absolute API, remove debugging
...
Port to new absolute device (not touchscreen) API, and remove some
leftover debugging.
2006-10-23 02:55:41 +03:00
Daniel Stone
a6dc629052
kdrive/os: add KdOsAddInputDrivers
...
Add KdOsAddInputDrivers, which adds all relevant input drivers.
Could possibly be refactored to KdAddInputDrivers, which called through
OsFuncs to a new function, if it existed.
2006-10-23 02:54:59 +03:00
Daniel Stone
ac240b00ff
kdrive/input: use Absolute instead of Touchscreen
...
Adjust to suit Zepheniah's new absolute device API.
2006-10-23 02:54:07 +03:00
Daniel Stone
b1ba4b3e8a
kdrive/neomagic: include vesa.h, use DebugF
2006-10-23 02:53:15 +03:00
Daniel Stone
2f33f4065d
Xnest: port to new input API
...
Port Xnest to Get{Pointer,Keyboard}Events, plus the new mieq API.
2006-10-23 02:52:35 +03:00
Daniel Stone
08928afb05
Xnest: disable XKB, reshuffle code
...
Disable XKB, as we can't yet use it; move Composite disabling to
ddxInitGlobals, along with XKB.
2006-10-23 02:51:52 +03:00
Daniel Stone
cd3b16a57e
Xvfb: port to new mieq API
2006-10-23 02:51:13 +03:00
Daniel Stone
f08b6b2367
kdrive: change DEVICE_TOUCHSCREEN to DEVICE_ABS_{CALIB,AREA}
2006-10-22 12:30:02 +03:00
Drew Parsons
948a97b97e
Minor typo fix to xorg.conf man page.
2006-10-21 23:09:22 +10:00
Zephaniah E. Hull
e26a494f41
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-10-21 04:26:14 -04:00
Zephaniah E. Hull
736b0d5078
DEVICE_TOUCHSCREEN becomes DEVICE_ABS_CALIB.
...
Update the DEVICE_ABS_CALIB stuff to include the new elements.
New DEVICE_ABS_AREA support.
dev->touchscreen becomes dev->absolute, with _CALIB and _AREA stuff in it.
Update xfree86 to compile with this, kdrive needs an update too.
2006-10-21 04:24:49 -04:00
Carl Switzky
edd5f17454
Add ast driver/device info to Xorg server & config utilities
2006-10-19 17:30:54 -07:00
Daniel Stone
aeba855b07
move keymap copy to event processing, from enqueuing
...
Move the keymap copying to event processing time (in
ProcessInputEvents), instead of being at event enqueuing time.
Break SetCore{Pointer,Keyboard} out into separate functions.
Change mieqEnqueue to take a device pointer, that asks for the
_original_ device associated with this event.
2006-10-20 00:43:11 +03: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
Joshua Baergen
c5dc997baf
Create xorg.conf.example (Gentoo bug #138623 ).
2006-10-20 00:43:10 +03:00
Alan Hourihane
85ac2f16ab
Small modification to blocking signals when switching modes.
2006-10-20 00:42:47 +03:00
Michel Dänzer
a232693c8c
Add per-drawable Xv colour key helper function.
...
This allows overlay Xv adaptors to work slightly better with compositing
managers.
Bump the video driver ABI minor so drivers only need to check for this at build
time.
2006-10-20 00:42:44 +03:00
Alan Coopersmith
5563861ab7
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
2006-10-20 00:42:07 +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
Joshua Baergen
62d2409793
Create xorg.conf.example (Gentoo bug #138623 ).
2006-10-19 11:14:26 -07:00
Zephaniah E. Hull
1b1698af41
Pass SetDeviceValuators down to the driver.
...
NOTE: This changes the LocalDeviceRec struct, which breaks input drivers.
2006-10-18 04:57:22 -04:00
Alan Hourihane
d430e76a16
Small modification to blocking signals when switching modes.
2006-10-16 12:39:05 +01:00
Daniel Stone
4ae7745a0d
xfree86 input: always open devices on NewInputDeviceRequest
2006-10-15 21:48:01 +03:00
Michel Dänzer
f9bfee5098
Add per-drawable Xv colour key helper function.
...
This allows overlay Xv adaptors to work slightly better with compositing
managers.
Bump the video driver ABI minor so drivers only need to check for this at build
time.
2006-10-15 16:55:09 +02:00
Alan Coopersmith
b9108a13fc
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
2006-10-13 19:05:28 -07:00
Daniel Stone
335b503c5e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-13 18:10:45 +03:00
Alan Hourihane
cf948b7b04
Block IO on switchmode just as we do for VT switching
...
to avoid cursor movements signalling io.
2006-10-13 14:48:10 +01:00
Matthias Hopf
1b94c117e0
Fixing probably long-standing bug in domain support.
2006-10-10 19:37:22 +02:00
Daniel Stone
ef7e05e9de
xfree86/xinput: pass first_valuator params, don't clip to first screen bound
...
Pass first_valuator to GetPointerEvents/GetKeyboardValuatorEvents.
Don't clip axis bounds to that of screen 0 when initialising axes.
2006-10-08 21:42:15 +03:00
Daniel Stone
41bb9fce47
mipointer: take device arguments, split miPointerAbsoluteCursor
...
Update mipointer API to take a device argument to (almost) all functions,
and split miPointerAbsoluteCursor into a couple of separate functions.
Remove miPointerAbsoluteCursor call from mieq, as we now deal with it in
GetPointerEvents.
Make miPointerSetPosition (successor of miPointerAbsoluteCursor) take
pointers to x and y, so it can return the clipped values.
Modify callers of miPointer*() functions to generally use the new
functions.
This should fix things with multi-head setups.
2006-10-08 20:34:32 +03:00
Daniel Stone
be8dfafd1d
warning cleanups
...
Fix still more warnings.
2006-10-08 20:32:16 +03:00
Daniel Stone
3ae4d25018
xfree86 Xinput: remove still more excessive debugging
...
There isn't any more debugging left for input events in the XFree86 DDX.
2006-10-08 16:20:42 +03:00
Daniel Stone
58314756ae
GetPointerEvents: add first_valuator parameter
...
Add a first_valuator parameter. Looks correct by inspection, but untested
with first_valuator != 0 as yet.
2006-10-08 16:18:05 +03:00
Daniel Stone
8d8e7f8bae
kdrive/input: remove excessive debugging in NIDR
2006-10-08 15:26:54 +03:00
Daniel Stone
22a836fafd
xfree86/loader: bump input major ABI version
...
Bump input major ABI version to 1.0, since we removed the OS keyboard
layer.
2006-10-07 14:16:51 +03:00
Alan Coopersmith
4c34224630
Merge branch 'XACE-modular'
2006-10-06 18:01:13 -07:00
Daniel Stone
de63a469dc
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-05 20:29:19 +03:00
Keith Packard
b4659faf9b
Merge branch 'master' into randr-1.2
2006-10-04 14:46:04 -07:00
Alan Coopersmith
8382234a7f
Update pci.ids to Tue 2006-10-03 daily snapshot
2006-10-03 17:49:48 -07:00
Alan Coopersmith
96edf7b853
Don't insert RCS tag into generated pci id header files
2006-10-03 17:48:50 -07:00
Daniel Stone
518db35ca3
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-09-29 00:35:21 +03:00
Daniel Stone
ad631afcf3
make core keyboard/pointer map functions act on all core-sending devices
...
Make Set{Keyboard,Modifier,Pointer}Mapping act on all devices which send core
events.
Change LegalModifier to accept a DeviceIntPtr.
2006-09-29 00:34:23 +03:00
Aaron Plattner
4bc5dc2854
Merge branch 'wfb'
2006-09-28 13:27:13 -07:00
Michel Dänzer
2206a92a97
Push information about cliprects of DRI windows to the DRM.
2006-09-27 10:48:49 +02:00
Michel Dänzer
54d371e7a4
Add wrapper for new ioctl to update drawable information in the DRM.
2006-09-27 10:48:41 +02:00
Daniel Stone
ad321fad4b
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-09-24 17:56:43 +03:00
Brian
f7c1d94241
Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
...
to prevent potential segfault.
2006-09-23 10:38:10 -06:00
Brian
945b7c6394
The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
...
Otherwise, Xdmx generates a slew of protocol errors.
2006-09-23 10:35:25 -06:00
Brian
891e9c3e6c
Replace broken DMXDBG3() with DMXDBG2()
2006-09-23 10:28:24 -06:00
David Nusinow
a10039a100
Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.
2006-09-21 23:58:32 -04:00
Aaron Plattner
c1655f0fd4
Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.
2006-09-21 14:45:17 -07:00
Drew Parsons
8b4ed47c5d
* Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
...
* Removing outdated references to CDE and dt, rename script to
92xprint-xpserverlist.
2006-09-21 22:19:44 +10:00
Donnie Berkholz
d812f486a0
Really fix sparc on 64-bit kernel/32-bit userland.
...
Commit b3a3020fd0
used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
2006-09-20 15:39:39 -07:00
Keith Packard
2be1ac15ae
Remove smashing of CFLAGS from server build.
...
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
2006-09-18 12:11:18 -07:00
Adam Jackson
f057de4f73
Don't install librac.a.
...
Thanks, automake.
2006-09-16 03:49:11 -04:00
Eamon Walsh
49a70c8570
Merge branch 'master' into my-XACE-modular
2006-09-15 15:26:57 -04:00
Adam Jackson
46af6d1e95
Always believe the monitor when it reports a reduced-blanking mode.
...
CVT reduced blanking modes are typically only seen on digital connections to
LCDs, but there are some monitors that report them as supported over the
VGA connector too, which is perfectly legitimate, electrically speaking.
2006-09-14 19:28:44 -04:00
Adam Jackson
63acf18b7e
In xf86MatchPciInstances, fail gracefully when there's no PCI device at all.
...
This allows the autoconfig logic to fall through sanely on non-PCI machines,
which importantly includes Xen virtual machines.
2006-09-14 19:26:37 -04:00
Adam Jackson
a8f9936f55
Prefer driver-provided modes when matching name strings to modelines.
...
Well, kinda. Strictly we prefer M_T_BUILTIN strongest since those are modes
where the driver has said it absolutely can't do anything else (VBE). Then
we look for user-defined modes, ie, modelines from the config file. Then
we consider modes reported by the monitor via EDID. Finally if nothing has
matched yet we consider the default mode pool.
Within each of the above-mentioned classes, modes with the M_T_PREFERRED bit
take priority over other modes in the same class.
This logic ensures that the timings sent to the monitor exactly match the
timings it reported as supported, which occasionally don't match the numbers
you might get for that mode from CVT or GTF.
2006-09-14 19:24:41 -04:00
Adam Jackson
81ef1b6d60
Mark EDID modes as driver modes. Infer virtual size from driver modes.
...
This allows the server to guess an appropriate initial virtual size and
resolution. The heuristic is to select the largest driver-reported mode
that matches the monitor's physical aspect ratio. We revalidate this
estimate after mode validation, since we may have filtered away all
modes that would fill that size.
Also, the EDID preferred timing is now marked as M_T_PREFERRED as well.
2006-09-14 19:18:58 -04:00
Adam Jackson
43d9edd31e
Attempt to add the 'mouse' driver in more situations.
...
Always add a mouse driver instance configured to send core events, unless
a core pointer already exists using either the mouse or void drivers. This
handles the laptop case where the config file only specifies, say,
synaptics, which causes the touchpad to work but not the pointing stick.
We don't double-instantiate the mouse driver to avoid the mouse moving twice
as fast, and we skip this logic when the user asked for a void core pointer
since that probably means they want to run with no pointer at all.
2006-09-14 19:09:02 -04:00
Adam Jackson
739224d05e
Load the default module set when no Module section is given in the config.
...
Also, synchronize that list with the list for the pseudoconfig file used
when starting with no config file. These really need to be better unified.
2006-09-14 19:03:32 -04:00
Adam Jackson
beac2bf1e4
Expand the default sync ranges to be large enough for 800x600@60.
2006-09-14 19:01:13 -04:00
Adam Jackson
71a15a7d57
Publish the raw EDID block as a property on the root window.
...
This was removed in the patch for bug #5386 , but is still useful.
2006-09-14 19:00:10 -04:00
Adam Jackson
7939c8dfb7
Bump the default pixel depth to 24, and default bpp to 32.
2006-09-14 18:57:57 -04:00
Adam Jackson
72af975f9c
Fix up EDID blocks where the max pixclock exceeds the preferred mode clock.
...
Base EDID only lets you specify the maximum dotclock in tens of MHz, which
is too fuzzy for some monitors. 1600x1200@60 is just over 160MHz, but if
the monitor really can't handle any mode at 170MHz, then 160 is more
correct. Fix up the EDID block before the driver can see it in this case,
so we don't spuriously reject modes.
2006-09-14 18:56:34 -04:00
Adam Jackson
334f7db9f6
Allow hsync and vsync ranges to be overridden independently again.
2006-09-14 18:46:10 -04:00
Adam Jackson
ced46e1777
Record all standard timings from EDID as modes, instead of just the first five.
2006-09-14 18:41:59 -04:00
Adam Jackson
d89fee68d0
Record the maximum dot clock of the monitor, and filter by it.
2006-09-14 18:41:15 -04:00
Adam Jackson
fa8ef71668
Don't translate monitor gamma to X gamma.
...
The X gamma is used to set the output ramp of the card. Setting a 2.2 output
gamma going into a 2.2 monitor gives an effective gamma of 4.84, which is
very much not what you want.
2006-09-14 18:33:00 -04:00
Luc Verhaegen
511c60bc73
Bug #5386 : Synthesize modelines from EDID data.
2006-09-14 18:30:36 -04:00
Bill Nottingham
0a62840e2c
Bug 7641: fix comment written to Xorg.conf (s/VertSync/VertRefresh/)
...
X.Org Bugzilla #7641 <https://bugs.freedesktop.org/show_bug.cgi?id=7641 >
Patch #6349 <https://bugs.freedesktop.org/attachment.cgi?id=6349 >
2006-09-13 15:40:23 -07:00
Drew Parsons
182e5e0f4b
Xprint: revert installation of /etc/X11/Xsession.d/cde_xsessiond_xprint.sh
...
pending resolution of #8232 .
2006-09-12 14:30:46 +10:00
Donnie Berkholz
2b357e9a2f
If we're installing libxf86config, install headers needed to build against it.
2006-09-10 22:17:20 -07:00
Jesse Barnes
b3a3020fd0
the new PCI mapping routines are broken on sparc64 (in fact they look
...
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now. the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
2006-09-10 11:13:18 -07:00
Drew Parsons
65256109bb
* Define XPSERVERLIST with /etc/init.d/xprint get_xpserverlist
...
instead of `/bin/sh /etc/init.d/xprint get_xpserverlist`
- allows the initscript to set its own different shell under #!
- allows disabling of XPSERVERLIST by making the script non-executable
* Allow files to be installed by using dist_*_DATA instead of EXTRA_DIST.
Also, use dist_*_SCRIPTS to install scripts.
* Fix minor typos in man pages.
2006-09-10 17:40:37 +10:00
Daniel Stone
5e9d33fe87
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-09-07 15:43:31 +03:00
Michel Dänzer
8356be492c
Make sure _XSERVER64 is defined when it should be and gets tested.
2006-09-06 15:20:55 +02:00
Eamon Walsh
0b81fccd2e
Merge branch 'master' into my-XACE-modular
...
Conflicts:
configure.ac
2006-09-05 18:03:25 -04:00
Matthew Allum
69d5becce4
Fix previous commit breaking other kdrives pulling in fbdev.a
2006-08-31 17:30:24 +01:00
Matthew Allum
fd609956f2
Add framebuffer device command line switch for Xfbdev
2006-08-31 17:18:57 +01:00
Matthew Allum
5ddbf4bcd4
Re-add support for tslib (1.0 release) and Xcalibrate extension.
2006-08-29 22:07:15 +01:00
Daniel Stone
393dc0a338
kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES
2006-08-29 22:53:54 +03:00
Daniel Stone
89d272bb18
[PATCH] kdrive/linux keyboard: remove more debugging spew
2006-08-29 15:18:25 +03:00
Daniel Stone
bd6f539ff9
[PATCH] kdrive/linux keyboard: silence excessive debugging noise
2006-08-29 15:18:23 +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
Daniel Stone
d6f36bd280
xfree86/parser: use 'kbd' driver when 'keyboard' specified
...
Now that we've completely ditched the old driver, we should probably make a
best-effort attempt to keep configs working.
2006-08-25 12:43:17 +03:00
Daniel Stone
393f8347ed
xorgconf.cpp: kbd, not keyboard
2006-08-25 10:46:32 +03:00
Daniel Stone
3a36b0a24a
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-24 23:35:28 +03:00
Adam Jackson
b879356ce9
More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER.
2006-08-24 15:50:15 -04:00
Matthias Hopf
4ed311cf1c
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
2006-08-24 20:17:10 +02:00
Alan Hourihane
ce4a0a4dda
Apply patch in bug #7919 , blit improvements in
...
multiwindow mode for Xming/CygwinX
2006-08-24 13:56:22 +01: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
Adam Jackson
bdec9680fa
Make sure Composite is never enabled for Xnest.
2006-08-23 14:43:23 -04:00
Adam Jackson
9f2a108051
Make 'Xvfb -render' also disable Composite, lest we segfault on startup.
2006-08-23 14:38:34 -04:00
Eamon Walsh
52ba722e4c
Merge branch 'XACE-modular' into my-XACE-modular
2006-08-21 18:49:31 -04:00
Alan Coopersmith
05541259bd
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-21 13:07:41 -07:00
Daniel Stone
1c2cb30cd8
Merge branch 'origin' into input-hotplug
2006-08-18 17:05:50 +03:00
Alan Hourihane
70ddd0f39d
Fix bug #5735 , Serious flaw in CygwinX clipboard
...
integration prevents paste from X to Windows apps
(Brett Stahlman & Colin Harrison)
2006-08-18 14:43:10 +01:00
Alan Hourihane
708b225689
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-08-18 09:13:52 +01:00
Alan Hourihane
1880defe4e
Fix bug #7281 , clipboard viewer should not
...
call SetClipboard viewer when bogus in Xming/CygwinX
(Colin Harrison)
2006-08-18 09:09:53 +01:00
Alan Hourihane
a1a8e4f7f5
Fix bug #7280 , round title corner background
...
should be transparent not black in Xming/CygwinX
(Colin Harrison)
2006-08-18 09:08:12 +01:00
Adam Jackson
ee5e2cbd2b
Un-cut-and-paste the mode rejection message.
2006-08-17 17:29:32 -04:00
Adam Jackson
43e42eef1f
Fix default mouse device on Linux, again.
...
It would be really nice if we only did this in one place instead of 40.
2006-08-17 16:22:07 -04:00
Daniel Stone
f9624e0109
kdrive/input: verify SIGIO with --enable-debug
2006-08-17 16:09:51 +03:00
Matthias Hopf
73e58adda9
Fixed segfault w/ broken Xinerama configs.
2006-08-16 18:18:51 +02:00
Daniel Stone
5d073697ad
kdrive/input: minor warning cleanups
...
And also a compiler error fix when VERIFY_SIGIO is defined.
2006-08-15 15:37:10 +03:00
Daniel Stone
47c1c948e6
kdrive/input: only run special key behaviours on non-XKB
...
Only attempt to manually deal with special key behaviours (e.g. terminating
the server) when not using XKB, and leave locking behaviour up to GKVE.
2006-08-15 15:25:16 +03:00
Daniel Stone
d6433be3cc
Merge branch 'master' into input-hotplug
2006-08-12 21:50:52 +03:00
Bastian Blank
f7919c2879
xfree86: don't do legacy IO on ARM or S/390 (Debian #362641 )
...
Don't attempt to poke legacy IO ranges on ARM or S/390.
2006-08-12 20:43:25 +03:00
Daniel Stone
59dcc62906
xfree86: remove Xqueue support completely
2006-08-12 20:39:08 +03:00
Samuel Thibault
e641000b98
xfree86: add Hurd support ( #5613 )
...
Add support for GNU/Hurd.
2006-08-12 19:41:59 +03:00
Daniel Stone
26c3cd1c9e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-12 18:58:18 +03:00
Daniel Stone
008aa7eb6e
completely remove OS keyboard layer
...
Completely axe the keyboard layer from os-support.
2006-08-12 18:56:05 +03:00
Adam Jackson
c4951e0a6b
Fix a mode sanity check to not break reduced-blanking setups (LCDs).
2006-08-10 20:49:06 -04:00
Adam Jackson
e1921f014b
Rename some mode tokens to better reflect their use.
...
Per #5386 , M_T_EDID -> M_T_DRIVER, since it's really for any driver-detected
mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set.
2006-08-10 20:43:15 -04:00
Alan Coopersmith
c2535f6792
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-10 10:37:59 -07:00
Ian Romanick
1a5561c4ec
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-08-10 10:20:37 -07:00
Daniel Stone
cec284f2b3
kdrive: properly ifdef composite enabling
2006-08-10 18:03:58 +03:00
Daniel Stone
172d45b9b7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-10 14:14:54 +03:00
Daniel Stone
539d1f3347
GKVE/GPE: have DDX allocate events
...
Don't allocate events on every GKE/GKVE/GPE call, just have the DDX manage
it instead. Introduce GetMaximumEventsNum(), which is the maximum number
of events these functions will ever produce.
2006-08-10 14:00:14 +03:00
Adam Jackson
db82e12fac
Remove TargetRefresh option from the autoconfig logic.
...
The default target of 75Hz is almost always wrong for LCDs.
2006-08-09 14:55:17 -04:00
Daniel Stone
4be9abb850
kdrive: remove ddx_DEPENDENCIES
...
Remove foo_DEPENDENCIES as they weren't guaranteed to just be libs,
and loader arguments (-lfoo, -Lfoo) might've crept in.
2006-08-09 07:20:16 +03:00
Ian Romanick
190f229ed7
Make xf86PciVideoInfo static since it is only used within this file.
...
Dummy out all of the PCI bus and device access control functions. We
need a better way to do this, and that will probably be in
libpciaccess and / or the kernel.
Refactor xf86GetPciInfoForEntity to use pci_device_find_by_slot.
Refector xf86CheckPciSlot to use xf86GetPciEntity.
Eliminate disablePciBios and the one place that calls it.
2006-08-08 16:47:32 -07:00
Ian Romanick
5508f7646f
Remove prototypes from some functions that were previously removed.
2006-08-08 16:43:31 -07:00
Ian Romanick
9df53d903e
Rename xf86ReadDomainMemory to xf86ReadLegacyVideoBIOS, since that's
...
what it is actually used for. Modify a few routines in linuxPci.c to
take pci_device structures as parameters in stead of PCITAGs.
2006-08-08 16:42:23 -07:00
Daniel Stone
3108981631
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-08 12:01:12 +03:00
Tiago Vignatti
ab3ebfefdb
xorgcfg: fix compilation error
...
Add missing parentheses to IS_KBDDRIV macros.
2006-08-08 12:00:34 +03:00
Daniel Stone
12dbd8a02f
remove optional R3 backwards compatibility
...
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
2006-08-07 23:43:40 +03:00
Daniel Stone
bedc4ecf23
xephyr: aid input debugging
...
Add the 'ephyr' mouse and keyboard drivers to the driver list so we can
re-add devices.
Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput.
2006-08-07 23:00:45 +03:00
Daniel Stone
baf93b3abe
kdrive: move map initialisation to KdNewPointer
...
Do a linear n -> n initialisation on the map up until KD_MAX_BUTTON in
KdNewPointer, moving it out of both KdParsePointer, and KdPointerProc.
Also remove dead pointer acceleration code.
2006-08-07 21:12:45 +03:00
Daniel Stone
ccb53340b6
ephyr: cleanup
...
Remove extraneous KdAddPointerDriver call.
2006-08-07 21:12:00 +03:00
Daniel Stone
9b7ecbd1dd
kdrive: prevent overrun in map
...
We actually need n + 1 elements for the mouse button map, not n.
2006-08-07 21:09:32 +03:00
Daniel Stone
eb6e8d4042
kdrive: increase maximum number of buttons
...
Increase KD_MAX_BUTTONS to 32.
2006-08-07 21:05:37 +03:00
Daniel Stone
afcad4ad99
xfree86 ddx: always free GKE/GPE events
...
free() events we get passed back from GKE and GPE so we don't just, er,
leak them all. *cough*.
2006-08-07 18:11:05 +03:00
Daniel Stone
98fdf874ee
move all autorepeat logic to DIX
...
Move core autorepeat logic for keyboards down to the DIX, remove it from
KDrive.
2006-08-07 16:51:39 +03:00
Daniel Stone
c85e64cba1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-07 15:54:55 +03:00
David Nusinow
f54b71b772
Document enable/disable flag for AIGLX in xorg.conf manpage.
2006-08-06 18:11:00 +00:00
Daniel Stone
997ba45b19
fix incorrect button test
...
Test for n (1..nButtons) being under nButtons, not button (1..(1<<nButtons)).
2006-08-04 11:18:16 +03:00
Eamon Walsh
9138d5a51e
Make SecurityLookupIDBy* part of the base functionality.
2006-08-03 18:24:04 -04: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
5bfb2ee965
Remove the last remants of the pci{Read,Write}{Long,Word,Byte}
...
functionality. This also allows the removal of PCI_CPU, PCI_CPU16,
and a few other dangling bits of cruft.
2006-08-02 13:29:21 -07:00
Ian Romanick
a0f2e1cae4
Move xf86FindPciDeviceVendor and xf86FindPciClass from xf86pciBus.c to
...
xf86int10.c. Refactor common code from those functions to do_find.
2006-08-02 10:54:41 -07:00
Ian Romanick
de8234606f
Modify xf86FindPciDeviceVendor and xf86FindPciClass to use the
...
pci_interator interface instead of the xf86PciVideoInfo array.
2006-08-02 10:44:11 -07:00
Ian Romanick
23f44df900
Remove pciConfigPtr and all of the associated cruft.
2006-08-02 09:55:32 -07:00
Ian Romanick
966ebd3d2d
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-08-02 08:14:58 -07:00
Matthew Allum
39169fd373
Back out 'mystery' spurious host window hints.
2006-08-01 13:39:22 +01:00
Eamon Walsh
f737cc38ba
Adding devPrivates support to the ExtensionEntry structure.
2006-07-31 19:58:42 -04:00
Ian Romanick
a94176627c
Eliminate all uses of the businfo field of pciDevice / pciConfigPtr.
2006-07-31 14:33:58 -07:00
Ian Romanick
26c9587f90
Build fixes for last pull from HEAD.
2006-07-31 13:54:36 -07:00
Ian Romanick
65dc25d8f8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-31 12:30:30 -07:00
Ian Romanick
3112a6c4f2
Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
...
is actually used.
2006-07-31 10:25:31 -07:00
Ian Romanick
69533fc04f
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
2006-07-31 09:26:04 -07:00
Daniel Stone
24051ef974
remove filename that's too long for tar
2006-07-30 12:15:33 +03:00
Daniel Stone
ecb7d43a76
add sym.h to sources
2006-07-30 11:52:41 +03:00
Daniel Stone
e87e68634d
remove .cvsignores from EXTRA_DIST
2006-07-30 11:11:59 +03:00
Daniel Stone
a68dc013a3
remove README (which doesn't exist) from EXTRA_DIST
2006-07-30 11:08:47 +03:00
Daniel Stone
87fe85f38b
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-30 10:51:34 +03:00
Luc Verhaegen
79016d4036
Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
...
export it from the X server to modules.
2006-07-28 16:02:02 -04:00
Aaron Plattner
e6ae1612be
Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server.
2006-07-27 18:24:59 -07:00
Adam Jackson
2a4ceb09ed
Remove dead function prototypes.
2006-07-26 19:39:17 -04:00
Adam Jackson
990a400905
Remove getconfig horrorshow. Replace with a static built-in rule list for now.
2006-07-26 19:03:39 -04:00
Aaron Plattner
7608a63ff7
Build infrastructure for libwfb.so.
...
Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la. Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la. Use the
macro on [w]fbModuleData so the new module loads.
2006-07-26 15:48:50 -07:00
Adam Jackson
39158e98ac
Remove another latent PowerMAX hunk.
...
All your favorite running jokes of 2005, today!
2006-07-26 18:39:28 -04:00
Ian Romanick
ef1aecaaf6
Pass correct pointer to xf86MapLegacyIO.
2006-07-26 13:25:13 -07:00
Daniel Stone
3518e2d0de
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-26 11:29:21 +03:00
Daniel Stone
eb7733a48a
kdrive: drop excessive NewInputDeviceRequest debugging
2006-07-26 11:28:45 +03:00
Kristian Høgsberg
3821f6aeaa
Unlibc-wrap DMX glxscreens.c and fix tag-removal typo.
2006-07-26 01:56:02 -04:00
Ian Romanick
28ba8d5691
Gut anything having to do with the PciBusPtr (or PciBusRec) type.
...
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
2006-07-25 15:38:09 -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
4ea475924c
re-add OpenedHand copyright
...
Ae-add OpenedHand copyright, accidentally dropped in KDrive new world
order patch. Sorry guys.
2006-07-25 20:00:48 +03:00
Ian Romanick
82f6b7e75e
Don't re-look-up pointers that are already stored in structures.
2006-07-24 13:52:58 -07:00
Ian Romanick
2fd6b995ff
Global s/xf86MapDomainIO/xf86MapLegacyIO/. Let's call a duck a duck,
...
okay? Since xf86MapLegacyIO is called from only one place, cut the
parameter list down to the one parameter that actually conveys some
information: the one that gives a PCI device. Change from using a
PCITAG to a pci_device.
2006-07-24 13:33:34 -07:00
Ian Romanick
aed6fe0bb1
Refactor linuxGetSizesStruct to take a pci_device pointer instead of a
...
PCITAG. Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to call
linuxGetSizesStruct directly with a pci_device pointer. Remove
linuxGetSizes.
2006-07-24 13:13:05 -07:00
Ian Romanick
e487627992
Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the
...
libpciaccess interfaces.
2006-07-24 12:23:23 -07:00
Ian Romanick
4b474cbc1a
The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS
...
are identical. Just have one call the other.
2006-07-24 12:17:27 -07:00
Ian Romanick
7dff8d98a9
Remove source files that have been dead since day-1 of this branch.
2006-07-24 11:56:37 -07:00
Ian Romanick
eb95128f61
Changes that were missed on the previous commit. Perhaps oddness
...
caused by doing git-update-index at the wrong time.
2006-07-24 11:53:37 -07:00
Ian Romanick
05f8b772ae
ScanPciDisplayPCICardInfo now uses pci_device interface for PCI
...
scanning. Log messages simplified to make the code shorter and less
convoluted. ScanPciDisplayPCICardInfo is now void since it was only
called from one place with a constant parameter.
2006-07-24 11:23:03 -07:00
Daniel Stone
ca3f4fc1b0
add fallback ChangeDeviceControl, allow XOpenDevice on closed device
...
Add a fallback ChangeDeviceControl, which allows the attributes we know about
so far.
Allow XOpenDevice on closed devices.
2006-07-23 19:02:12 -04:00
Daniel Stone
a73cef1f00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-22 12:07:22 -04:00
Adam Jackson
70869fc677
Yet more dead code.
2006-07-21 23:39:37 -04:00
Adam Jackson
7c1b2ee7a8
static markup, more dead code.
2006-07-21 23:35:13 -04:00
Adam Jackson
1c4f90b1d0
Open-coded path checks make baby Jesus cry.
2006-07-21 23:03:21 -04:00
Adam Jackson
114264584c
Remove a useless open() of the module we're about to load.
2006-07-21 22:55:41 -04:00
Ian Romanick
525257eb98
Fix stupid typos.
2006-07-21 19:16:38 -07:00
Daniel Stone
672ca156bf
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:58:42 -04:00
Daniel Stone
6cf844ab69
loader: walk directory paths with readdir(), don't stat() everything
...
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
2006-07-21 19:58:15 -04:00
Daniel Stone
d14d91f094
loader: walk directory paths with readdir(), don't stat() everything
...
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
2006-07-21 19:57:28 -04:00
Ian Romanick
e18d34f423
Make the various implementations of xf86ExtendedInitInt10 use the
...
libpciaccess interfaces. This eliminates all calls to mapPciRom,
which in turn allows the elimination of hw/xfree86/int10/pci.c.
2006-07-21 16:47:45 -07:00
Daniel Stone
b73fb2ae35
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:30:26 -04:00
Daniel Stone
e7ac27ad81
revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c
...
Thinko'd which file to remove after merging from master.
2006-07-21 19:29:28 -04:00
Daniel Stone
81913a1291
remove undead files from master
...
Remove dead files which worked their way back in when merging from master.
Ugh.
2006-07-21 19:10:26 -04: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
Daniel Stone
1d31ed7782
xephyr: load keysyms at init, not enable
...
Load keysyms at init time, not enable, so we don't get the wrong map width.
2006-07-21 19:02:52 -04:00
Adam Jackson
63dfaa1d5b
Delete internal usage of the symbol ref/req lists.
2006-07-21 18:47:18 -04:00
Adam Jackson
bca9364f3f
Remove the loader's required and referenced symbol lists, dead code.
2006-07-21 18:41:46 -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
aff404f293
Detach xf4bpp from cfb.
2006-07-21 18:24:37 -04:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Aaron Plattner
eeaad0e956
Fix the RandR failure path for rotated screens.
2006-07-21 15:20:40 -07:00
Ian Romanick
22db3fdb54
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-07-21 13:55:37 -07: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
7711c56d2e
xephyr: fix keymap, pointer; dix: fix multiple axes
...
Initialise our axes properly in the DIX, and make sure we don't
unnecessarily clip maxval when it's not set.
Fix keymap copying in Xephyr (to some degree: it's still broken),
and set nAxes and nButtons properly.
2006-07-21 15:19:54 -04:00
Daniel Stone
f18c3122a5
sanitise debug output
...
Don't spit out huge chunks of pointless ephemera, especially without
--enable-debug.
2006-07-21 15:19:54 -04:00
Daniel Stone
463e0fe35b
update KDrive to new input API
...
Update KDrive to fit the new API (mieqInit and InitPointerDeviceStruct), and
include InitTouchscreenDeviceStruct in the DIX.
2006-07-21 15:19:54 -04:00
Daniel Stone
02d0910511
new KDrive input world order
...
Convert KDrive to GPE/GKE interface.
Add first-class drivers and enumerate every device separately through
Xi, instead of lamely attempting to aggregate them.
Add XKB support to the Linux keyboard driver.
Add 'thumb button' support to the tslib driver.
Rejig InitInput, so each DDX has to add a list of drivers it supports.
Support NewInputDeviceRequest, et al.
2006-07-21 15:19:51 -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
27df2eda79
fix KdXvCopyPackedData to actually work
...
Remove extraneous bit shift in KdXvCopyPackedData, so it's actually
useful.
2006-07-21 15:17:35 -04:00
Ian Romanick
2f98841fde
Remove unused variable.
2006-07-20 16:08:27 -07:00
Adam Jackson
985c34bf06
Remove the DDXTIME conditional, for being unused.
2006-07-20 17:33:13 -04:00
Ian Romanick
c69c00d652
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-07-20 12:08:38 -07: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
Adam Jackson
881953813c
Fix the Linux ACPI reopen code to use a repeating timer, rather than a
...
one-shot sleep-and-reopen attempt.
2006-07-17 13:50:38 -04:00
Kristian Høgsberg
f029e9a32d
Un-glx-libcwrap DMX GLX proxy so it works without GL/include.
2006-07-15 22:06:35 -04:00
Ian Romanick
46369350d4
Add some const qualifiers to serveral function parameters.
2006-07-14 15:51:55 -07:00
Ian Romanick
490fb30459
Rearrange code in xf86int10ParseBiosLocation to use strncasecmp. This
...
eliminates the need for the first use of xstrdup in this function.
The second use of xstrdup was *never* necessary and has also been
eliminated.
2006-07-14 15:26:56 -07:00
Ian Romanick
d3ee49bcba
Refactor common code from the generic.c and linux.c version of
...
xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.
These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation.
2006-07-14 15:13:35 -07:00
Ian Romanick
8793c7fd4b
Refactor identical xf86InitInt10 function from generic.c and linux.c
...
to helper_exec.c.
2006-07-14 09:11:39 -07:00
Ian Romanick
1450fd5964
Trivial refactor of libint10_la_SOURCES.
2006-07-14 09:10:32 -07:00
Ian Romanick
18624a9b7c
Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
2006-07-13 21:10:48 -07:00
Ian Romanick
12595a77d6
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-13 12:48:03 -07:00
James Steven Supancic III
4c225a3a8b
Bug #7482 : Fix Xdmx's Render code to match reality; fixes BadLength client
...
crashes.
2006-07-13 10:03:57 -04:00
Matthieu Herrb
2194d99d9c
Replace GNU make-ism.
2006-07-09 16:16:08 +02:00
Matthew Allum
90a9b82272
Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc )
2006-07-08 21:57:07 +01:00
Matthew Allum
21e3e3ca29
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-07-08 21:13:52 +01:00
Matthew Allum
e805621894
Add support to Xephyr for simulating 8bit grayscale.
2006-07-08 21:10:58 +01:00
Tilman Sauerbeck
39b2f7b218
Bug #3042 : Use autoconf to get the correct name of a struct member.
...
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
2006-07-08 19:55:53 +02:00
Tilman Sauerbeck
63f13e01ee
Bug #7097 : do case-insensitive comparison for some hotkeys.
...
xkb's strcasecmp implementation has been moved to the dix so it's now
safe to just use strcasecmp().
2006-07-08 11:33:44 +02:00
Ed Catmur
2152e2d364
Remove hardcoded 'lib' in XPRINTDIR.
2006-07-06 17:45:36 -07:00
Ed Catmur
233c004641
Generate xprint.pre from xprint.cpp.
2006-07-06 17:41:53 -07:00
Adam Jackson
b3e4d1d1f4
PPC64 build fix.
2006-07-06 18:51:29 -04:00
Adam Jackson
d7a96dd6f1
Switch the default mouse device on Linux to /dev/input/mice.
2006-07-06 17:39:14 -04:00
Ian Romanick
37838de62e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
2006-07-06 13:01:57 -07:00
Ian Romanick
8d07ee070e
Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
...
optimization in the search loop.
2006-07-06 12:48:51 -07:00
Adam Jackson
704e645207
Remind dlloader that it needs to search the global scope as well as the
...
loaded modules. Fixes LoaderSymbol() on symbols provided by the server.
Spotted by Aaron Plattner.
2006-07-06 14:22:33 -04:00
Ian Romanick
e66e7b48e1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-05 15:21:36 -07:00
Greg Kroah-Hartman
863f5cc31b
fix compiler warning in hw/xfree86/common/xf86Config.c
2006-07-05 13:26:34 -07:00
Greg Kroah-Hartman
f059b61ab3
fix compiler warning about xnestRecolorCursor() not being defined
2006-07-05 11:47:25 -07:00
Greg Kroah-Hartman
cc3e99f747
fix some more compiler warnings due to defines being declared differently
2006-07-05 10:13:19 -07:00
Greg Kroah-Hartman
59836c0f2a
fix wrong function pointer type in hw/dmx/dmxcmap.c
2006-07-05 09:30:48 -07:00
Eric Anholt
002e28c12c
Correct AGP memory deallocation argument on *BSD.
...
This fixes leaks and eventual crashes with RandR resizing on Intel.
2006-07-03 12:48:12 -07:00
Eric Anholt
7106a77df3
Fix bugs in support for new repeatTypes in XAA and EXA.
...
EXA now won't pass pictures with new repeatTypes to drivers. We can add a flag
for them to support it at a later time.
2006-07-03 16:41:44 +02:00
Rudo Thomas
50a3e1ad18
Missing close parenthesis in one of the setuid() fixes.
2006-07-01 12:34:36 -07:00
Keith Packard
124a81eb38
Merge branch 'origin'
2006-07-01 11:12:50 -07:00
Paul Mackerras
d3d6c5f4d0
Bug #7381 : Coordinates get wrapped in accelerated line drawing on pixmap
...
XAAPolylinesWideSolid was adding the drawable origin onto each element in the
pPts array. Since the values got stored back into the pPts array, they got
truncated to 16 bits, causing the overflow I saw. This patch avoids storing
the coords back into the pPts array (and actually reduces the size of the
code too :). Now the 32-bit sum of coords + origin doesn't get truncated to
16 bits, and the problem is solved.
2006-07-01 11:10:18 -07:00
Jens Granseuer
179737d4a0
Bug 7145: fix build with gcc 2.95 & other c89 compilers
...
Move variable declarations to start of blocks as required by c89
2006-06-30 15:56:40 -07:00
Ian Romanick
a9d4842893
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-06-30 11:49:29 -07:00
Martin Bochnig
6bd4c25439
Updated Solaris aperture driver to build on sun4v & amd64 kernels
...
Updated for Solaris 10 changes to DDI
2006-06-29 16:25:36 -07:00
Ian Romanick
7c4e540253
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-06-26 14:39:44 -07:00
Michel Dänzer
36756fdb2d
Make sure <execinfo.h> is actually included when needed.
...
configure only defines HAVE_BACKTRACE, not HAVE_EXECINFO_H.
This could cause problems on platforms where the size of a pointer is greater
than that of an integer, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363218 .
2006-06-24 15:09:24 +02:00
Michel Dänzer
4426215a6e
Bug #7213 : Fix the XFree86-DRI extension for byte-swapped clients.
...
These clients are by definition non-local and thus not direct rendering
capable, but they still need the QueryVersion and QueryDirectRenderingCapable
requests to find out cleanly.
2006-06-24 15:02:56 +02:00
Eric Anholt
bc6cfde198
Use correct OSNAME setting so we can find os-specific modules like libdrm.
2006-06-23 20:07:34 -07:00
Eric Anholt
2cf1f39ca9
Add a manpage for EXA.
2006-06-23 13:56:20 -07:00
Ian Romanick
9d0a15dca5
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
hw/xfree86/loader/xf86sym.c
2006-06-22 16:21:10 -07:00
Alan Coopersmith
c0cb8d1fb8
Use XACE, not XCSECURITY to decide if SecurityLookup* are exported
2006-06-21 18:12:41 -07:00
Alan Coopersmith
3177dc498a
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-21 18:06:06 -07:00
Adam Jackson
d8135eb9e4
Unbreak unbreaking the loader. Re-add the symbol reference lists so that the
...
linker will include everything it's supposed to. This is a terrible solution,
but ld semantics don't let you do anything better.
2006-06-21 20:49:21 -04:00
Alan Coopersmith
90af38fa0c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
2006-06-21 16:23:31 -07:00
Ian Romanick
aa131c51e0
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-21 14:39:52 -07:00
Ian Romanick
1708b0c7d9
Eliminate "ugly" spaces around parenthesis. Add const qualifier.
...
General code clean-ups.
2006-06-21 14:39:39 -07:00
Ian Romanick
a3c26d01a1
Move declaration of "j" inside #ifdef block where it is used to
...
eliminate compiler warning.
2006-06-21 14:38:07 -07:00
Greg Kroah-Hartman
77aa701e89
add some function prototypes to hw/xprint/DiPrint.h as they are exported
2006-06-21 14:16:48 -07:00
Matthias Hopf
ea5e0eabd1
Bug 4320: Fastpath corner case improvement for Composite.
2006-06-21 17:08:55 +02:00
Alan Coopersmith
a46c06dab8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57
Move Xserver API for security extension to securitysrv.h
2006-06-20 18:22:51 -07: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
Alan Coopersmith
88ede2cec7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-20 15:29:55 -07:00
Ian Romanick
1f91b5726c
Fix a compiler warning about varibles being used without being set.
...
Add some const qualifiers.
Remove some "ugly" space around parenthesis.
2006-06-20 15:03:13 -07:00
Matthieu Herrb
2b58685402
Check setuid() return value. Bugzilla #7116 .
2006-06-20 21:07:53 +02:00
Alan Coopersmith
0707eb33d6
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-19 17:09:51 -07:00
Eamon Walsh
8d9ccc90a5
Add XACE extension
...
(partially cherry picked from 8d4f21ab53
commit)
2006-06-19 16:35:03 -07:00
Greg Kroah-Hartman
d97a21acb8
fix compiler warnings in hw/xfree86/i2c/fi1236.c
2006-06-19 14:36:54 -07:00
Greg Kroah-Hartman
29c78321e8
fix compiler warning in hw/xfree86/i2c/tda9850.c
2006-06-19 14:36:41 -07:00
Greg Kroah-Hartman
9f2793551f
fix compiler warning in hw/vfb/InitOutput.c
2006-06-19 11:50:47 -07:00
Greg Kroah-Hartman
b20ae5ddb7
fix compiler warnings in hw/xfree86/xf4bpp/ppcGC.c
2006-06-19 11:38:52 -07:00
Adam Jackson
a28652f9c3
Another round of loader sense-beating. Remove the (unused) server export
...
lists, a really bad hash table, the last vestiges of the other backends,
and some miscellaneous cleanups. Good for dropping 300k from the size of
the built server on x86.
2006-06-19 00:57:18 -04:00
Adam Jackson
98a602fab1
Don't bother building RAC as a module, that's just absurd.
2006-06-18 23:54:04 -04:00
Eric Anholt
76aaf7eae7
Add a couple of (doxygen) comments I wrote while looking at modesetting.
2006-06-18 19:47:51 -07:00
Eric Anholt
6aaf0e5b58
Add options to disable EXA acceleration for Composite/UTS/DFS, and always print
...
out how much memory EXA is managing for offscreen pixmaps.
2006-06-18 19:47:51 -07:00
Eric Anholt
21ef7e17ef
Add some missing .gitignore stuff for Mesa symlinks and other generated files.
2006-06-18 19:47:51 -07:00
Adam Jackson
71fbda8049
Xprint/ -> hw/xprint
...
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
Eric Anholt
868e2cab70
Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries
...
(such as libcw.la) that we link into the server, causing it to be rebuild
automatically when they're updated. Some system libraries are included, but
don't appear to cause any harm. You would think this would be automatic...
2006-06-16 10:17:51 -07:00
Ian Romanick
4e3c9ab8c9
Remove some static declarations for things that were removed in
...
previous commits.
2006-06-09 16:56:54 -07: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
7810d87cd6
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-09 15:16:50 -07:00
Greg Kroah-Hartman
9f31ef83be
fix compiler warning in hw/xfree86/loader/loaderProcs.h
2006-06-09 10:44:46 -07:00
Greg Kroah-Hartman
490ffc205a
fix compiler warning in hw/xfree86/loader/loadmod.c
2006-06-09 10:44:25 -07:00
Greg Kroah-Hartman
6119845d1f
fix compiler warnings in hw/xnest/Keyboard.c
2006-06-09 10:14:08 -07:00
Greg Kroah-Hartman
96c19a3ec1
put function prototype for ShapeExtensionInit() in proper place
...
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Ian Romanick
dcfaa9f4f8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-08 15:03:00 -07:00
Adam Jackson
576e6fb112
Bug #7120 : Multimonitor (non-Xinerama) support for xwin servers.
...
(Tom Whittock)
2006-06-08 17:49:02 -04:00
Adam Jackson
d42cf4a2a4
Bug #7121 : fix clipboard handling in Xming (Colin Harrison)
2006-06-08 17:46:53 -04:00
Ian Romanick
caffac3843
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-08 10:38:43 -07:00
Greg Kroah-Hartman
9fa73721f0
fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes
2006-06-08 10:27:28 -07:00
Ian Romanick
c5b3aa120b
Added a comment about some suspicious code.
2006-06-07 17:46:23 -07:00
Ian Romanick
50112dfcc8
Fixed severly broken calls to pci_device_find_by_slot. I mis-read the
...
tag bits when I originally coded it. I mistakenly thought that the
original code masked off the PCI function bits, so I just always
passed 0 as the function. That was a mistake.
2006-06-07 17:46:05 -07:00
Ian Romanick
f9e7128d94
Added missing include of Pci.h. This caused the server to terminate
...
when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time.
2006-06-07 17:44:06 -07:00
Greg Kroah-Hartman
78f4ab6b89
Fix compiler warning about undefined ReinitializeRootWindow function
2006-06-07 14:12:40 -07:00
Ian Romanick
bc05158a5a
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-07 14:09:12 -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
Greg Kroah-Hartman
cc465800dd
Fix compiler warnings about SetVendorRelease and SetVendorString
2006-06-07 14:03:35 -07:00
Adam Jackson
21ebcfd702
Demolish now-unused loader functions.
2006-06-07 14:17:31 -04:00
Adam Jackson
f90761b06e
Add a token for EDID-supplied modes.
2006-06-07 13:58:24 -04:00
Adam Jackson
d00aa6b855
Delete a (now misleading) message from the crash handler.
2006-06-07 11:44:36 -04:00
Daniel Stone
8444bb77c9
When we can, bound the maximum number of PCI devices to attempt to scan, by
...
the number found on the system. Only implemented for Linux right now.
2006-06-05 20:22:06 +00:00
Adam Jackson
52fc7c8dc7
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
...
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
ifdefs surrounding a call to a function added in XFree86 4.1 (!).
Miscellaneous static markings.
2006-06-05 03:00:24 +00:00
Adam Jackson
d22582dc5a
Remove a stray LBX reference.
2006-06-04 16:13:26 +00:00
Daniel Stone
4fd668940f
Bug #6619 : Fix disappearing hardware cursor. (Colin Harrison)
2006-06-03 10:58:37 +00:00
Daniel Stone
cd384af305
Completely remove relocation pointer table.
2006-06-03 10:50:23 +00:00
Daniel Stone
8e8c6faecd
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
2006-06-03 10:48:37 +00:00
Daniel Stone
5b703f847d
Fix type confusion.
2006-06-02 12:05:32 +00:00
Daniel Stone
56f21bda1c
Bug #6583 : Only open /proc/bus/pci/devices once. (Bill Nottingham)
2006-06-01 22:30:52 +00:00
Daniel Stone
97203f1cf6
Clean up a warning, and remove excess multiple-suffix code.
2006-06-01 20:41:21 +00:00
Daniel Stone
6d594ebc66
Ditch more alternate-loader braindamage.
2006-06-01 20:22:39 +00:00
Daniel Stone
c946817748
Kill a.out, COFF and ELF loaders with FIRE.
2006-06-01 20:18:30 +00:00
Adam Jackson
a3a4221495
Add bitmap to the ignored module list.
2006-06-01 19:53:06 +00:00
Daniel Stone
ee689c1042
Ignore requests to load GLcore and speedo.
2006-06-01 19:49:55 +00:00
Adam Jackson
07c731a2bc
Bug #5089 : Die, libbitmap, die!
2006-06-01 19:37:53 +00:00
Daniel Stone
32be08ba72
Remove horrendously ugly DDX backward-compatibility.
2006-06-01 19:22:38 +00:00
Daniel Stone
a73e0f8cdf
Die XTESTEXT1, die!
2006-06-01 18:47:47 +00:00
Matthieu Herrb
fc5ca97284
Powerpc machines also need ioperm_noop.c
2006-05-30 22:56:36 +00:00
Adam Jackson
07b168c8d8
Properly document the DPMS, SyncOnGreen, and TargetRefresh options.
2006-05-30 16:10:59 +00:00
Daniel Stone
fd8bde8bb0
Remove -xkbmap argument.
2006-05-29 11:14:03 +00:00
Matthieu Herrb
c38aab293a
check buffersize before reading next char, fixes the "mouse stuck at left"
...
bug (bugzilla #3113 ) for BSD systems using wscons. (Dale Rahn).
2006-05-27 23:15:05 +00:00
Jeremy C. Reed
2102fdd0a5
RGB color database and XErrorDB install to "share" not "lib" by default (by
...
app/rgb and libX11).
TODO: They are customizable, so maybe cpprules.in should be extended.
2006-05-26 00:12:18 +00:00
Jeremy C. Reed
354086d7e8
Don't do fixup_video_driver_list if no drivers. (I had signal 11 and core
...
dump when drivers not installed yet.)
TODO: fix fixup_video_driver_list to handle NULL argument.
2006-05-25 23:32:33 +00:00
Jeremy C. Reed
6930794423
NetBSD also has curses.h instead of ncurses.h. (TODO: Maybe instead of
...
checking for SCO, UnixWare, Sun SVR4 and NetBSD, the curses.h versus
ncurses.h should be tested in configure.)
2006-05-24 22:58:03 +00:00
Alan Coopersmith
cc3b882bd1
Update to 2006-05-19 snapshot
...
Remove entries now present in pci.ids
Regenerate from updated pci.ids & extrapci.ids
2006-05-20 00:55:44 +00:00
Adam Jackson
deebf6bd51
Bug #4139 : Fix a BAR remapping bug that could lead to IERR and system hang.
...
(Egbert Eich)
2006-05-18 23:52:51 +00:00
Adam Jackson
c11cfcfaff
Bug #6377 : Ignore disabled BARs, and allow matching BARs aligned to less
...
than 16 bytes. (Felix Kühling, ATI)
2006-05-18 23:48:57 +00:00
Adam Jackson
fa9a49a92d
Bug #5877 : Avoid burning CPU when acpid dies. Require acpid to be running
...
for ACPI support on Linux. Minor errno handling fixes. (Valery
Inozemtsev, Adam Jackson)
2006-05-18 18:18:41 +00:00
Daniel Stone
2892dd6d2e
Make Xv symbols conditional. (Enrico Wiegelt)
2006-05-17 16:20:03 +00:00
Daniel Stone
a317bf4822
Make DBE support conditional. (Enrico Wiegelt)
2006-05-17 15:00:18 +00:00
Adam Jackson
321dbed5f5
Bug #5209 : Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev)
2006-05-15 18:27:18 +00:00
Matthias Hopf
9db5d2dfc3
Bug #4320 : Improved XAA Composite fastpath.
2006-05-11 10:18:08 +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
Alan Coopersmith
b46d6a44fa
Make Xephyr build on Solaris:
...
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
2006-05-03 23:45:16 +00:00
Adam Jackson
fc91ca069d
Redact a few mentions of speedo font support.
2006-05-03 17:50:10 +00:00
Adam Jackson
291e89d4f2
Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
2006-04-30 19:16:14 +00:00
Eric Anholt
3d4ca57b69
Add a helper for the Component Alpha Over case, which breaks the operation
...
down into an OutReverse and an Add. Turn off the fallback to software
glyphs when component alpha, now that we expect all (new) drivers to be
able to support it. Also, make Xephyr fall back in the CA Over case to
exercise this code. This speeds up my rgb24text and ls -lR in
gnome-terminal by a factor of 5.
2006-04-26 18:27:40 +00:00
Dave Airlie
26fa45b642
Bug #6751 : Use the Linux PCI ROM interface on Linux properly. The old
...
domain code, still modified BARs not a good idea, Just talk to sysfs,
if 0 read, fallback to old methods.
2006-04-26 11:40:58 +00:00
Dave Airlie
c339b221d3
Bug #6750 : This patch detects Intel bridges that are transparent but aren't
...
reported as such. From the Linux kernel fixups. This patch also removes
the reserved BIOS area from the area to allocate resources in.
2006-04-26 11:31:07 +00:00
Eric Anholt
074dc9a023
Add an option to verify at the point of migration that pixmaps which aren't
...
marked dirty are in fact not dirty. This will hopefully help catch
issues like the previous commit. Leave it on in fakexa.
2006-04-25 16:47:23 +00:00
Donnie Berkholz
81f3c2937d
strlcpy() doesn't exist on Linux, so use the implementation in os/.
2006-04-24 05:39:47 +00:00
Matthieu Herrb
a715634d23
Don't access free memory after unloading a module. Bugzilla #4168 .
2006-04-23 13:14:50 +00:00
Benjamin Herrenschmidt
79dc689261
When reading the kernel keyboard mapping (readKernelMapping in
...
os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global
array 'map', scribbling on other random static variables elsewhere.
This is fixed by changing the size of at2lnx. (David Woodhouse). Bug
#5169
2006-04-22 03:22:17 +00:00
Eric Anholt
c947d796aa
Missed in previous commit: Add a new migration scheme, called "Smart" for
...
lack of a better name. This one behaves somewhat between Greedy and
Always. It moves in if we can accelerate, unless the destination is
clean and shouldn't be kept in framebuffer according to the score, in
which case we migrate out (and force-migrate anything where migration
is free). This should help fix lack of acceleration for drivers without
UTS since removing exaAsyncPixmapGCOps, and has removed one performance
trap with Radeon I'd noticed. It is the new default.
2006-04-18 19:18:43 +00:00
Donnie Berkholz
782d61a031
Update all prefixes in config tools, so they mostly work again. Also, make
...
RgbPath commented out when using xorgconfig. Start using
/dev/input/mice as the default mouse location on Linux.
2006-04-18 17:28:44 +00:00
Donnie Berkholz
ba632f697a
Fix kdrive build by linking in libexa before KDRIVE_LIBS.
2006-04-17 07:10:31 +00:00
Adam Jackson
0e62d92d5b
Coverity #804 : Another leak on OOM path.
2006-04-14 23:43:32 +00:00
Adam Jackson
1b04e31392
Coverity #847 , #848 , #849 : Three more memory leaks.
2006-04-14 23:32:22 +00:00
Adam Jackson
6545051902
Coverity #1003 , #1004 : Two more useless null checks.
2006-04-14 23:10:59 +00:00
Adam Jackson
ab1d420022
Coverity #1005 : Avoid a null deref.
2006-04-14 23:09:38 +00:00
Adam Jackson
d01e0956a8
Coverity #1007 : Fix a silly null check.
2006-04-14 23:08:10 +00:00
Luc Verhaegen
6d29f65931
CVT means Coordinated Video Timing instead of Common.
2006-04-14 23:01:35 +00:00
Adam Jackson
82b6ea1a4b
Bug #6580 : Don't install xf86drm.h, that's libdrm's job.
2006-04-14 22:51:19 +00:00
Aaron Plattner
2387bfa5ff
Bump the ABI versions. Due to Glyph privates and the XV update below, the
...
video driver ABI needs to be bumped to 1.0. The rest of the ABI minor
versions were bumped to include the LoaderGetABIVersion function.
Add a DrawblePtr argument to the XV hooks. This allows drivers to determine
that the target window is redirected and draw to the appropriate place.
2006-04-07 18:56:04 +00:00
Adam Jackson
94e7213d59
Remove libc wrapper types from Xisb interfaces.
2006-04-07 16:08:50 +00:00
Daniel Stone
843146cfba
Coverity #1216 : Fix double-close of file on error.
2006-04-07 15:53:21 +00:00
Adam Jackson
75a9afdbf4
Coverity #488 : Avoid smashing an array on malformed config files.
2006-04-07 01:53:43 +00:00
Adam Jackson
20c1ef2cc3
Coverity #769 : Fix a potential memory leak for systems that allocate on
...
malloc(0)
2006-04-07 01:50:07 +00:00
Adam Jackson
5ef711032b
Coverity #838 : Plug two more memory leaks.
2006-04-07 01:41:00 +00:00
Adam Jackson
69477ea4b6
Coverity #837 : Fix another another memory leak.
2006-04-07 01:37:11 +00:00
Adam Jackson
b472ce7307
Coverity #836 : Fix another memory leak.
2006-04-07 01:35:43 +00:00
Adam Jackson
9c84ed5f8d
Coverity #835 : Plug memory leak in extension section parsing.
2006-04-07 01:34:29 +00:00
Adam Jackson
12924d0da3
Coverity #812 : Fix parser memory leak.
2006-04-07 01:29:39 +00:00
Adam Jackson
49abff7995
Coverity #818 : Avoid memory leak on error path.
2006-04-07 01:26:33 +00:00
Adam Jackson
536628bb4b
Coverity #1037 : Sanity check idx before use.
2006-04-07 01:18:01 +00:00
Adam Jackson
4ae1263669
Remove cfb16, no longer used.
2006-04-06 18:59:11 +00:00
Adam Jackson
4697da177d
Initial checkin
2006-04-04 18:30:28 +00:00
Adam Jackson
83ea57bcc8
Bug #5729 : Convert xf8_16bpp to fb. chips(4) users please test.
2006-04-04 14:39:06 +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
fb6f61b50f
Bug #4806 : Dump the raw EDID contents in hex to the log file for better
...
debugging. (Philip Prindeville)
2006-04-04 12:36:16 +00:00
Adam Jackson
14af50371c
Bug #2142 : Make font path logging more readable. (Eduard Fuchs)
2006-04-03 22:00:06 +00:00
Alan Hourihane
2a6c11aa3b
Fix a server crash due to memsetting beyond allocated memory when running
...
GL applications.
2006-04-03 09:12:28 +00:00
Adam Jackson
f6ca2b3ea9
Coverity #38 : Dead branch elimination.
2006-04-03 02:15:55 +00:00
Adam Jackson
7ef95da8a3
Coverity #616 : Fix a rare memory leak.
2006-04-03 01:51:54 +00:00
Adam Jackson
a01f17d6de
Coverity #983 : Move some risky debugging code inside #ifdef DEBUG.
2006-04-03 01:35:05 +00:00
Adam Jackson
b2097b99a2
../stub
2006-04-02 21:45:03 +00:00
Adam Jackson
323fec2029
Reorder link order for Xdmx to fix new screensaver variable reference
...
properly; remove previous awful hack.
2006-04-02 00:46:20 +00:00
Eric Anholt
ccca76b808
Clean up warnings and a debug printf.
2006-04-01 23:41:23 +00:00
Adam Jackson
277f612d4e
Hack around the new screensaver variable for DMX, which is otherwise
...
blissfully ignorant of it.
2006-04-01 23:19:08 +00:00
Eric Anholt
2e38fedd29
Add an option to EXA for the DDX to request that EXA hide the pixmap's
...
devPrivate.ptr when pointing at offscreen memory, outside of
exaPrepare/FinishAccess(). This was used with fakexa to find (by NULL
dereference) many instances of un-Prepared CPU access to the
framebuffer:
- GC tiles used in several ops when fillStyle == FillTiled were never
Prepared.
- Migration could lead to un-Prepared access to mask data in render's
Trapezoids and Triangles
- PutImage's UploadToScreen failure fallback failed to Prepare.
2006-03-31 19:41:28 +00:00
Eric Anholt
5c04610f8a
Add a dependency on EXA, so it rebuilds when the library does. The manual
...
indicated I shouldn't do this, but experience indicates I should.
2006-03-30 21:21:59 +00:00
Eric Anholt
3cf46cc1e3
Add an UploadToScreen implementation, for testing PutImage support, and
...
make the DownloadFromScreen more robust.
2006-03-30 05:15:58 +00:00
Eric Anholt
4bb5ab0b44
Add a DownloadFromScreen implementation, used for testing GetImage
...
acceleration, and set the migration scheme to Always on init (since
this is all for testing, and Always should make migration happen more
frequently than Greedy).
2006-03-29 22:03:18 +00:00
Adam Jackson
ff6f88348c
More warning cleanup.
2006-03-29 01:05:09 +00:00
Aaron Plattner
bd283c2464
Add a new export, LoaderGetABIVersion. This function allows modules to
...
query the versions directly instead of having to guess. Bug #6416 : Add
LoaderGetABIVersion.
2006-03-28 07:21:50 +00:00
Daniel Stone
5be8a66d32
Fix remnants of previous busted _XkbStrCaseCmp commit.
2006-03-27 22:28:32 +00:00
Daniel Stone
9e202dfe40
Remove remnants of XkbCF code.
2006-03-27 22:25:56 +00:00
Daniel Stone
7257590651
Move XFree86 DDX XKB actions into dixmods.
2006-03-27 21:15:06 +00:00
Adam Jackson
a68c11bb1d
Mark everything in xf86sym.c as _X_EXPORT.
2006-03-25 19:52:05 +00:00
Fredrik Höglund
ae935832fa
Refactored the screensaver and DPMS timer code to use the screensaver timer
...
for both screensaver and DPMS. Removed the SetDPMSTimers() and
FreeDPMSTimers() functions.
2006-03-24 20:50:13 +00:00
Alan Coopersmith
f1616508c9
Add ast driver/pci id (Carl Switzky, Sun Microsystems)
2006-03-23 23:54:08 +00:00
Adam Jackson
9509c6799e
dead file removal
2006-03-20 19:32:18 +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
Daniel Stone
d0d336efd5
Add support for ZX2 PCI-E local bus adaptors. (Alex Williamson, HP)
...
Use soft timeout register to avoid MCAs when probing for non-existent local
bus adaptors on ZX2. (Alex Williamson, HP)
2006-03-16 16:29:17 +00:00
Felix Kuehling
21f7f2fb11
Enable correct handling of the BTS instruction (opcode 0f ab) The code was
...
there but #ifdefed out. Insead of BTS, BT was executed. This patch
enables the BTS function and hooks it up the the correct opcode. (ATI
Technologies Inc.)
2006-03-15 18:43:32 +00:00
Adam Jackson
b9c43cde1e
Coverity #1042 , 1043: Nuke some dead variables.
2006-03-15 16:56:10 +00:00
Adam Jackson
a3ef63696c
Coverity #490 : Fix a range check in xf86vidmode extension.
2006-03-15 16:36:31 +00:00
Adam Jackson
460f2ea4a5
Coverity #794 : Fix a highly unlikely memory leak.
2006-03-15 16:21:04 +00:00
Adam Jackson
116d158e85
Coverity #269 : Compare the requested ABI class against the ABI class of the
...
module, not the module class.
2006-03-15 16:16:24 +00:00
Adam Jackson
d8221a9b70
Coverity #484 : Fix an off-by-one in module refcounting.
2006-03-15 16:11:34 +00:00
Adam Jackson
1e5c0842af
Coverity #1053 : Nuke a dead variable.
2006-03-15 15:34:57 +00:00
Benjamin Herrenschmidt
7314d16cde
Fix DRIExtensionInit() to not register callbacks when it hasn't been
...
initialized for the current server generation. Fixes a problem where it
would use stale private index and blow up in colorful ways if no driver
called DRIScreenInit() on the second generation (which happens due to a
bug in radeon that i'll fix separately). Note: clearing the index in
DRIReset() wouldn't work as DRIReset() is called before the
CloseScreen() chain
2006-03-15 03:18:42 +00:00
Benjamin Herrenschmidt
02d80a0de9
Make xf86 linear allocator smarter when dealing with alignment constraints
...
when falling back to X/Y allocations. Fixes various problems of Xv
allocation failures, notably with "nv" driver.
2006-03-15 03:12:32 +00:00
Eric Anholt
c1601717d5
Add a new migration scheme, "always", which will move pixmaps to their
...
desired location always (unless they don't fit in FB, in which case
they all get moved out for software rendering). The default remains as
before, but can be controlled by the MigrationHeuristic xorg.conf
option (which is intentionally not documented, as it may be
short-lived). This is part of the exa-damagetrack work, which appears
stable in testing with fakexa, unlike the work as a whole.
2006-03-15 01:20:08 +00:00
Matthieu Herrb
eb63e50d95
Fix build when AIGLX is false.
2006-03-12 17:14:03 +00:00
Kristian Høgsberg
c3342c8000
Merge accel_indirect branch to HEAD.
2006-03-12 00:11:34 +00:00
Alan Coopersmith
b1b731c286
Fix buffer size checks to prevent 2-byte buffer overflows. (Coverity #480 ,
...
#481 , #482 , #483 )
2006-03-11 02:43:51 +00:00
Alan Coopersmith
fc0772de36
Add HAS_MMAP for Xvfb
...
Fix Xvfb option parsing to exit on bad arguments, not just issue error
messages and continue on. (Coverity #492 )
2006-03-11 02:10:14 +00:00
Alan Coopersmith
f2ecbb3018
Pass sizeof the correct buffer to XmuSnprintf. (Coverity #489 )
2006-03-11 01:58:32 +00:00
Eric Anholt
d695579848
If fakexa is enabled, create a larger buffer in the Ximage, but keep the
...
same width/height for front-buffer drawing. The fakexa code then uses
this extra space for offscreen pixmaps. Note that this tones down the
absurdity of fakexa's offscreen pixmap alignment requirements (odd
alignment is too weird, so stick with "24", which is still strange but
exists out there). It also fixes a couple of bugs in the fakexa
implementation revealed by using offscreen pixmaps.
2006-03-10 21:36:24 +00:00
Eric Anholt
ffdbb547be
Coverity #1011 : Remove a useless NULL check on a pVbe that had been
...
dereferenced many times before.
2006-03-10 08:06:42 +00:00
Eric Anholt
1bc72dce5f
Coverity #857 : Fix resource leak in error path by freeing earlier.
2006-03-10 08:03:24 +00:00