From: Michele Baldessari <michele@acksyn.org>
Date: Sun, 15 Sep 2013 18:30:38 +0000 (+0100)
Subject: Xephyr: restore cursor visibility
X-Git-Tag: xorg-server-1.14.99.3~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93a27b2dd0d7ed51120f42456a91a7c59902ebc2;p=platform%2Fupstream%2Fxorg-server.git

Xephyr: restore cursor visibility

  Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69388

Commit c100211034ab69ce453a1644fb61c6808d7e3eda (dix: only show the cursor
if a window defines one (#58398)) broke the default cursor behaviour in
Xephyr (unless run with -retro). Restore the default cursor visibility
so that '-retro' or '-host-cursor' are not needed to have a visible
cursor.

Signed-off-by: Michele Baldessari <michele@acksyn.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

as of ba387cf21f7d95987211f75d8024601e7d64e322 "ephyr: Use host (HW) cursors
by default." this only applies if -sw-cursor is given on the cmdline.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index d985571..5fa33b9 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "hostx.h"
+#include "input.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -436,6 +437,7 @@ hostx_init(void)
     xcb_change_gc(HostX.conn, HostX.gc, XCB_GC_FOREGROUND, &pixel);
 
     if (!hostx_want_host_cursor ()) {
+        CursorVisible = TRUE;
         /* Ditch the cursor, we provide our 'own' */
         cursor_pxm = xcb_generate_id(HostX.conn);
         xcb_create_pixmap(HostX.conn, 1, cursor_pxm, HostX.winroot, 1, 1);