rio: fix window resize and attach race

if a window gets hidden/unhidden/resized too fast, the client might have no
chance attaching to that image using winname. so we move the window
offscreen instead and delay the freeimage() by doing it in the deletethread().

1 files changed, 11 insertions, 13 deletions

diff --git a/sys/src/cmd/rio/rio.c b/sys/src/cmd/rio/rio.c
index 8dbbf47be..36aec2d64 100644
--- a/sys/src/cmd/rio/rio.c
+++ b/sys/src/cmd/rio/rio.c
@@ -205,7 +205,7 @@ threadmain(int argc, char *argv[])
 
 	exitchan = chancreate(sizeof(int), 0);
 	winclosechan = chancreate(sizeof(Window*), 0);
-	deletechan = chancreate(sizeof(char*), 0);
+	deletechan = chancreate(sizeof(Wdelmesg), 0);
 
 	timerinit();
 	threadcreate(keyboardthread, nil, STACK);
@@ -422,30 +422,28 @@ winclosethread(void*)
 void
 deletethread(void*)
 {
-	char *s;
-	Image *i;
+	Wdelmesg m;
 
 	threadsetname("deletethread");
 	for(;;){
-		s = recvp(deletechan);
-		i = namedimage(display, s);
-		if(i != nil){
+		recv(deletechan, &m);
+		freeimage(m.i);
+		m.i = namedimage(display, m.s);
+		if(m.i != nil){
 			/* move it off-screen to hide it, since client is slow in letting it go */
-			originwindow(i, i->r.min, view->r.max);
+			originwindow(m.i, m.i->r.min, view->r.max);
 		}
-		freeimage(i);
-		free(s);
+		freeimage(m.i);
+		free(m.s);
 	}
 }
 
 void
 deletetimeoutproc(void *v)
 {
-	char *s;
-
-	s = v;
 	sleep(750);	/* remove window from screen after 3/4 of a second */
-	sendp(deletechan, s);
+	send(deletechan, v);
+	free(v);
 }
 
 /*