xf86-video-intel: 2 commits - src/sna/sna_accel.c tools/virtual.c
Chris Wilson
ickle at kemper.freedesktop.org
Sun Nov 10 02:35:44 PST 2013
src/sna/sna_accel.c | 2 ++
tools/virtual.c | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 7b0771180dc9bb7276a473db5663f41b5929199b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Nov 10 10:34:06 2013 +0000
intel-virtual-output: Do not hide the cursor on the local/source display
Whilst we want to take over and hide the cursor on the remote displays,
on the source we need to not interfere with the host.
Reported-by: Jethro Beekman <freedesktop-bugs at jbeekman.nl>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71439
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/tools/virtual.c b/tools/virtual.c
index 5452f45..48fe347 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -1136,6 +1136,8 @@ static void display_flush_cursor(struct display *display)
y = display->cursor_y++ & 31;
}
+ DBG(("%s setting cursor position (%d, %d), visible? %d\n",
+ DisplayString(c->dst.dpy), x, y, display->cursor_visible));
XWarpPointer(display->dpy, None, display->root, 0, 0, 0, 0, x, y);
cursor = None;
@@ -1680,6 +1682,7 @@ static int clone_init_depth(struct clone *clone)
static int add_display(struct context *ctx, Display *dpy)
{
struct display *display;
+ int first_display = ctx->ndisplay == 0;
if (is_power_of_2(ctx->ndisplay)) {
struct display *new_display;
@@ -1719,10 +1722,11 @@ static int add_display(struct context *ctx, Display *dpy)
if (XineramaQueryExtension(dpy, &display->xinerama_event, &display->xinerama_error))
display->xinerama_active = XineramaIsActive(dpy);
- display->invisible_cursor = display_load_invisible_cursor(display);
- display->cursor = None;
-
- display_cursor_move(display, 0, 0, 0);
+ /* first display (source) is slightly special */
+ if (!first_display) {
+ display->invisible_cursor = display_load_invisible_cursor(display);
+ display_cursor_move(display, 0, 0, 0);
+ }
return ConnectionNumber(dpy);
}
commit b3b02a879bd6f29447e20fb5bb51c0a4a48a7928
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Nov 9 11:15:39 2013 +0000
sna: Assert that we do setup the gc->pCompositeClip upon ValidateGC
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index bf5f16a..b1dc2f7 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15639,6 +15639,8 @@ sna_validate_gc(GCPtr gc, unsigned long changes, DrawablePtr drawable)
gc->pCompositeClip->extents.y2));
}
+ assert(gc->pCompositeClip);
+
sna_gc(gc)->changes |= changes;
}
More information about the xorg-commit
mailing list