d9a5e3e964
XkbCopyKeymap: be more careful with levels, allocate compat/geom
...
Take various extra precautions with copying levels across (thanks Chris
Lee for a gdb session), including allocating when we don't already have a
coherent map.
Only free type components if they're present.
Allocate geometry and compat components if we don't already have them in
the dest map.
2006-11-02 00:45:23 +02:00
6fdfd9dad9
Fix several cases where optimized paths were hit when they shouldn't be.
...
This fixes a number of rendercheck cases.
2006-11-01 14:41:12 -08:00
40f84793bc
Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server
2006-11-01 14:34:46 -08:00
d7d931abe0
configure.ac: remove check for rate/period
...
Keyboard stuff is now handled in the kbd driver.
2006-11-01 23:48:58 +02:00
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
3df454719f
kdrive: add KdRingBell prototype
2006-11-01 23:02:57 +02:00
4056e6e79a
Move physical size from mode to output.
...
Modes can be shared across different sized monitors this way.
Also caught some missing byteswapping and an incorrect return type.
2006-11-01 00:29:46 -08:00
c03311a1e7
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
2006-10-31 16:05:48 -08:00
a2434ec5f3
Make _POSIX_C_SOURCE hack work with Solaris headers
...
Solaris headers are very literal - if you ask for POSIX_C_SOURCE 199309L,
they limit to only the functions in that standard and no more, unless you
also specify __EXTENSIONS__ to allow functions beyond the standard base.
2006-10-31 15:57:59 -08:00
645d057620
Handle building in a separate objdir
2006-10-29 18:19:56 +01:00
59584c375f
kill GNU-make'ism.
2006-10-29 17:49:46 +01:00
0107320fac
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-10-29 15:23:35 +01:00
06b6b971d0
Make sure we have 64-bit file-offsets in libdrm.
2006-10-29 15:22:37 +01:00
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
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
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
68f595ca6c
GetTimeInMillis: use correct units for clock_gettime
...
Make sure we're treating the nanoseconds as a long, not an int, so we
don't overflow.
2006-10-29 03:41:34 +03:00
51a06b3c44
WaitForSomething: only rewind when delta is more than 250ms
...
Only rewind time when we're more than (original delta + 250ms) away from
executing the timer.
When we're walking the timer list, use a goto to iterate all of them from
the start again, since timers may drop out of the list.
Don't bother trying to be smart in TimerSet, we'll pick it up in
WaitForSomething anyway.
2006-10-29 03:40:57 +03:00
a34446f5b3
Add missing file to list in Makefile.am
2006-10-27 13:43:43 -04:00
92d04e746b
Import libdrm functions for the drm memory manager.
2006-10-27 18:26:30 +02:00
196c5836f4
CoreKeyboardProc: annotate with FIXME
...
Setting an empty keymap by default isn't wildly useful.
2006-10-27 01:27:31 +03:00
f9a1e456f8
CoreKeyboardProc: don't leak keymap and modmap
...
SetKeySymsMap does a copy here, so try not to leak them.
2006-10-27 01:25:39 +03:00
a5be654017
mieqEnqueue: only compare DEVICE_BITS of deviceid
...
Only compare DEVICE_BITS of the two deviceids, so we don't decide that
a valuator event isn't for us, because (id | MORE_EVENTS) != id.
2006-10-27 01:25:21 +03:00
85212eb504
getValuatorEvents: make sure we put MORE_EVENTS in the right places
...
Make sure we put MORE_EVENTS in with the device id if there are, in fact,
more valuator events coming.
2006-10-27 01:23:58 +03:00
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
8c0556e7cb
Merge branch 'master' into input-hotplug
2006-10-26 15:21:22 +03:00
004d00e668
GetTimeInMillis: simplify monotonic test
...
We don't actually need to get the CPU clock ID, which means we don't need
the monotonic_usable test. Since there's now only one branch, the
compiler will treat that as likely, so we don't need xproto 7.0.9 anymore.
The fallthrough to gettimeofday() is preserved.
2006-10-26 01:10:08 +03:00
cdc8a4b7b2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-26 00:28:30 +03:00
d285833290
GetTimeInMillis: spuport monotonic clock
...
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.
This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
2006-10-25 23:57:00 +03:00
d3e57faffe
WaitForSomething: allow time to rewind
...
If time rewinds dramatically, reset all the timers to fix their expiry.
2006-10-25 23:55:43 +03:00
e21604914d
Merge master back in and clean up some unfinished code (closes 8745)
2006-10-25 09:48:23 -07:00
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
59511974db
Merge branch 'master' into randr-1.2
2006-10-24 17:26:20 -07:00
598ac7a836
Merge branch 'origin'
2006-10-24 17:23:12 -07:00
828c34e83c
Byte swap RRSelectInput enable flags.
2006-10-24 17:23:02 -07:00
3da918a16c
mipointer: remember to update pointer location
...
Update pointer location so it doesn't get quickly reset by the next
pointer update.
2006-10-25 02:22:07 +03:00
aabc087998
GetPointerEvents: always ensure correct number of events
...
Ensure correct number of valuator events are returned, and that we always
increment events correctly.
2006-10-25 02:21:39 +03:00
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
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
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
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
5b38eb69cd
dix: add motion history support
...
Add motion history support (sort of based on the XFree86 DDX's
implementation) to the DIX.
2006-10-25 01:08:29 +03:00
11fb58be77
miscellaneous warning fixes
...
Use the correct type for time, and fix the mi prototype of EnqueueEvent.
2006-10-25 01:07:36 +03:00
2a74b8a91d
xfree86: re-bump input abi to 1.0, yet again
2006-10-25 01:04:53 +03:00
37d1fffe79
inputstr: try to keep device structs the same size
...
Try to make sure DeviceIntRec and friends stay the same size,
regardless of whether or not XKB is enabled.
2006-10-24 23:06:57 +03:00
9f9ac01a81
inputstr: fix indentation
2006-10-24 23:01:05 +03:00
27d682fa03
Fix from HEAD accidentally reverted during merge.
2006-10-24 09:04:14 -07:00
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
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
cccf7ae0ff
GetProximityEvents: add (untested) function
...
Add untested first guess at what GetProximityEvents should look like.
2006-10-23 06:55:21 +03:00
Daniel Stone
Eric Anholt
Alan Coopersmith
Keith Packard
Matthieu Herrb
Thomas Hellstrom
Eamon Walsh
Myron Stowe
Keith Packard
Michel Dänzer
Ian Romanick