~thopiekar/xorg-server/+git/xorg-xserver:xorg-server-1.6-apple

Last commit made on 2009-10-19
Get this branch:
git clone -b xorg-server-1.6-apple https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-xserver

Branch merges

Branch information

Name:
xorg-server-1.6-apple
Repository:
lp:~thopiekar/xorg-server/+git/xorg-xserver

Recent commits

abdbd09... by Jeremy Sequoia

1.6.5-apple2

764ad51... by Jeremy Sequoia

Rootless: src drawable window can now be NULL

Fix a possible crash when pSrc->pDrawable is NULL.

Signed-off-by: Colin Harrison <email address hidden>
Signed-off-by: Jeremy Huddleston <email address hidden>
(cherry picked from commit 7e178ffbed7c8557faf8d471ad275aa2b0365e1d)

8cc9752... by Jeremy Sequoia

Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c

The rootless extension now directly calls some Xplugin functions, and relies
on types defined in Xplugin.h, which isn't very abstracted :-)

This patch is a start at abstracting some of the Xplugin specific stuff which
has crept into rootlessWindow.c. This has been done in a pretty mindless fashion,
without much thought as to if the additions to the generic rootless interface are
the correct ones

There is some confusion as to if RootlesscolormapCallback() returns a Bool or
xp_error_enum value (not so abstact), but I have no way of checking, of finding
out if Xplugin actually checks the result :-)

Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz

Signed-off-by: Jon TURNEY <email address hidden>
Signed-off-by: Jeremy Huddleston <email address hidden>
(cherry picked from commit 6980f77892e0409b44bd8f33ba82e7273c6462a4)

148e405... by Jeremy Sequoia

1.6.5-apple1

e6af176... by Jeremy Sequoia

Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple

439c588... by Keith Packard

Bump version to 1.6.5

Signed-off-by: Keith Packard <email address hidden>

7f2f71d... by Peter Hutterer

ephyr: if -parent is given, check for a trailing -screen. (#24144)

If -parent is given, don't open up a new window if -screen is given as well.
The commandline option -screen allows to set the depth of the embedded
Xephry instance, even though width and height are autoscaled on -parent.

This patch checks for a -screen parameter after -parent and - if one is
found - delays initializing the screen. The parent window id is stored
temporarily but re-set after a -screen argument.
The following command is thus valid:

Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768

It embeds the first 8-bit screen into window 1234 and opens up a new window
for the second screen. Multiple parent arguments are possible, the screens
are embedded in-order.

X.Org Bug 24144 <http://bugs.freedesktop.org/show_bug.cgi?id=24144>

Tested-by: Vic Lee
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 19be992d9dc542b61fa3f4fd32a09071c9e64880)

Signed-off-by: Keith Packard <email address hidden>

94c50cc... by Jeremy Sequoia

XQuartz: Fix a possible minor memory leak
(cherry picked from commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa)

9d7e6fd... by Jeremy Sequoia

XQuartz: Send mouse location with scroll events.

This fixes the problem where (0, 0) was sent as the mouse location with scroll
button events causing the event to not reach the client.
(cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)

c292b16... by Peter Hutterer

render: rename SetBit to RenderSetBit.

Avoiding namespace collision with the SetBit macro soon to be used in the
input code.

Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 8460425740c72e58bcb897557f033e2836251160)