~thopiekar/xorg-server/+git/xorg-xserver:server-1.13-branch

Last commit made on 2013-04-17
Get this branch:
git clone -b server-1.13-branch https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-xserver

Branch merges

Branch information

Name:
server-1.13-branch
Repository:
lp:~thopiekar/xorg-server/+git/xorg-xserver

Recent commits

10c42f5... by Peter Hutterer

xserver 1.13.4

Signed-off-by: Peter Hutterer <email address hidden>

8039b6b... by Dave Airlie

xf86: fix flush input to work with Linux evdev devices.

So when we VT switch back and attempt to flush the input devices,
we don't succeed because evdev won't return part of an event,
since we were only asking for 4 bytes, we'd only get -EINVAL back.

This could later cause events to be flushed that we shouldn't have
gotten.

This is a fix for CVE-2013-1940.

Signed-off-by: Dave Airlie <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f)

87d7e3e... by Peter Hutterer

dix: only show the cursor if a window defines one (#58398)

e02f864fdf "Suppress cursor display until the first XDefineCursor() request"
disabled cursor display a priori unless -retro is given.

On a plain server, caling XFixesHideCursor() and XFixesShowCursor() would
show the default root cursor, despite no client actually defining a cursor.

Change the logic, disable CursorVisible by default and only enable it from
the window's CWCursor logic. If no window ever defines a cursor, said cursor
stays invisible.

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

Signed-off-by: Peter Hutterer <email address hidden>
Tested-by: Bastien Nocera <email address hidden>
Reviewed-by: Daniel Martin <email address hidden>
(cherry picked from commit c100211034ab69ce453a1644fb61c6808d7e3eda)

b1c0183... by Daniel Martin <email address hidden>

ephyr: Fix crash on 24bpp host framebuffer

Use bytes_per_line and bits_per_pixel from the created XImage to fix
    https://bugzilla.redhat.com/show_bug.cgi?id=518960

Signed-off-by: Daniel Martin <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit bd58ebe4cf3b0ce60f87fb26a3715f774dabd349)

4bd8e9e... by Aaron Plattner

xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup

This is necessary when the input handler deletes itself from the
list. Bug found by Maarten Lankhorst, this patch uses the list macros
instead of open-coding the fix.

Signed-off-by: Keith Packard <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
(cherry picked from commit da92690107d90061205340d4cdc98b73b59db9b2)

eec5eb2... by Matt Dew <email address hidden>

Bump version to 1.13.3

f7ac913... by Dave Airlie <email address hidden>

randr: cleanup provider properly

So in the cold plug server shutdown case, we reap the resources
before we call CloseScreen handlers, so the config->randr_provider
is a dangling pointer when the xf86CrtcCloseScreen handler is called,

however in the hot screen unplug case, we can't rely on automatically
reaped resources, so we need to clean up the provider in the xf86CrtcCloseScreen
case.

This patch provides a cleanup callback from the randr provider removal
into the DDX so it can cleanup properly, this then gets called by the automatic
code for cold plug, or if hot unplug it gets called explicitly.

Fixes a number of random server crashes on shutdown
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58174
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=891140

Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Dave Airlie <email address hidden>

4d98c7d... by Matt Dew <email address hidden>

bump rev from 1.13.3-rc1 to 1.13.3-rc2

412c4ab... by Matt Dew <email address hidden>

Merge branch 'server-1.13-branch' of git://people.freedesktop.org/~whot/xserver into server-1.13-branch

e604b19... by Aaron Plattner

randr: unref the provider shared pixmap the appropriate number of times

When an RandR shared pixmap is created in rrCreateSharedPixmap, it has a refcnt
of 1. Then, PixmapShareToSlave bumps the refcnt to 2. However, there's no
corresponding PixmapUnshareFromSlave where the refcnt can be decreased again,
and there's no convenient common place where the refcnt can be decremented when
the slave pixmap is destroyed.

Fix this by just unreffing the pixmap twice in RRCrtcDetachScanoutPixmap.

Signed-off-by: Aaron Plattner <email address hidden>
Reviewed-by: Dave Airlie <email address hidden>
Signed-off-by: Keith Packard <email address hidden>