Eric Anholt
fbd0944338
Replace bad mode name-setting code with xf86SetModeDefaultName().
2006-11-28 11:13:43 -08:00
Eric Anholt
4ad0bde661
Clean up a bunch of long lines and trailing whitespace.
2006-11-28 11:13:43 -08:00
Eric Anholt
05778432dc
Move code to get a mode list from EDID data from ddcProperty.c to edid_modes.c.
2006-11-28 11:13:42 -08:00
Eric Anholt
38ecc66cd9
Typo that was missed in testing.
2006-11-28 11:13:42 -08:00
Eric Anholt
16f8f10dc2
Move mode handling helpers from ddcProperty.c to xf86Mode.c.
2006-11-27 16:21:31 -08:00
Eric Anholt
b4b0d901d9
Merge branch 'randr-1.2'
...
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
2006-11-27 15:43:15 -08:00
Eric Anholt
d6cd0313c7
Add some mode helper functions from the intel driver.
...
This also removes static from some other functions that had been copied out
to at least the intel driver, but perhaps others that were doing mode list
handling.
2006-11-27 14:46:50 -08: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
Dave Airlie
e2f6dacc73
dri: setup libdrm hooks as early as possible.
...
This is due to radeon doing drm stuff before DRI extension gets initialised
2006-11-18 11:29:00 +11:00
Bjorn Helgaas
ae3c9ad4ab
Bug 9041: Check the return code in xf86MapDomainMemory().
2006-11-16 17:29:06 +01:00
Eric Anholt
6ff7f2ad6a
Fix build on FreeBSD after input-hotplug.
...
(cherry picked from commit 4e6e4baead
)
2006-11-15 15:35:22 -08:00
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
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
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
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
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
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
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
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
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
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
2a74b8a91d
xfree86: re-bump input abi to 1.0, yet again
2006-10-25 01:04:53 +03: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
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
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