andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,321 Commits 86 Branches 473 Tags 48 MiB
ab17f88506
Commit Graph

3261 Commits

Author SHA1 Message Date
Eamon Walsh
2d7ba09dc4 Make devPrivates lookup functions ABI instead of static inlines. 
This is required to preserve compatibility across changes to the
internal representation of the privates list.
 2008-06-13 16:43:56 -04:00
Adam Jackson
f31bd087e8 Death to mfb. 
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
 2008-06-13 10:51:18 -04:00
Adam Jackson
d15b379030 Remove xgl. 
This code hasn't been updated with anything even resembling what anyone is
shipping in nearly thirty months.  It hasn't built out of the box since
7.1.  Most of its features over AIGLX are accomplished with DRI2 and
friends.
 2008-06-12 16:00:50 -04:00
Dave Airlie
c37a93b485 modes: make aspect choosing work on single output case. 
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
 2008-06-12 14:55:16 +10:00
Tiago Vignatti
390b155135 Welcome to hotplug era. 
`rm -rf xorg.conf` does not imply an error message. Maybe a warning.

checkInput() is defined but not used.
 2008-06-11 18:21:33 -03:00
Tiago Vignatti
6e018f6a30 No need for inputPending field in xf86Info. 2008-06-11 18:10:55 -03:00
Tiago Vignatti
84db8837d0 Remove unused xf86DeviceCursorUndisplay() function. 2008-06-11 17:47:00 -03:00
Peter Hutterer
656d5d9885 kdrive: fix wrong use of &, should be | instead. 
Fallout from 26e7e69ab8
 2008-06-11 17:32:59 +09:30
Peter Hutterer
e083b5a075 xnest: wrap the xnest cursor sprite funcs around the mi funcs. 
Modelled after the xfree86 code. Call miDCInitialize to init the SW rendering
engine, then take the pointers, store it in a xnest-local variable, and put
the xnest-specific sprite funcs in place. In the xnest sprite funcs, call
through to the mi sprite funcs after doing xnest-specific stuff.
 2008-06-11 17:24:19 +09:30
Peter Hutterer
a3a7c12fcf xfree86: Fix up xf86ScaleAxis 
Some driver still call it, so we might as well work correctly. Always
resetting X to the Sxhigh is sub-optimal.
 2008-06-11 17:24:19 +09:30
Jeremy Huddleston
f8431a62d5 XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 
(cherry picked from commit 4505bae5d7)
 2008-06-10 10:52:04 -07:00
Jeremy Huddleston
c180a52332 XQuartz: Removed code path for old startup 
(cherry picked from commit a9ee6b0d00)
 2008-06-10 10:51:58 -07:00
Jeremy Huddleston
5170c169db XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it. 
(cherry picked from commit ee92aced10)
 2008-06-10 01:46:01 -07:00
Jeremy Huddleston
01ace5f3fd XQuartz: Updated icon with more rsolutions and made it more dark-background friendly 
(cherry picked from commit d8cf5623fa)
 2008-06-10 01:46:00 -07:00
Peter Hutterer
2854abd39d xnest: fix up sprite funcs to stop compiler warnings. 2008-06-08 23:28:28 +09:30
Peter Hutterer
c68ca0c7b2 xnest: switch to using EventList rather than xEvents. 2008-06-08 23:28:28 +09:30
Peter Hutterer
34429d16d3 xnest: call miDCInitialize rather than miPointerInitialize. 
This unfortunately gives us a lots of artefacts, so cursor rendering cannot be
assumed complete. But it's better than crashing.
 2008-06-08 23:28:28 +09:30
Peter Hutterer
585125685b ephyr: some whitespace changes. 2008-06-08 23:28:27 +09:30
Peter Hutterer
874dcdb3bd dmx: remove a ifndef XINPUT, XINPUT is always defined now. 2008-06-05 16:14:29 +09:30
Peter Hutterer
52752911ea dmx: don't free event list after use. 2008-06-05 16:14:23 +09:30
Peter Hutterer
5c5e581245 dmx: add an XFlush. 
Beats me why we need it, but without it we get segfaults lateron.
 2008-06-05 16:14:18 +09:30
Peter Hutterer
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
Peter Hutterer
17cd262257 dmx: don't dereference a nullpointer. 2008-06-05 16:13:58 +09:30
Peter Hutterer
75eb635e35 dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup 2008-06-05 16:13:44 +09:30
Peter Hutterer
3ff2f3a00e dmx: for now, don't acknowledge SDs. 2008-06-05 16:13:38 +09:30
Peter Hutterer
5bcd9e8953 dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard 2008-06-05 16:13:23 +09:30
Peter Hutterer
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
Peter Hutterer
6f1d5147cb dmx: fix a segfault caused by GC devPrivates never being initalised. 2008-06-05 16:13:12 +09:30
Peter Hutterer
d10ba4591a dmx: some more build fixes. 2008-06-05 16:13:03 +09:30
Jeremy Huddleston
40855d8000 XQuartz: Removed async debugging sleep 
(cherry picked from commit 7812a8bdf9)
 2008-06-04 12:24:15 -07:00
Jeremy Huddleston
ee86b75119 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling 
(cherry picked from commit ff1c443cad)
 2008-06-04 12:24:12 -07:00
Jeremy Huddleston
38da26cd36 XQuartz: Don't forget to destroy the mutex and cond after we're done with them 
(cherry picked from commit c3558bb8cd)
 2008-06-04 12:24:10 -07:00
Jeremy Huddleston
ea40fcf434 XQuartz: Fork for trigger 
(cherry picked from commit dd0f8a0f59)
 2008-06-04 12:24:06 -07:00
Jeremy Huddleston
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 7f840e9dc1)
 2008-06-04 12:24:04 -07:00
Peter Hutterer
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
Peter Hutterer
ac1db45449 xfree86: suspend signals while removing a device (corrected version). 
Block/Release is now symmetrical.
 2008-06-02 10:40:10 +09:30
Peter Hutterer
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
Tiago Vignatti
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
Peter Hutterer
f79ad5674e kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr 2008-05-31 18:46:35 +09:30
Peter Hutterer
942086fc96 dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it 2008-05-31 18:17:49 +09:30
Peter Hutterer
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
Paulo Cesar Pereira de Andrade
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
Peter Hutterer
3a1278907e xfree86: Bump XINPUT ABI to 3.0. 2008-05-26 18:14:31 +09:30
Peter Hutterer
26c1958c32 Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
Peter Hutterer
1883485edd If core motion history is required, scale back to screen coords and INT16. 2008-05-26 17:22:25 +09:30
Peter Hutterer
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
Peter Hutterer
00b4339168 dmx: remove some #if 0'd code. 2008-05-25 22:34:11 +09:30
Michel Dänzer
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
Julien Cristau
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
George Sapountzis
21a8052fdc glx: fix forgotten swrast -> SWRast 2008-05-23 22:40:26 +03:00
George Sapountzis
877e6c35ff glx: missing swrast is fatal 2008-05-23 22:40:26 +03:00
George Sapountzis
ae0504d34d kdrive: need not export symbols for glx anymore 2008-05-23 22:40:25 +03:00
Jeremy Huddleston
7082929ef7 XQuartz: A 2 second delay for launchd socket connections should be sufficient. 
(cherry picked from commit 2bb4251b3c)
 2008-05-23 02:32:37 -07:00
Jeremy Huddleston
225dddbaed XQuartz: Move the launchd display grabbing into mach_startup 
(cherry picked from commit c3866c98d2)
 2008-05-23 02:31:41 -07:00
Jeremy Huddleston
3a22190061 XQuartz: Fixed a few issues with fd passing... still not working =( 
(cherry picked from commit 7dd3512715)
 2008-05-23 02:31:38 -07:00
Peter Hutterer
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
Peter Hutterer
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
Dave Airlie
ea4ec9e998 int10: add pci_device_enable support on Linux 2008-05-22 08:58:42 +10:00
Kristian Høgsberg
4230b92744 Clean up remaining afb references. 2008-05-21 17:58:15 -04:00
Adam Jackson
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
Dan Nicholson
c76fddeea2 Fix up paths for GL/glx -> glx renaming 2008-05-21 10:51:15 -07:00
Kristian Høgsberg
a8a9b40e55 Move the windows GL files to the xwin DDX. 2008-05-21 12:36:25 -04:00
Kristian Høgsberg
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
Kristian Høgsberg
f558c7d4d1 Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest. 2008-05-21 12:15:18 -04:00
Kristian Høgsberg
77ff8fd507 Drop glcore GLX provider. 
Obsoleted by the DRI swrast driver.
 2008-05-21 12:15:18 -04:00
George Sapountzis
255142b61e drop xprint remnants: InitGlobals 2008-05-21 18:13:09 +03:00
Peter Hutterer
7509fb498c Merge branch 'hwcursor' into mpx 2008-05-21 16:25:35 +09:30
George Sapountzis
6ff6465931 Add loader for the swrast dri driver. 2008-05-20 16:38:05 -04:00
Alan Coopersmith
925e895b86 Restore return type on xf86SetScrnInfoModes 
Seems to have been accidentally lost by commit 	76943fec86
 2008-05-19 18:43:29 -07:00
Peter Hutterer
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
Adam Jackson
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
Jeremy Huddleston
bb687465d0 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server 
(cherry picked from commit cccee9cfc2)
 2008-05-19 02:47:18 -07:00
Jeremy Huddleston
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 2a72309c06)
 2008-05-19 02:47:17 -07:00
Jeremy Huddleston
e997df8cd3 XQuartz: Cleaned up ListenOnOpenFD... 
(cherry picked from commit 6fb587d3d5)
 2008-05-18 23:32:57 -07:00
Jeremy Huddleston
738672858d New XQuartz icon thanks to Simone Karin Lehmann 
(cherry picked from commit c27e0c8f3c)
 2008-05-18 23:32:56 -07:00
Jeremy Huddleston
4be2104c80 XQuartz: More work towards Mach-IPC startup... started working on FD passing 
(cherry picked from commit 27fbfeacfa)
 2008-05-18 22:45:19 -07:00
Julien Cristau
82c4075d4b xfree86: fix initial output positions with Above or LeftOf and rotation 
The fix in fa19e84714 was incomplete,
as it was still using the wrong output's initial rotation to compute
the position.
 2008-05-19 03:27:12 +02:00
Dave Airlie
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
Jeremy Huddleston
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 301262b070)
 2008-05-17 14:56:57 -07:00
Jeremy Huddleston
2408303d79 XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running. 
(cherry picked from commit 543c2cd68d)
 2008-05-17 14:56:53 -07:00
Jeremy Huddleston
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 c28fecc621)
 2008-05-17 14:56:34 -07:00
Jeremy Huddleston
1d09deaa6e XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init. 
(cherry picked from commit 5626b0949b)
 2008-05-17 14:56:30 -07:00
Jeremy Huddleston
adc62f62b9 Xquartz: Xquartz stub now can send Mach IPC to start the server. 
(cherry picked from commit 55a3bca8ea)
 2008-05-17 14:56:26 -07:00
Brad Smith
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
Adam Jackson
aad1c37b09 RANDR 1.1 compat: remove senseless comparison against the virtual size. 2008-05-16 11:10:33 -04:00
Adam Jackson
14726b776d xf86SetDesiredModes(): Skip disabled CRTCs first thing. 2008-05-16 11:10:33 -04:00
Adam Jackson
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
Adam Jackson
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
Adam Jackson
a4bbe1c8bc Re-add sync range inference from legacy setup to RANDR 1.2. 2008-05-16 11:10:32 -04:00
Adam Jackson
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
Peter Hutterer
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
Peter Hutterer
f611719edc xfree86: always render first cursor in HW, all others in SW. 2008-05-16 20:17:21 +09:30
Peter Hutterer
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
Tiago Vignatti
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
Tiago Vignatti
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
Brian Rogers
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
Adam Jackson
166177e36b Simplify default font path setup. 2008-05-14 16:02:05 -04:00
Jeremy Huddleston
cbb4e80eb7 XQuartz: More work on the Mach-IPC startup path 
(cherry picked from commit 49cd0b185f)
 2008-05-14 01:16:04 -07:00
Jeremy Huddleston
3b57c59bb0 Xquartz: More work on the new Mach startup 
(cherry picked from commit 6237acf75d)
 2008-05-14 01:16:01 -07:00
Jeremy Huddleston
e435acc84c Added missing to EXTRA_DIST 
(cherry picked from commit e39613f463)
 2008-05-14 01:15:58 -07:00
Jeremy Huddleston
f7d6d20ad6 XQuartz: Cleaned up the about box. 
(cherry picked from commit 0279a59706)
 2008-05-14 01:15:56 -07:00
Jeremy Huddleston
b37e1f1f5c Don't need the fink-friendly printf in the DDX anymore. 
(cherry picked from commit fe22794404)
 2008-05-14 01:15:54 -07:00
Peter Hutterer
68b4f250ee dmx: fix build. 
Just because it builds, doesn't mean it works.
 2008-05-14 16:18:48 +09:30
Peter Hutterer
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
Peter Hutterer
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
Adam Jackson
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
Adam Jackson
1c8bd318fb X n'est pas une print API. 2008-05-12 14:15:11 -04:00
Jeremy Huddleston
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 78032815ae)
 2008-05-12 10:42:20 -07:00
Jeremy Huddleston
ac4e33a9cd XQuartz: More startup work... listen if we're the actual server 
(cherry picked from commit 3b0afb47c3)
 2008-05-12 10:42:16 -07:00
Jeremy Huddleston
a7800d9355 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support 
(cherry picked from commit 9b67fca9b7)
 2008-05-12 10:42:12 -07:00
Dave Airlie
3b6735528e pci: don't do this pci stuff when we don't have hw access 2008-05-12 16:36:42 +10:00
Julien Cristau
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
Drew Parsons
7b3066d9b9 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental 2008-05-10 00:01:15 +10:00
Drew Parsons
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
Jeremy Huddleston
315f089056 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work. 
(cherry picked from commit 2232c91d5c)
 2008-05-08 19:58:24 -07:00
Jeremy Huddleston
a07c5ad172 XQuartz: Set bundle version to 2.3.0 
(cherry picked from commit 8a0524b30e)
 2008-05-08 19:58:15 -07:00
Jeremy Huddleston
05f23ed3ea XQuartz: Fixed some issue in our bundle creation 
(cherry picked from commit 330ffad547)
 2008-05-08 19:58:09 -07:00
Adam Jackson
f17ba5d584 Bug #13104: Remove broken XAA a1 glyph fast path. 2008-05-08 16:04:24 -04:00
Adam Jackson
ddaecfa13c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2008-05-08 14:33:58 -04:00
Daniel Stone
641a5f955b Build: Ensure xf86DefModeSet.c ends in an empty line 
This shuts up a warning.
 2008-05-07 22:29:04 +03:00
Adam Jackson
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
Adam Jackson
718652eaf9 Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory. 
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code.  Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.

Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
 2008-05-06 17:52:37 -04:00
Jeremy Huddleston
a85d3ac87c XQuartz: Fixed typo 
(cherry picked from commit 56b7988d26)
 2008-05-06 03:04:13 -07:00
Jeremy Huddleston
077ced6384 XQuartz: Added uncommitted files 
(cherry picked from commit e414ec462c)
 2008-05-06 03:04:09 -07:00
Jeremy Huddleston
80e502c5d1 Fixed up dist 
(cherry picked from commit f225222ba2)
 2008-05-06 03:04:04 -07:00
Jeremy Huddleston
7295e54433 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite 
(cherry picked from commit 453a982e63)
 2008-05-06 02:49:48 -07:00
Ben Byer
d41d677ab4 Xquartz: experimental embedding of Sparkle.framework 
(cherry picked from commit b7a1a640ce)
 2008-05-06 02:49:41 -07:00
Peter Hutterer
9e0d73fd8a xfree86: call SetCursor for the VCP when switching between SW/HW rendering. 
We need a manual call to SetCursor when we switch from SW to HW rendering and
the other way round. This way we display the new cursor after removing the old
one.
In addition, we only update the internal state for the VCP's sprite. This way,
when we switch back to HW rendering the state is up-to-date and wasn't
overwritten with the other sprite's state.

The second part is a hack. It would be better to keep a state for each sprite,
but then again we don't have hardware that can render multiple cursors so we
might as well do with the hack.
 2008-05-06 17:52:15 +09:30
Dave Airlie
e4ebfed178 xf86edid: fix typo in debug output 2008-05-06 16:47:18 +10:00
Peter Hutterer
b9c1a57e7a xfree86: switch between to SW cursors if more than 1 sprite is available. 
Switches back to HW cursors when sprites other than the VCP are removed.
The current state requires the cursor to change shape once before it updates
to SW / HW rendering (whatever is appropriate), e.g. by moving into a
different window. Until this is done, the cursor is invisible.
 2008-05-06 14:51:23 +09:30
Peter Hutterer
3df88c17e3 xfree86: re-enable hardware cursor (for a single cursor) 
This commit enables HW rendering for cursors again, but only for a single
cursor. Other cursors can be created, however they will not be visible.
 2008-05-06 11:50:20 +09:30
Aaron Plattner
d500eeb945 Xephyr: Handle depth 30 and reject higher depths rather than crashing. 2008-05-04 10:26:25 -07:00
Jeremy Huddleston
f4a68f3701 XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values 
(cherry picked from commit 8d9eab3a2e)
 2008-05-02 17:42:41 -07:00
Jeremy Huddleston
96fa7da3b8 XQuartz: Avoid a possible crash at startup due to unfavorable context switching. 
(cherry picked from commit ff10c37bdd)
 2008-05-02 17:42:36 -07:00
Peter Hutterer
6f63724b28 xfree86: don't try to repaint the cursor before cursors exist. 2008-05-02 14:56:58 +09:30
Peter Hutterer
3344569529 Merge branch 'master' into mpx 
Conflicts:

	Xi/exevents.c
	dix/devices.c
 2008-05-02 11:00:14 +09:30
Jeremy Huddleston
a338007be6 XQuartz: Adjust the screen origin offset properly for multimonitor setups 
(cherry picked from commit f2020b9836)
 2008-05-01 18:04:18 -07:00
Paulo Cesar Pereira de Andrade
01c61f3d97 xorgcfg: Fix a crash if xorg.conf doesn't have a Files section. 
This patch only creates a Files section if required, so if no entries are
added, an empty Files section will not be created.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-05-01 15:55:15 +09:30
Paulo Cesar Pereira de Andrade
6899ff81e8 Fix an off by one read error in drmSIGIOHandler(). 
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-05-01 10:14:30 +09:30
Jeremy Huddleston
ec0419b505 XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h 
(cherry picked from commit 1fcf74a436)
 2008-04-30 17:33:11 -07:00
Kazuhiro Inaoka
ce36ae526d Add M32R architecture support (bug #10020) 
Still needs autotools support, so this won't actually _build_: it's just
a starting point.
 2008-04-30 11:58:32 +03:00
Ben Byer
b71b51c982 xquartz: created darwinTablet, to represent tablet events 
(cherry picked from commit 50641bce73)
 2008-04-29 23:59:34 -07:00
Ben Byer
519581b0ba xquartz: remove unused params from DarwinEQInit 
(cherry picked from commit 299a056737)
 2008-04-29 23:59:31 -07:00
Jeremy Huddleston
d70487a4c0 XQuartz: Fix to tablet-event handling code; we now scale 
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecc)
 2008-04-29 23:59:26 -07:00
Hong Liu
f65a1a62f9 Keep rotation wrappers in place while transforms are in use 
LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
this, the presense/absence of that data is insufficient to know whether
the screen function wrappers are necessary. Instead, the 'transform_in_use'
flag should be used.

This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
time to free the rotation data; it will be reallocated on EnterVT.
 2008-04-29 09:00:11 -07:00
Peter Hutterer
ec2fca7e6f xfree86: DGA needs to call into Xi. 
Two steps: first use UpdateDeviceState() instead of replicating the device
changing code. And emulate XI events instead of core events.
 2008-04-29 14:53:20 +09:30
Jeremy Huddleston
d5ab89f4f1 XQuartz: Unset CFProcessPath... blech 
(cherry picked from commit ce4fbfbc75)
 2008-04-28 15:55:01 -07:00
Jeremy Huddleston
0c2312b21b XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m) 
(cherry picked from commit 22cf724376)
 2008-04-28 15:42:12 -07:00
Jeremy Huddleston
c3dc4bdbb0 XQuartz: Disabled DPMS extension 
(cherry picked from commit 1448fed9b6)
 2008-04-28 15:42:02 -07:00
Jeremy Huddleston
07382a70c7 XQuartz: Added thread debugging to xprFrame.c 
(cherry picked from commit 41542502b3)
 2008-04-28 15:40:22 -07:00
Jeremy Huddleston
e973430608 XQuartz: More startup / threading house cleaning. 
(cherry picked from commit 72653c24c0)
 2008-04-28 11:49:19 -07:00
Jeremy Huddleston
4b46fc931e XQuartz: Updated Localizable.strings 
(cherry picked from commit d8d9c866b9)
 2008-04-28 11:49:18 -07:00
Jeremy Huddleston
4017ebe5bf XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST 
(cherry picked from commit 03e707987f)
 2008-04-28 11:49:16 -07:00
Jeremy Huddleston
0bd28315af Xquartz: Added missing to EXTRA_DIST 
(cherry picked from commit f4b963256f)
 2008-04-26 23:19:33 -07:00
Jeremy Huddleston
ef1c520537 XQuartz: Cleaned up startup and thread creation a tad. 
(cherry picked from commit c861fe00e1)
 2008-04-26 19:21:05 -07:00
Jeremy Huddleston
b114d4e861 XQuartz: Don't subtract the titlebar off of the pointer_y 
(cherry picked from commit 00a9567acc)
 2008-04-26 17:05:34 -07:00
Jeremy Huddleston
b9ca789635 XQuartz: Added some pseudoramiX debug traces 
(cherry picked from commit 5bee1585a3)
 2008-04-25 18:04:22 -07:00
Peter Hutterer
e251c9e75a Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
Jeremy Huddleston
0209e46249 XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging. 
(cherry picked from commit 515b8b855a)
 2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b XQuartz: Cleaned up multi-monitor support. 
(cherry picked from commit c05abf0a19)
(cherry picked from commit 9112f29043)
 2008-04-24 23:50:21 -07:00
Peter Hutterer
f5ac98747d Standardise copyright headers for all new files created as part of MPX. 2008-04-25 14:50:24 +09:30
Peter Hutterer
9ab4e2fd8e xfree86: don't free the config-file related information in DIDR. #15645 
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.

This is an addon to 6d22a9615a, an attempt to
fix Bug 14418.

X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
 2008-04-24 14:19:28 +09:30
Peter Hutterer
7dc40c8eca xfree86: Don't free master devices. 
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
 2008-04-24 12:47:29 +09:30
Jeremy Huddleston
d09c520b32 Moved Apple GL bits into our DDX subtree 
(cherry picked from commit c9356f3289)
 2008-04-23 10:22:34 -07:00
Jeremy Huddleston
b05b416c62 XQuartz: No need to include indirect.c a second time 
(cherry picked from commit 41ed532525)
 2008-04-23 10:17:13 -07:00
Ben Byer
4e3a8af575 xquartz: clean up linker line for main binary 
(cherry picked from commit 821d7400f2)
 2008-04-23 10:16:55 -07:00
George Sapountzis
00effad583 xephyr: XEPHYR_DRI is identical to XF86DRI 2008-04-23 18:11:56 +03:00
George Sapountzis
6a9f7f28ec xephyr: sync with mesa 2008-04-23 18:11:56 +03:00
George Sapountzis
7ffc68c5cc xephyr: libGL is client lib 2008-04-23 18:11:56 +03:00
George Sapountzis
a27c244d72 xephyr: Makefile cleanup 2 2008-04-23 18:11:56 +03:00
George Sapountzis
d4d19b2f22 xephyr: Makefile cleanup 1 2008-04-23 18:11:56 +03:00
George Sapountzis
a88c6b6646 glcore: drop GLcore (files) 2008-04-23 18:11:55 +03:00
George Sapountzis
dd7a53f8f2 glcore: drop GLcore (build system) 2008-04-23 18:11:55 +03:00
George Sapountzis
567d389d47 glcore: build from mesa, dlopen from xorg 
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
 2008-04-23 18:11:55 +03:00
George Sapountzis
efb723e166 glcore: prepare for dynamic loading 
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
        DLOPEN_LIBS - to dlopen the glcore dso
        LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use

the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
 2008-04-23 18:11:55 +03:00
Julien Cristau
fbad87f2ae autoconfig: don't call closedir() when opendir() failed 
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
 2008-04-23 14:59:24 +02:00
Jeremy Huddleston
76381092e8 XQuartz: Make sure QuartzAudioInit() gets run. 
(cherry picked from commit bb3d034675)
(cherry picked from commit 824b31c7f8)
 2008-04-23 02:22:28 -07:00
Peter Hutterer
275cdc1c74 xfree86: pass correct value to mieqEnqueue (merge detritus I guess) 2008-04-23 16:16:15 +09:30
Ross Burton
e77f65768e Reuse the existing framebuffer mode in kdrive/fbdev 
When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
that unless told otherwise.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
 2008-04-22 18:07:46 +01:00
Ross Burton
c4fd112153 Add mediumraw support to the linux kdrive driver 
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
 2008-04-22 18:05:53 +01:00
Ross Burton
455383db95 Enable the epson kdrive driver 
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
 2008-04-22 18:04:31 +01:00
Ross Burton
20a90bef8b Add a default touchscreen path 
When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
specified.
 2008-04-22 16:37:02 +01:00
Peter Hutterer
8190ef8754 Merge branch 'master' into mpx 
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
 2008-04-22 18:04:05 +09:30
Peter Hutterer
2ddbfd3457 xnest: re-enable XKB support. #10015 
XKB was disabled in 08928afb05, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.

X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>
 2008-04-22 16:32:56 +09:30
Jeremy Huddleston
a8b8700c73 XQuartz: Fixed cmd-tab to bring all windows forward. 
(cherry picked from commit e48e2ce931)
 2008-04-21 23:45:00 -07:00
Jeremy Huddleston
590688131d XQuartz: Fixed quit dialog to be more conforming with HIG. 
(cherry picked from commit 14c6b837bb)
 2008-04-21 19:08:30 -07:00
Ben Byer
570b0dca26 Fix for pointer-offset issue when using a multi-display environment on X11.app. 
(cherry picked from commit 9a7e14286c)
 2008-04-21 17:55:19 -07:00
Jordan Crouse
4fa89fbe18 xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode' 2008-04-21 12:09:00 -06:00
Julien Cristau
40c6be1408 Minor xorg.conf manpage fixups 
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
 2008-04-20 20:36:44 +02:00
Jeremy Huddleston
4bcfed2f9c Revert "Removed XWin DDX" 
This reverts commit 6550078b09.

Doctor, I'm starting to get a pulse...
 2008-04-20 08:35:42 -07:00
Jeremy Huddleston
14396fdeba XQuartz: Cleanup turning off COMPOSITE 
(cherry picked from commit 8f920fca6f)
 2008-04-20 01:24:54 -07:00
Jeremy Huddleston
d13828797f XQuartz: Cleaned up some casting to get rid of compiler warnings 
(cherry picked from commit 6f1c85b965)
 2008-04-20 01:24:51 -07:00
Jeremy Huddleston
6550078b09 Removed XWin DDX 2008-04-19 09:29:46 -07:00
Jeremy Huddleston
ed9dabb47c Last of the spam... I promise... 
(cherry picked from commit 45ebee4f72)
 2008-04-18 20:31:06 -07:00
Jeremy Huddleston
49f2bb4681 XQuartz: More sanitization of the namespace 
(cherry picked from commit bc50d41f9d)
 2008-04-18 20:25:38 -07:00
Jeremy Huddleston
c2f0d020b5 XQuartz: Removed unneccessary include 
(cherry picked from commit 45ff59e69e)
 2008-04-18 20:12:05 -07:00
Jeremy Huddleston
5183fea6d3 XQuartz: Handled sanitization of namespace better 
(cherry picked from commit 8cb23d6721)
 2008-04-18 20:07:55 -07:00
Ben Byer
edd3fb784b random flailing 
(cherry picked from commit 7fb9b2dc61)
 2008-04-18 20:07:41 -07:00
Adam Jackson
a7503615a6 Death to TOG-CUP. 
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
 2008-04-18 19:56:41 -04:00
Eric Anholt
25827fde68 Nuke the MIT-SUNDRY-NONSTANDARD extension. 
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
 2008-04-18 16:37:08 -07:00
Adam Jackson
eafaf40fb3 Death to APPGROUP. 2008-04-18 18:50:05 -04:00
Adam Jackson
f6617b4127 Death to Extended Visual Information. 2008-04-18 18:28:01 -04:00
Jeremy Huddleston
c14f5dc237 XQuartz: Forgot to commit xprEvent.[hc] ... 
(cherry picked from commit 70e543baf2)
 2008-04-17 20:31:24 -07:00
Ben Byer
22bb7608a0 Added XKB support for Xquartz 
(cherry picked from commit 56dc121520)
 2008-04-17 17:25:55 -07:00
Jeremy Huddleston
652479dba3 XQuartz: Moved some rootless-specific cruft into xpr 
(cherry picked from commit 31625cc03b)
 2008-04-17 15:50:11 -07:00
Jeremy Huddleston
2a1ba20af9 XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time. 
(cherry picked from commit 7b087c965b)
 2008-04-17 15:24:35 -07:00
Jeremy Huddleston
55f80d7545 XQuartz: A little more debugging output from threadSafety 
(cherry picked from commit f6fbdbf838)
 2008-04-17 15:24:33 -07:00
Jeremy Huddleston
0d61f6fca1 XQuartz: Fixed some missing prototypes 
(cherry picked from commit 95056afc56)
 2008-04-17 13:21:13 -07:00
Jeremy Huddleston
dbd4c03156 XQuartz: Added framework for asserting which thread we're in. 
(cherry picked from commit 00beb98251)
 2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549 XQuartz: Include version info for CrashReporter 
(cherry picked from commit b4992755c3)
 2008-04-17 11:57:45 -07:00
Jeremy Huddleston
6d11712c2a XQuartz: Use strerror(errno)... cause I like text more than grepping header files 
(cherry picked from commit 1b4c37d8f9)
 2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc merged darwinKeyboard.[ch] into quartzKeyboard 
(cherry picked from commit 57bb073209)
 2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02 oops, missed a spot 
(cherry picked from commit 19872a6aeb)
 2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc formatting cleanup 
(cherry picked from commit 769acd2934)
 2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226 delete debugging spew 
(cherry picked from commit f04f3af86a)
 2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25 add support for horizontal scrolling (buttons 6 and 7) 
(cherry picked from commit f525a4a432)
 2008-04-17 10:41:50 -07:00
Ben Byer
612e901ef6 enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm 
(cherry picked from commit ab662c736e)
 2008-04-17 10:41:46 -07:00
Ben Byer
5bdfbfbedc darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx 
(cherry picked from commit a8a090b853)
 2008-04-17 10:41:42 -07:00
Ben Byer
58e42683c9 hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels 
(cherry picked from commit cab54466a6)
 2008-04-17 10:41:38 -07:00
Ben Byer
cd3470a0cf kludge: miEqEnqueue wants a device, even if we're passing custom messages, 
so give it one
(cherry picked from commit a494ff04b2)
 2008-04-17 10:41:30 -07:00
Drew Parsons
966ae1781f Create dix/libXpdix.la for Xprint-specific build of libdix.la 
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
 2008-04-18 01:20:36 +10:00
Drew Parsons
571206832d Define XPRINT in XPRINT_CFLAGS (configure.ac) 
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
 2008-04-18 01:14:01 +10:00
Jeremy Huddleston
8716d081fd XQuartz: Don't enable rootless accelerated functionality... crashy... 
(cherry picked from commit cdb4c291d8)
 2008-04-16 23:14:06 -07:00
Jeremy Huddleston
2ffdb0eb64 XQuartz: Don't use composite. 
(cherry picked from commit 6d3d344b5b)
 2008-04-16 21:54:00 -07:00
Jeremy Huddleston
757a1bf3a3 Xquartz: Don't need to link against rlAccel since we don't use it 
(cherry picked from commit 180ec128ad)
 2008-04-16 21:53:03 -07:00
Jeremy Huddleston
9e7ced94a5 XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread 
(cherry picked from commit cb27d5ca82)
 2008-04-15 12:06:07 -07:00
Kristian Høgsberg
35982bc109 Make DRI2 a serverlayout/serverflags option. 
Add xf86DRI2Enabled() to export the value of the setting.
 2008-04-14 15:23:57 -04:00
Matt Turner
1fa4de80fc Check for __x86_64__ when we check for __amd64__ 
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
 2008-04-12 20:39:18 +02:00
Jeremy Huddleston
b1f3f42840 Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking 
(cherry picked from commit 55d9973b05)
 2008-04-11 17:50:04 -07:00
Adam Jackson
0dab6fa358 So long, and thanks for all the cfb. 2008-04-11 09:47:51 -04:00
Peter Hutterer
6d22a9615a dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418) 
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.

This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.

X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
 2008-04-11 18:45:32 +09:30
Eric Anholt
a7e3ad1c6b Remove NDEBUG (assert() disable) define from the X Server. 
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead.  There should be no ABI consequences
to this change.

The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h.  As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
 2008-04-10 10:35:14 -07:00
Peter Hutterer
df2545b98d xfree86: Sanity check before retrieving the paired device. 
Some pointer devices send key events [1], blindly getting the paired device
crashes the server. So let's check if the device is a pointer before we try to
get the paired device.

[1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
the pointer device, not through the keyboard device.
 2008-04-10 08:50:43 +09:30
Dave Airlie
b19027fbae quirk: add quirk for ACR 640x350 default mode is wrong 
RH #440186
 2008-04-09 14:34:11 +10:00
Ben Byer
1f8188656a add missing dix-config include 
(cherry picked from commit 126e9bc8c4)
 2008-04-08 21:25:15 -07:00
Jeremy Huddleston
3f51f493b6 XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space. 
(cherry picked from commit df21312c8b)
(cherry picked from commit 2d4194a8d1)
 2008-04-08 17:03:18 -07:00
Peter Hutterer
fd06e8f8c1 Merge branch 'master' into dcdc_rework 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
 2008-04-07 07:56:41 +09:30
Sascha Hlusiak
539bf3c283 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2008-04-07 00:10:16 +02:00
Sascha Hlusiak
3ab33e7cd4 Remove stale code 
The jstk code for Joysticks is not used by any module, was never actually compiled and uses an API
that is deprecated these days.

No reason to keep it.
 2008-04-06 23:23:47 +02:00
Adam Jackson
cc7c045bae Fix PCI config space cycles from int10 emulator. 
The top bit of 0xCF8 is an enable bit, not part of the domain.  Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
 2008-04-04 12:58:12 -04:00
Kristian Høgsberg
16a8ce7558 Only autoload RECORD if it was enabled. 2008-04-04 10:47:46 -04:00
Dave Airlie
f0915fb3c4 quirk: add quirk for ACER EDID 2008-04-04 09:59:40 +10:00
Jeremy Huddleston
2e42b67b82 XQuartz: Change reporting of space change to debug log rather than stderr 
(cherry picked from commit ed15556a9f)
 2008-04-02 18:05:55 -07:00
Ben Byer
c737d04c75 The AppKit thread should not be calling directly into the X server 
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806f)
 2008-04-02 17:48:24 -07:00
Ben Byer
15b0084f1a formatting cleanup for X11Application.m (no code changes) 
(cherry picked from commit eb083d3f68)
 2008-04-02 17:48:15 -07:00
Ben Byer
e9e2d88436 moved and renamed QuartzMessageServerThread to 
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377ef)
 2008-04-02 17:48:01 -07:00
Ben Byer
c1be4e3379 shovelling code around ... 
(cherry picked from commit 2143182ba4)
 2008-04-02 17:47:59 -07:00
Ben Byer
985c631b2e just a bit of juggling headers around -- we're preparing 
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa7)
 2008-04-02 17:47:57 -07:00
Ben Byer
89f1d880e8 nuke DarwinEventQueue 
(cherry picked from commit 1e0ec02202)
 2008-04-02 17:47:52 -07:00
Jeremy Huddleston
8944b77ec0 continue with gutting darwinEvents.c 
(cherry picked from commit c34fce7051)
 2008-04-02 17:47:42 -07:00
Jeremy Huddleston
aa6d12e93e turns out we weren't actually using these files. oops 
(cherry picked from commit bfec44d7b4)
 2008-04-02 17:46:59 -07:00
Ben Byer
6c5962e447 remove vestigal DarwinEQPointerPost etc 
(cherry picked from commit a25704c423)
 2008-04-02 17:45:28 -07:00
Ben Byer
c6f0d5d1e5 gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment) 
(cherry picked from commit a9e081a60c)
 2008-04-02 17:45:23 -07:00
Ben Byer
5b6c273eaa add prototype for DarwinEventHandler 
(cherry picked from commit 9a03ae33c4)
 2008-04-02 17:45:20 -07:00
Ben Byer
3713be8b47 add logging of current thread ID to DEBUG_LOG macro 
(cherry picked from commit 5848510cc5)
 2008-04-02 17:45:17 -07:00
Ben Byer
1400a51ae7 Begin to move all of our Xquartz DDX-specific event handlers 
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f)
 2008-04-02 17:45:09 -07:00
Jeremy Huddleston
8746daa673 XQuartz: Fixed missing close-paren in preference pane text. 
(cherry picked from commit ea37e151dc)
 2008-04-02 17:33:22 -07:00
Kristian Høgsberg
b5a0a865c3 Pick up dri2proto from the standard proto header include path. 2008-04-02 19:21:41 -04:00
Kristian Høgsberg
7c20f65fea Add @XORG_CFLAGS@ to satisfy xf86* includes. 
Pointed out by Hasso Tepper.
 2008-04-02 19:08:33 -04:00
Xiang, Haihao
b31de6a590 dri2: fix crasher if DRI2Connect fails 2008-04-02 16:29:30 +10:00
Hong Liu
ebc56aca8b Bug #15160: quirk Proview AY765C 
prefer first detailed timing
 2008-04-02 10:46:03 +08:00
Goneri Le Bouder
9500033b9e xfree86: don't crash in AutoConfig if the primary device is not pci 
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823).
 2008-04-01 20:23:38 +02:00
Ben Byer
a4d0349411 Add code to track 5 valuators for pointing device, in preparation 
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
 2008-03-31 16:44:23 -07:00
Ben Byer
6648867d8b add debug statements so we can see if/when our Xinput stubs are getting called. 
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
 2008-03-31 16:44:22 -07:00
Ben Byer
19ff23ab0e Remove calls to InitValuatorAxisStruct -- these are now handled in dix by 
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
 2008-03-31 16:44:21 -07:00
Kristian Høgsberg
c40e0b51f0 Implement DRI2 direct rendering and update AIGLX to DRI interface changes. 
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext.  Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.

Add protocol code to DRI2 module and load DRI2 extension by default.
 2008-03-31 16:50:58 -04:00
Jeremy Huddleston
b8ea9f2a25 XQuartz: Fixed names of enums to be more consistent 
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
 2008-03-28 17:03:20 -07:00
Jeremy Huddleston
bd28839eb8 =?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows 
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
 2008-03-28 17:03:19 -07:00
Adam Jackson
933ffcdf7d Compile fix. 2008-03-28 17:53:55 -04:00
Adam Jackson
9e8451d869 Add E-EDID segment selection. 2008-03-28 17:43:10 -04:00
Adam Jackson
0b4aef4d6d Refactor DDC2 code to allow for proper segmented addressing. 2008-03-28 17:43:01 -04:00
Adam Jackson
88ece11d6c Start E-EDID support in the DDC module. 
Since there's no way to safely know how many blocks xf86DoEDID_DDC2 would
return, add a new xf86DoEEDID entrypoint to do that, and implement the
one in terms of the other.
 2008-03-28 17:39:23 -04:00
Eamon Walsh
b5f98fcea2 XSELinux: Add xorg.conf option for permissive/enforcing/disabled. 
Patch by Joe Nall.

The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
 2008-03-28 14:14:23 -04:00
Jeremy Huddleston
415e49b940 XQuartz: Sanity-check the removal of the 256-color option 
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490)
 2008-03-27 19:22:07 -07:00
Ben Byer
c1d37efe9a xquartz: copy in new stubs from Xi/stubs.c to replace our old 
Xinput stubs.  Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
 2008-03-27 19:14:50 -07:00
Ben Byer
c4a616a741 prevent "fake mouse clicks" from generating spurious extra events 
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
 2008-03-27 19:14:39 -07:00
Dave Airlie
c747030a49 quirk: fix LPL monitors properly. 
no point having a h cm fix when we really want to copy the sizes from the
other place.

RH BZ 435216
 2008-03-27 15:19:52 +10:00
David Nusinow
f028e245a7 Bug #10016: Implement WM_CLASS hints in Xephyr. 2008-03-24 16:06:33 -04:00
Adam Jackson
862ff9ac92 Bug #11510: Fix build without RECORD. 2008-03-24 13:37:42 -04:00
Adam Jackson
87bfd3bd96 Bug #11508: Fix build without XV. 2008-03-24 13:33:38 -04:00
Julien Cristau
4217ba0cf0 xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet 
The latter doesn't return the option's value, just whether it's present
in the configuration.
 2008-03-22 17:53:45 +01:00
Julien Cristau
6b9d2bb1f7 exa: use xf86ReturnOptValBool instead of xf86IsOptionSet 
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration.  So using Option "EXANoComposite" "false"
disabled composite acceleration.
 2008-03-22 17:28:48 +01:00
Jeremy Huddleston
6385947396 XQuartz: Disable 256 color option and fullscreen option 
(cherry picked from commit 7c1964338a)
 2008-03-21 19:37:49 -07:00
Jeremy Huddleston
93daa3a3bf Xquartz: Added separate preference tab for quartz-wm settings 
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7)
 2008-03-21 19:37:46 -07:00
Jeremy Huddleston
c49e112683 XQuartz: Initial framework for dealing with spaces on OS-X 
(cherry picked from commit 9831324998)
 2008-03-21 19:37:42 -07:00
Jeremy Huddleston
4c76607b69 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman 
(cherry picked from commit f03202ad15)
 2008-03-21 19:33:21 -07:00
Jeremy Huddleston
87c64cfd69 =?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2) 
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
 2008-03-21 19:33:21 -07:00
Michel Dänzer
da973e962d Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB 
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.

Correct patch this time :)
 2008-03-20 09:18:29 -04:00
Alex Deucher
f8c1eb29e2 Revert "Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB" 
This reverts commit 2673525796.

Pushed the wrong patch.
 2008-03-20 09:14:41 -04:00
Michel Dänzer
2673525796 Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB 
See bug 11796
 2008-03-19 19:12:37 -04:00
Dodji Seketeli
cdadd2ff9b [Xephyr/DRI] correctly route motion events targeted at GL drawable 2008-03-18 14:02:41 +01:00
Jesse Barnes
afd7428690 Cleanup logic in xf86PrepareOutputs 
Should have done this in the first place.  Since we're checking for the absence
of the get_crtc callback in the first place, we'll short circuit the later call
and disable the output, so the ugly "continue" block is unnecesary.
 2008-03-17 14:55:44 -07:00
Jesse Barnes
ba85caacb5 Make xf86SetDesiredModes aware of current output configuration 
By adding a new output callback, ->get_crtc, xf86SetDesiredModes is able to
avoid turning off outputs & CRTCs if the current output<->CRTC mappings are the
same as the desired configuration.  This helps avoid flickering displays at
startup time, which speeds things up a little and looks better.
 2008-03-17 14:13:09 -07:00
Jesse Barnes
bee2ddf35f Fail CRTC configuration if !vtSema 
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash.  So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.

Fixes #14444.
 2008-03-17 08:33:01 -07:00
Matthieu Herrb
db248ffb84 test for the presence of pci_system_init_dev_mem() before calling it. 
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
 2008-03-16 18:46:11 +01:00
Donnie Berkholz
aa231f28d5 Xephyr: Build fix: Port across XF86dri.c changes from Mesa. 2008-03-14 18:43:41 -07:00
Donnie Berkholz
a955c3b587 Xephyr: Distribute ephyrdriext.h in tarballs. 2008-03-14 18:43:40 -07:00
Adam Jackson
57d48d94b8 Fix a stray use of ALLOCATE_LOCAL. 2008-03-14 14:46:03 -04:00
Adam Jackson
8248537722 RANDR 1.2: Fix initial mode aspect ratio match in a corner case. 
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor.  But let's not
split hairs.
 2008-03-14 14:24:21 -04:00
Bart Trojanowski
1b9878ffcf Bug #14332: Fix PCI access cycles from x86emu. 
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to.  However, we would ignore that and always send the
cycle to the device whose BIOS we were running.  This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
 2008-03-13 17:42:16 -04:00