Commit Graph

4441 Commits

Author SHA1 Message Date
Jeremy Huddleston
b287c481e1 XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs. 2008-08-13 19:09:05 -07:00
Jeremy Huddleston
f3d478148c 1.4.2-apple7 2008-08-13 10:12:15 -07:00
Jeremy Huddleston
ba4a792426 Transport/Apple: Add TRANS_NOXAUTH to incoming connections when the listener is flagged as such 2008-08-09 10:07:32 -07:00
Peter Hutterer
c6d92c5206 dix: don't try to create events if we don't have a screen. #16898
A NULL screen may happen during server shutdown, when the output has been shut
down but the devices still generate events.

X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898>
(cherry picked from commit 465a9bb96e)
2008-08-08 01:17:24 -07:00
Jeremy Huddleston
745f476049 1.4.2-apple6 2008-08-08 00:20:59 -07:00
Jeremy Huddleston
5854e712e9 XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew. 2008-08-08 00:19:41 -07:00
Jeremy Huddleston
3ec2349760 Fixed bitwise or-and typo in my last commit. 2008-08-06 10:06:09 -07:00
Jeremy Huddleston
672682ebf9 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition 2008-08-05 18:38:30 -07:00
Jeremy Huddleston
a8f0d32216 XQuartz: Added code and made comments more helpful for debugging first-client-auth bug. 2008-08-05 15:14:08 -07:00
Jeremy Huddleston
e1e0c398bb XQuartz: Fixed some errors / typos in the preferences pane. 2008-08-05 14:33:03 -07:00
Jeremy Huddleston
d3157ca45c XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize 2008-08-05 14:24:25 -07:00
Jeremy Huddleston
c51545729f Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-08-05 12:44:56 -07:00
Jeremy Huddleston
ca0babafa4 XQuartz: Fixed proper processing of tablet button presses 2008-08-04 20:11:45 -07:00
Alex Deucher
ff49f5944d Fix potential crasher in xf86CrtcRotate()
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
2008-07-29 18:40:44 -07:00
Peter Hutterer
969f1db96b Revert "kdrive: don't post motion event if there was no motion. #16179"
This reverts commit 5903b4c749.

And this one wasn't supposed to be pushed too.
2008-07-29 13:17:27 +09:30
Peter Hutterer
a49d811065 Revert "xkb: delete default rules when devices are closed."
This reverts commit 7cdef0d6fc.

Nor was this one.
2008-07-29 13:15:50 +09:30
Peter Hutterer
f0f3a11acd Revert "xkb: reset xkb_cached_map on CloseDownDevices."
This reverts commit 9b62355847.

This wasn't supposed to be pushed either.
2008-07-29 13:15:34 +09:30
Peter Hutterer
b50932d998 Revert "xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled."
This reverts commit 153c6d48c6.

How did this one end up on the branch? Sure as hell wasn't supposed to be
pushed.
2008-07-29 13:14:49 +09:30
Peter Hutterer
48a9996192 Xi: ChangeDeviceControl presence events should set the appropriate devchange.
Requires inputproto 1.4.4 or higher.
(cherry picked from commit 591ef3c047)

Modified to use the numeric value of DeviceControlChanged instead of the
define, just so we don't bork out if someone rebuilds without updating
inputproto. This is a released server, after all.
2008-07-29 10:19:09 +09:30
Jeremy Huddleston
30e077e034 1.4.2-apple5 ... hopefully the last for 2.3.0 2008-07-15 17:48:57 -07:00
Jeremy Huddleston
4991f54a8d XQuartz: Nuke Sparkle. 2008-07-15 17:48:29 -07:00
Jeremy Huddleston
08f3fe153e XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
2008-07-15 17:15:54 -07:00
Jeremy Huddleston
3521e7b9a1 1.4.2-apple4 2008-07-09 10:03:08 -07:00
Jeremy Huddleston
5538e43b9a XQuartz: Use CFEqual to compare keyboards 2008-07-09 10:02:41 -07:00
Jeremy Huddleston
b3a208dc99 1.4.2-apple3 2008-07-08 22:05:02 -07:00
Jeremy Huddleston
199d2dcb70 XQuartz: More fd handoff cleanup. 2008-07-07 16:34:47 -07:00
Jeremy Huddleston
9c20a4804d XQuartz: Some fd handoff cleanup. 2008-07-07 10:55:58 -07:00
Jeremy Huddleston
69cfc1a21e XQuartz: Remove deprecated keyboard code. 2008-07-04 19:23:21 -07:00
Peter Hutterer
153c6d48c6 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway (written by Sasha Hlusiak).

Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
(cherry picked from commit bea743f3d629bafdc301f40e9c0bc11382dfe8bc)

Conflicts:

	hw/xfree86/common/xf86Config.c
	hw/xfree86/doc/man/xorg.conf.man.pre
2008-07-03 15:05:14 +09:30
Jeremy Huddleston
0733ef2e8a Set machine dependent defaults for ppc64 2008-07-02 00:47:08 -07:00
Peter Hutterer
9b62355847 xkb: reset xkb_cached_map on CloseDownDevices.
Could lead to some invalid pointers in the second server generation.
(cherry picked from commit ff3adf3e56)
2008-06-28 20:32:27 +09:30
Peter Hutterer
7cdef0d6fc xkb: delete default rules when devices are closed.
We only have one set of default rules options in xkb. When the second keyboard
is brought up with Xkb options specified, these new options overwrite the old.
In future server generations, the rules used for the VCK are a mixture of the
default ones and ones previously specified for other keyboards. Simply
resetting the xkb default rules to NULL avoids this issue.

Reproducable by setting XkbLayout "de" and XkbVariant "nodeadkeys". In the
second server generation, the VCK has "us(nodeadkeys)". This again produces a
SIGABRT when the first key is hit.

I could not figure out why the SIGABRT happens. This patch is avoiding the
issue rather than fixing it.
(cherry picked from commit 5a3d06b8f4)
2008-06-28 20:31:57 +09:30
Peter Hutterer
5903b4c749 kdrive: don't post motion event if there was no motion. #16179
Based on the patch by Tomas Janousek.
Backported from master to server-1.4.

X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
(cherry picked from commit 26e7e69ab8)
2008-06-28 20:31:39 +09:30
Jeremy Huddleston
f5e399e995 1.4.2-apple2 2008-06-25 11:51:56 -07:00
Jeremy Huddleston
49668e8a88 XQuartz: Set noPanoramixExtension earlier to avoid a possible race. 2008-06-25 11:51:27 -07:00
Jeremy Huddleston
e65a36d57f Xquartz: Removed include directive for removed header 2008-06-11 11:44:45 -07:00
Jeremy Huddleston
aac6869c53 1.4.2-apple1 2008-06-11 11:28:40 -07:00
Jeremy Huddleston
69605654ba Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-11 11:28:16 -07:00
Julien Cristau
c3a7903f6a Bump to 1.4.2
And update release date.
2008-06-11 16:27:40 +02:00
Jeremy Huddleston
871ebd95fc 1.4.1-apple1
Something slightly perfecter
2008-06-10 10:50:18 -07:00
Jeremy Huddleston
78e98f9cc4 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-10 10:49:06 -07:00
Jeremy Huddleston
a9ee6b0d00 XQuartz: Removed code path for old startup 2008-06-10 10:47:37 -07:00
Matthieu Herrb
08e6292e7e CVE-2008-1379 - MIT-SHM arbitrary memory read
An integer overflow in the validation of the parameters of the
ShmPutImage() request makes it possible to trigger the copy of
arbitrary server memory to a pixmap that can subsequently be read by
the client, to read arbitrary parts of the X server memory space.
2008-06-10 11:43:43 -06:00
Matthieu Herrb
8ffaf61370 CVE-2008-1377 - RECORD and Security extensions memory corruption
Lack of validation of the parameters of the
SProcSecurityGenerateAuthorization SProcRecordCreateContext
functions makes it possible for a specially crafted request to trigger
the swapping of bytes outside the parameter of these requests, causing
memory corruption.
2008-06-10 11:43:35 -06:00
Matthieu Herrb
702e709973 CVE-2008-2362 - RENDER Extension memory corruption
Integer overflows can occur in the code validating the parameters for
the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
and SProcRenderCreateConicalGradient functions, leading to memory
corruption by swapping bytes outside of the intended request
parameters.
2008-06-10 11:43:27 -06:00
Matthieu Herrb
c4937bbb69 CVE-2008-2361 - RENDER Extension crash
An integer overflow may occur in the computation of the
size of the  glyph to be allocated by the ProcRenderCreateCursor()
function  which will cause less memory to be allocated than expected,
leading later to dereferencing  un-mapped memory, causing a crash of
the X server.
2008-06-10 11:42:35 -06:00
Matthieu Herrb
b1a4a96885 CVE-2008-2360 - RENDER Extension heap buffer overflow
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the AllocateGlyph() function which will cause
less memory to be allocated than expected, leading to later heap
overflow.

On systems where the X  SIGSEGV handler includes a stack trace, more
malloc()-type functions are called, which may lead to other
exploitable issues.
2008-06-10 11:42:27 -06:00
Daniel Stone
43285b4f72 Bump to 1.4.1
Whatever.  It doesn't have to be perfect.
2008-06-10 18:36:38 +03:00
Daniel Stone
4d59afd613 Xi: event_{x,y} should refer to the extended device (bug #16289)
ProcessOtherEvents was unconditionally stomping the root_{x,y}
co-ordinates provided by GetPointerEvents with those of the core
pointer, meaning that both root_{x,y} and event_{x,y} reported to
clients would reflect the sprite's position, not the position reported
by the device that generated the DeviceMotionNotify or the
DeviceButton{Press,Release} event in the first place.

For key events we still take the sprite's co-ords, as we're delivering
to the focus, which is the (VCP) sprite.

Not cherry-picked from master as MPX fixes this anyway, by taking the
co-ords of the sprite the device moves (be it visible or no).
(cherry picked from commit 8259d19f71)
2008-06-10 18:34:18 +03:00
Jeremy Huddleston
4505bae5d7 XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 2008-06-10 02:15:25 -07:00