commit - ba3de3806066744cd57b0d2829255d9990a8afe7
commit + 1818ce0f288ed4ffdd64ef595693cd3e481e84f9
blob - 4f35cd199359b6a7c608939181fd0d780ad8c5f9
blob + a3c4e5a051cf62295ade191da2e28fa9e9eee1bc
--- src/libdraw/devdraw.c
+++ src/libdraw/devdraw.c
@@ -13,8 +13,6 @@
 #define NHASH (1<<5)
 #define HASHMASK (NHASH-1)
 
-extern void flushmemscreen(Rectangle);
-
 typedef struct Client Client;
 typedef struct Draw Draw;
 typedef struct DImage DImage;
@@ -257,7 +255,7 @@ addflush(Rectangle r)
 	}
 	/* emit current state */
 	if(flushrect.min.x < flushrect.max.x)
-		flushmemscreen(flushrect);
+		_flushmemscreen(flushrect);
 	flushrect = r;
 	waste = 0;
 }
@@ -294,7 +292,7 @@ void
 drawflush(void)
 {
 	if(flushrect.min.x < flushrect.max.x)
-		flushmemscreen(flushrect);
+		_flushmemscreen(flushrect);
 	flushrect = Rect(10000, 10000, -10000, -10000);
 }
 
blob - 0548b62a6cb99865172fa6163a26ed0e2cf29a1c
blob + 8512acc15080169d8e26bb30349956a74228c631
--- src/libdraw/x11-event.c
+++ src/libdraw/x11-event.c
@@ -53,6 +53,8 @@ eread(ulong keys, Event *e)
 		}
 	}
 
+	xmask |= EnterWindowMask|LeaveWindowMask;
+
 	XSelectInput(_x.display, _x.drawable, xmask);
 again:
 	XWindowEvent(_x.display, _x.drawable, xmask, &xevent);
blob - 4ab2979aa14f76ba49ae9769c7347c9e0a23d1f8
blob + b7638a73dffc8ec2cd86acea4086756b9ab18b23
--- src/libdraw/x11-init.c
+++ src/libdraw/x11-init.c
@@ -359,7 +359,7 @@ xattach(char *label)
 
 		geom = smprint("%s.geometry", label);
 		if(geom && XrmGetResource(database, geom, nil, &geomrestype, &geomres))
-			mask = XParseGeometry(geomres.addr, &x, &y, &width, &height);
+			mask = XParseGeometry(geomres.addr, &x, &y, (uint*)&width, (uint*)&height);
 		free(geom);
 
 		if((mask & WidthValue) && (mask & HeightValue)){
@@ -552,7 +552,7 @@ fprint(2, "%r\n");
 }
 
 int
-drawsetlabel(Display *d, char *label)
+drawsetlabel(char *label)
 {
 	char *argv[2];
 	XClassHint classhint;
@@ -775,7 +775,7 @@ setupcmap(XWindow w)
 }
 
 void
-flushmemscreen(Rectangle r)
+_flushmemscreen(Rectangle r)
 {
 	if(_x.nextscreenpm != _x.screenpm){
 		qlock(&_x.screenlock);
blob - 649db96269d4c15ffe107ef2d97aa6040bdd1fc2
blob + f1c72ee9387de2895143c206b6870fea4eb73366
--- src/libdraw/x11-itrans.c
+++ src/libdraw/x11-itrans.c
@@ -103,7 +103,7 @@ __xtoplan9kbd(XEvent *e)
 			break;
 		default:		/* not ISO-1 or tty control */
 			if(k>0xff) {
-				k = keysym2ucs(k);
+				k = _p9keysym2ucs(k);
 				if(k==-1) return -1;
 			}
 		}
blob - 63067062190991d9dc84348f9e25e1c5907e0348
blob + 572f01d393ebdeeafa5584f2f191d0ee6f00d9ff
--- src/libdraw/x11-keysym2ucs.c
+++ src/libdraw/x11-keysym2ucs.c
@@ -824,7 +824,7 @@ static struct codepair {
 };
 
 VISIBLE
-long keysym2ucs(KeySym keysym)
+long _p9keysym2ucs(KeySym keysym)
 {
     int min = 0;
     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
blob - 1f23ac6624d3bab3f538486bd654473ab9643ce2
blob + 77050e1b74c4008782d2e2642f8d9f7b8ba049af
--- src/libdraw/x11-keysym2ucs.h
+++ src/libdraw/x11-keysym2ucs.h
@@ -6,4 +6,4 @@
 
 #include <X11/X.h>
 
-long keysym2ucs(KeySym keysym);
+long _p9keysym2ucs(KeySym keysym);