Commit Graph

4115 Commits

Author SHA1 Message Date
Daniel Stone
2989f10716 Prevent the -wm command line option from causing a SEGV
The -wm (when mapped) option for the BackingStore support has been
causing the server to dereference a NULL pointer.

This has probably been the case since backing store has been
implemented on top of Composite.

It looks like (some of?) Composite didn’t expect its WIndowPtr
argument to be the root window.

In Composite’s compCheckRedirect() function we now avoid calling
compAllocPixmap() and compFreePixmap() when the pWin pointer’s
parent member is NULL, as is it the case with a server’s root window.

This addresses:

https://bugs.freedesktop.org/show_bug.cgi?id=15878
(cherry picked from commit 04211c3532)
2008-05-16 19:49:05 +03:00
Adam Jackson
33a9ee9ba0 Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
(cherry picked from commit 536f2ff538)
2008-05-16 17:26:57 +03:00
Adam Jackson
a08f848d4c Bump DEFAULT_DPI to 96.
75 is just nonsense.
(cherry picked from commit db9ae86353)
2008-05-16 17:26:53 +03:00
Adam Jackson
d5a7badd6a Fix hal shutdown crash.
Removing the device invalidates its ->next pointer.  Copy it aside before
destroying the device.
(cherry picked from commit f52f6c5c7e)
2008-05-16 17:20:08 +03:00
Eric Anholt
458b487723 Fix overly-restrictive integer overflow check in EXA pixmap creation.
The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
created, due to treating a pitch value as a width.
(cherry picked from commit bc2d516f16)
2008-05-16 17:20:08 +03:00
Michel Dänzer
2621380cf6 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 :)
(cherry picked from commit da973e962d)
2008-05-16 17:20:08 +03:00
Donnie Berkholz
9db5401d69 xprint: fix linking by including XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
1022c7774b xprint: fix build by adding {New,Delete}InputDeviceRequest. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
9df3886354 xephyr: fix linking by adding pixman and using XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
6c5c1c5c98 dmx: link in XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
71f0711f40 dmx: fix build by adding {New,Delete}InputDeviceRequest. 2008-05-16 17:20:07 +03:00
Jeremy Huddleston
27fbfeacfa XQuartz: More work towards Mach-IPC startup... started working on FD passing 2008-05-15 12:26:32 -07:00
Jeremy Huddleston
543c2cd68d XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running. 2008-05-15 09:55:17 -07:00
Jeremy Huddleston
c28fecc621 XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
Need to setup configs for the quartz keyboard
2008-05-15 07:08:21 -07:00
Jeremy Huddleston
5626b0949b XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init. 2008-05-15 05:49:43 -07:00
Jeremy Huddleston
55a3bca8ea Xquartz: Xquartz stub now can send Mach IPC to start the server. 2008-05-14 01:33:43 -07:00
Jeremy Huddleston
49cd0b185f XQuartz: More work on the Mach-IPC startup path 2008-05-14 01:13:15 -07:00
Jeremy Huddleston
3251fb54cd Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-05-14 00:33:17 -07:00
Alan Coopersmith
d0554a5748 When XKB fails to open rules file, log the file name, not the NULL file pointer
(cherry picked from commit 7cdc19b29d)
2008-05-13 18:11:20 -07:00
Jeremy Huddleston
6237acf75d Xquartz: More work on the new Mach startup 2008-05-13 10:40:20 -07:00
Jeremy Huddleston
e39613f463 Added missing to EXTRA_DIST 2008-05-12 17:57:07 -07:00
Jeremy Huddleston
0279a59706 XQuartz: Cleaned up the about box. 2008-05-12 13:36:35 -07:00
Jeremy Huddleston
fe22794404 Don't need the fink-friendly printf in the DDX anymore. 2008-05-12 11:34:06 -07:00
Jeremy Huddleston
4ee20bf395 XQuartz: 1.4.0-apple11 2008-05-12 10:37:42 -07:00
Jeremy Huddleston
78032815ae 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 2008-05-12 10:36:44 -07:00
Jeremy Huddleston
3b0afb47c3 XQuartz: More startup work... listen if we're the actual server 2008-05-12 09:27:27 -07:00
Julien Cristau
3f8ba89076 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.
(cherry picked from commit 9dfb525f6c)
2008-05-11 23:37:19 +02:00
Jeremy Huddleston
9b67fca9b7 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support 2008-05-09 16:44:31 -07:00
Jeremy Huddleston
cd4d2355e2 Updated .gitignore for new Xquartz layout 2008-05-08 19:47:40 -07:00
Jeremy Huddleston
ee62197578 1.4.0-apple10 2008-05-08 19:46:35 -07:00
Jeremy Huddleston
2232c91d5c XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work. 2008-05-08 19:46:03 -07:00
Jeremy Huddleston
8a0524b30e XQuartz: Set bundle version to 2.3.0 2008-05-08 16:57:42 -07:00
Jeremy Huddleston
91dd6c47aa Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-05-08 16:56:54 -07:00
Daniel Stone
104048501f XKB: Actually explain keymap failures
When something went wrong building a keymap, try to explain to the user
what it actually was, instead of the dreaded 'Failed to load XKB keymap'
catch-all.
(cherry picked from commit cf20df39cc)

Conflicts:
	xkb/ddxLoad.c
2008-05-07 23:11:31 +03:00
Magnus Vigerlöf
b1145a6b42 dix: Move motion history update until after screen crossing and clipping
Cross screen and clip the coordinates before updating the motion history
so that it will have the same contents as the events that are reported.
(cherry picked from commit a56ef7aaa4)
2008-05-07 19:22:41 +02:00
Magnus Vigerlöf
a68d0ef4a6 dix: Skip call to clipAxis for relative core-events
Relative events that generates both core and extention
events will have its axis cliped and screen changed by
miPointerSetPosition when the events are processed. For
absolute and non core-generating relative events the
axis must be clipped if we shouldn't end up completely
outside the defined ranges (if any).
(cherry picked from commit a0284d577a)
2008-05-07 19:22:35 +02:00
Magnus Vigerlöf
b51ca35a75 Bug # 10324: dix: Add scaling of X and Y on the reported pointer-events
Restore the rescaling code for x and y axis when generating
motion events.
(cherry picked from commit d9e23c4ff1)
2008-05-07 19:22:29 +02:00
Magnus Vigerlöf
1d79ba8193 Bug # 10324: dix: Allow arbitrary value ranges in GetPointerEvents
Don't use a possitive value as a marker for if a max-value
is defined on the valuators. Use the existence of a valid
value range instead. This will also make it possible to
define arbitrary start and end-values for min and max as
long as min < max.
(cherry picked from commit f04c083869)
2008-05-07 19:22:23 +02:00
Magnus Vigerlöf
7fa7031cfa dix: Always add valuator information if present
Send valuator information for all event types, not only for
MotionEvents and absolute button events.
(cherry picked from commit 12e5324032)
2008-05-07 19:22:16 +02:00
Alan Coopersmith
b95befdfd2 Check for <sys/sdt.h> as well when determining to enable dtrace probes
Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
2008-05-06 20:57:41 -07:00
Ben Byer
0fab9843c7 So, like, checking return codes of system calls (signal, etc) is good.
Also, only restore an old signal handler if one was actually set
(prevents the server from dying on OS X).
2008-05-06 20:55:23 -07:00
Eric Anholt
a02b989c68 Fix build on FreeBSD after Popen changes. 2008-05-06 20:55:19 -07:00
Adam Jackson
6a5066c2e9 Ignore - not just block - SIGALRM around Popen()/Pclose().
Because our "popen" implementation uses stdio, and because nobody's stdio
library is capable of surviving signals, we need to make absolutely sure
that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
open a menu in openoffice, and it recompiles XKB to deal with the
accelerators, and you popen xkbcomp because we suck, then the scheduler
will tell you you're taking forever doing something stupid, and the
wait() code will get confused, and input will hang and your CPU usage
slams to 100%.  Down, not across.
2008-05-06 20:55:15 -07:00
Jeremy Huddleston
330ffad547 XQuartz: Fixed some issue in our bundle creation 2008-05-06 16:12:41 -07:00
Jeremy Huddleston
ff085deba1 Set CSRG_BASED on OSX 2008-05-06 16:07:33 -07:00
Jeremy Huddleston
d12ecf0f66 1.4.0-apple9 2008-05-06 02:59:28 -07:00
Jeremy Huddleston
56b7988d26 XQuartz: Fixed typo 2008-05-06 02:59:13 -07:00
Jeremy Huddleston
e414ec462c XQuartz: Added uncommitted files 2008-05-06 02:47:03 -07:00
Jeremy Huddleston
f225222ba2 Fixed up dist 2008-05-06 02:28:36 -07:00
Jeremy Huddleston
453a982e63 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite 2008-05-06 00:06:19 -07:00