From 390cfcfb235f8ef61e0467216902c4d718f51ad0 Mon Sep 17 00:00:00 2001
From: "Charles.Forsyth" <devnull@localhost>
Date: Fri, 20 Mar 2009 15:59:55 +0000
Subject: 20090320-1559

---
 emu/port/win-x11a.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'emu')

diff --git a/emu/port/win-x11a.c b/emu/port/win-x11a.c
index 90f50b97..424a09a2 100644
--- a/emu/port/win-x11a.c
+++ b/emu/port/win-x11a.c
@@ -33,8 +33,6 @@
 #define Visual		XVisual
 #define Window		XWindow
 
-#define XLIB_ILLEGAL_ACCESS
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
@@ -595,14 +593,15 @@ xcursnotify(void)
 {
 	XClientMessageEvent e;
 
-return;	/* temporarily disable cursor setting done this way, to avoid upsetting xcb */
 	memset(&e, 0, sizeof e);
 	e.type = ClientMessage;
 	e.window = xdrawable;
 	e.message_type = cursorchange;
 	e.format = 8;
-	XSendEvent(xkbdcon, xdrawable, True, KeyPressMask, (XEvent*)&e);
-	XFlush(xkbdcon);
+	XLockDisplay(xdisplay);
+	XSendEvent(xdisplay, xdrawable, True, KeyPressMask, (XEvent*)&e);
+	XFlush(xdisplay);
+	XUnlockDisplay(xdisplay);
 }
 
 void
@@ -630,6 +629,8 @@ drawcursor(Drawcursor* c)
 	xcursunlock();
 
 	h = (c->maxy-c->miny)/2;	/* image, then mask */
+	if(h > CursorSize)
+		h = CursorSize;
 	bpl = bytesperline(Rect(c->minx, c->miny, c->maxx, c->maxy), 1);
 	w = bpl;
 	if(w > CursorSize/8)
-- 
cgit v1.2.3