246c10441b
dmx: fix false memory allocation.
...
beNumVisuals and the number of GLX Visuals can be significantly different.
2008-06-05 16:14:12 +09:30
17cd262257
dmx: don't dereference a nullpointer.
2008-06-05 16:13:58 +09:30
75eb635e35
dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup
2008-06-05 16:13:44 +09:30
3ff2f3a00e
dmx: for now, don't acknowledge SDs.
2008-06-05 16:13:38 +09:30
5bcd9e8953
dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard
2008-06-05 16:13:23 +09:30
8da8a0fec4
dmx: claim we support XI 2.
...
We don't really, yet, but at least we get the full device list this way.
2008-06-05 16:13:18 +09:30
6f1d5147cb
dmx: fix a segfault caused by GC devPrivates never being initalised.
2008-06-05 16:13:12 +09:30
d10ba4591a
dmx: some more build fixes.
2008-06-05 16:13:03 +09:30
40855d8000
XQuartz: Removed async debugging sleep
...
(cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d)
2008-06-04 12:24:15 -07:00
ee86b75119
XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
...
(cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e)
2008-06-04 12:24:12 -07:00
38da26cd36
XQuartz: Don't forget to destroy the mutex and cond after we're done with them
...
(cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72)
2008-06-04 12:24:10 -07:00
ea40fcf434
XQuartz: Fork for trigger
...
(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
2008-06-04 12:24:06 -07:00
2393dae6ff
XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
...
(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
2008-06-04 12:24:04 -07:00
26e7e69ab8
kdrive: don't post motion event if there was no motion. #16179
...
Based on the patch by Tomas Janousek.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179 >
2008-06-02 11:11:37 +09:30
ac1db45449
xfree86: suspend signals while removing a device (corrected version).
...
Block/Release is now symmetrical.
2008-06-02 10:40:10 +09:30
95ecaa411a
Revert "xfree86: suspend signals while removing a device."
...
Left the signals blocked hanging after removing a master device.
This reverts commit 74372fd004
2008-06-02 10:38:45 +09:30
5ba07cb548
kdrive: changes ephyr API according mpx merge.
...
This fix host-cursor in Xephyr server.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-06-02 10:27:12 +09:30
f79ad5674e
kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr
2008-05-31 18:46:35 +09:30
942086fc96
dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
2008-05-31 18:17:49 +09:30
64677f6a16
xfree86: fix offset error in EDID parsing. #15964
...
X.Org Bug 15964 <http://bugs.freedesktop.org/show_bug.cgi?id=15964 >
2008-05-27 21:18:35 +09:30
c8af7ce35a
Correct a NULL pointer deference
...
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-27 15:20:28 +09:30
3a1278907e
xfree86: Bump XINPUT ABI to 3.0.
2008-05-26 18:14:31 +09:30
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
1883485edd
If core motion history is required, scale back to screen coords and INT16.
2008-05-26 17:22:25 +09:30
0877de13ac
Remove GetMotionProc from ValuatorClassRec.
...
With the MD/SD device hierarchy we need control over the generation of the
motion history as well as the conversion later before posting it to the
client. So let's not let the drivers change it.
No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping
it seems safe enough.
2008-05-25 22:49:54 +09:30
00b4339168
dmx: remove some #if 0'd code.
2008-05-25 22:34:11 +09:30
29586101dc
EXA: Only record damage generated by rendering operations.
...
Recording damage from other operations (e.g. creating a client damage record)
may confuse the migration code resulting in corruption.
Option "EXAOptimizeMigration" appears safe now, so enable it by default. Also
remove it from the manpage, as it should only be necessary on request in the
course of bug report diagnostics anymore.
2008-05-24 20:01:41 +02:00
e6cbb1e11e
xfree86: fix build on GNU/kFreeBSD
...
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550 .
2008-05-23 23:01:24 +02:00
21a8052fdc
glx: fix forgotten swrast -> SWRast
2008-05-23 22:40:26 +03:00
877e6c35ff
glx: missing swrast is fatal
2008-05-23 22:40:26 +03:00
ae0504d34d
kdrive: need not export symbols for glx anymore
2008-05-23 22:40:25 +03:00
7082929ef7
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
...
(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
2008-05-23 02:32:37 -07:00
225dddbaed
XQuartz: Move the launchd display grabbing into mach_startup
...
(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
2008-05-23 02:31:41 -07:00
3a22190061
XQuartz: Fixed a few issues with fd passing... still not working =(
...
(cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa)
2008-05-23 02:31:38 -07:00
6c9e9f8a40
input: instead of lastx/y, use a last.valuators[] array on the device.
...
During GetPointerEvents (and others), we need to access the last coordinates
posted for this device from the driver (not as posted to the client!). Lastx/y
is ok if we only have two axes, but with more complex devices we also need to
transition between all other axes.
ABI break, recompile your input drivers.
2008-05-23 12:01:37 +09:30
74372fd004
xfree86: suspend signals while removing a device.
...
Getting a keyboard event while halfway through freeing memory can be
unpleasant.
2008-05-22 18:08:32 +09:30
ea4ec9e998
int10: add pci_device_enable support on Linux
2008-05-22 08:58:42 +10:00
4230b92744
Clean up remaining afb references.
2008-05-21 17:58:15 -04:00
20ea99c655
Death to afb.
...
Planar framebuffer people, please talk to wfb for all your 1988 hardware
needs.
2008-05-21 17:03:25 -04:00
c76fddeea2
Fix up paths for GL/glx -> glx renaming
2008-05-21 10:51:15 -07:00
a8a9b40e55
Move the windows GL files to the xwin DDX.
2008-05-21 12:36:25 -04:00
e5aad4bc08
Get out of the mesa symlinking business.
...
This copies over the files generated from mesa/src/mesa/glapi. There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.
The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch]. Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.
The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
2008-05-21 12:15:18 -04:00
f558c7d4d1
Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
2008-05-21 12:15:18 -04:00
77ff8fd507
Drop glcore GLX provider.
...
Obsoleted by the DRI swrast driver.
2008-05-21 12:15:18 -04:00
255142b61e
drop xprint remnants: InitGlobals
2008-05-21 18:13:09 +03:00
7509fb498c
Merge branch 'hwcursor' into mpx
2008-05-21 16:25:35 +09:30
6ff6465931
Add loader for the swrast dri driver.
2008-05-20 16:38:05 -04:00
925e895b86
Restore return type on xf86SetScrnInfoModes
...
Seems to have been accidentally lost by commit 76943fec86
2008-05-19 18:43:29 -07:00
99d28c3ef3
Merge branch 'master' into mpx
...
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
0178b6a4ab
Fix reduced-blanking mode filtering in RANDR 1.2.
...
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool. Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
2008-05-19 11:22:19 -04:00
bb687465d0
XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
...
(cherry picked from commit cccee9cfc29f85cca635df3b8dd54199b45c4df8)
2008-05-19 02:47:18 -07:00
4b69d22bcb
XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
...
(cherry picked from commit 2a72309c061f7060480d150791019ce232481462)
2008-05-19 02:47:17 -07:00
e997df8cd3
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
2008-05-18 23:32:57 -07:00
738672858d
New XQuartz icon thanks to Simone Karin Lehmann
...
(cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
2008-05-18 23:32:56 -07:00
4be2104c80
XQuartz: More work towards Mach-IPC startup... started working on FD passing
...
(cherry picked from commit 27fbfeacfa16d620801ac3492b25c1e50aec8588)
2008-05-18 22:45:19 -07:00
82c4075d4b
xfree86: fix initial output positions with Above or LeftOf and rotation
...
The fix in fa19e84714
2008-05-19 03:27:12 +02:00
7dca84f3ee
cursor: don't dereference NULL pointer is devPrivates not yet set.
...
This fixes a bug on server recycle with ati zaphod.
2008-05-19 11:16:08 +10:00
5af5db5033
XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
...
(cherry picked from commit 301262b07024ad960f22d99a1267fe137f5c3fce)
2008-05-17 14:56:57 -07:00
2408303d79
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
...
(cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
2008-05-17 14:56:53 -07:00
01612fe612
XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
...
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621b1803a4d4536afbc724d141de9e6ee)
2008-05-17 14:56:34 -07:00
1d09deaa6e
XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
...
(cherry picked from commit 5626b0949b1a6bdd2fa3ec2ef53a688084349b87)
2008-05-17 14:56:30 -07:00
adc62f62b9
Xquartz: Xquartz stub now can send Mach IPC to start the server.
...
(cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
2008-05-17 14:56:26 -07:00
93c082a060
OpenBSD doesn't define __x86_64__, simplify tests.
...
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
2008-05-17 13:14:31 +02:00
aad1c37b09
RANDR 1.1 compat: remove senseless comparison against the virtual size.
2008-05-16 11:10:33 -04:00
14726b776d
xf86SetDesiredModes(): Skip disabled CRTCs first thing.
2008-05-16 11:10:33 -04:00
459f34b089
Fix initial mode selection even harder.
...
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs". Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
2008-05-16 11:10:33 -04:00
96111c1547
Redo RANDR compatibility output selection.
...
Old logic was just the first one that happened to have an associated
CRTC. The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
2008-05-16 11:10:32 -04:00
a4bbe1c8bc
Re-add sync range inference from legacy setup to RANDR 1.2.
2008-05-16 11:10:32 -04:00
99e4531f7c
The great kdrive purge.
...
Most of these drivers didn't work. ati was the only one that even came
close. The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
2008-05-16 08:16:01 -04:00
6fb76acc45
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
...
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
2008-05-16 21:10:00 +09:30
f611719edc
xfree86: always render first cursor in HW, all others in SW.
2008-05-16 20:17:21 +09:30
48ba58feac
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
...
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
2008-05-16 19:33:51 +09:30
622d7c1d89
Restructure and organize the code.
...
It was removed and simplified some conditionals. We don't need test for
pDev->isMaster inside xf86CursorSetCursor() because only MD enters there.
In the last chunk, ScreenPriv fields were being assigned without need, so
that code was wrapped inside the conditional to avoid it.
I also tried to make the identation more sane in some parts that I touched.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Minor modification, part of the original patch led to cursors not being
updated properly when controlled through XTest.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 17:14:43 +09:30
5af90025fe
Remove redundancy.
...
The only function that cat set SWCursor before xf86DeviceCursorInitialize()
is xf86InitCursor() when VCP and is created.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 17:02:15 +09:30
5127942f80
DGA: pass nevents to UpdateDeviceState. #15936
...
Missing parameter caused event processing to go nuts when checking valuators.
X.Org Bug 15936 <http://bugs.freedesktop.org/show_bug.cgi?id=15936 >
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 15:43:01 +09:30
166177e36b
Simplify default font path setup.
2008-05-14 16:02:05 -04:00
cbb4e80eb7
XQuartz: More work on the Mach-IPC startup path
...
(cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
2008-05-14 01:16:04 -07:00
3b57c59bb0
Xquartz: More work on the new Mach startup
...
(cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
2008-05-14 01:16:01 -07:00
e435acc84c
Added missing to EXTRA_DIST
...
(cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
2008-05-14 01:15:58 -07:00
f7d6d20ad6
XQuartz: Cleaned up the about box.
...
(cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
2008-05-14 01:15:56 -07:00
b37e1f1f5c
Don't need the fink-friendly printf in the DDX anymore.
...
(cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
2008-05-14 01:15:54 -07:00
68b4f250ee
dmx: fix build.
...
Just because it builds, doesn't mean it works.
2008-05-14 16:18:48 +09:30
8234af6c6a
xfree86: remove Ubuntu-ism.
...
Additional #include was required due to broken libc headers or something like
that. Remove it, there's more to the world than ubuntu alone.
2008-05-13 11:17:39 +09:30
1fc1a2897e
Remove UndisplayCursor API.
...
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
2008-05-13 11:17:02 +09:30
86678e7cc2
Fix fbdevhw initialization for PCI drivers.
...
graphics/fb%d, not graphics:fb%d. Thanks sysfs. Thysfs.
2008-05-12 14:53:37 -04:00
1c8bd318fb
X n'est pas une print API.
2008-05-12 14:15:11 -04:00
f9fae16456
XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app
...
(cherry picked from commit 78032815aeb10c22ff45b49702e9c9df82ab471c)
2008-05-12 10:42:20 -07:00
ac4e33a9cd
XQuartz: More startup work... listen if we're the actual server
...
(cherry picked from commit 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
2008-05-12 10:42:16 -07:00
a7800d9355
XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
...
(cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
2008-05-12 10:42:12 -07:00
3b6735528e
pci: don't do this pci stuff when we don't have hw access
2008-05-12 16:36:42 +10:00
9dfb525f6c
kdrive: allow disabling Composite
...
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
2008-05-11 23:35:41 +02:00
7b3066d9b9
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
2008-05-10 00:01:15 +10:00
2a3d1421e0
Disable D-BUS from Xprint.
...
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.
Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
2008-05-09 23:58:19 +10:00
315f089056
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
2008-05-08 19:58:24 -07:00
a07c5ad172
XQuartz: Set bundle version to 2.3.0
...
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
2008-05-08 19:58:15 -07:00
05f23ed3ea
XQuartz: Fixed some issue in our bundle creation
...
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
2008-05-08 19:58:09 -07:00
f17ba5d584
Bug #13104 : Remove broken XAA a1 glyph fast path.
2008-05-08 16:04:24 -04:00
ddaecfa13c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2008-05-08 14:33:58 -04:00
641a5f955b
Build: Ensure xf86DefModeSet.c ends in an empty line
...
This shuts up a warning.
2008-05-07 22:29:04 +03:00
9c2e0871cf
Bug #13104 : XAA: Adapt to glyph storage changes.
...
Glyph bits are now stored in a proper pixmap, not just hanging off the
end of a GlyphRec.
2008-05-07 13:21:26 -04:00
Peter Hutterer
Jeremy Huddleston
Tiago Vignatti
Paulo Cesar Pereira de Andrade
Michel Dänzer
Julien Cristau
George Sapountzis
Dave Airlie
Kristian Høgsberg
Adam Jackson
Dan Nicholson
Alan Coopersmith
Brad Smith
Brian Rogers
Drew Parsons
Drew Parsons
Daniel Stone