More deanon work.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

sys/src/cmd/acme/acme.c

@@ -178,7 +178,7 @@ threadmain(int argc, char *argv[])
 		fprint(2, "acme: can't initialize mouse: %r\n");
 		exits("mouse");
 	}
-	mouse = mousectl;
+	mouse = (Mouse *)mousectl;
 	keyboardctl = initkeyboard(nil);
 	if(keyboardctl == nil){
 		fprint(2, "acme: can't initialize keyboard: %r\n");
@@ -441,7 +441,7 @@ mousethread(void *v)
 	alts[MResize].v = nil;
 	alts[MResize].op = CHANRCV;
 	alts[MMouse].c = mousectl->c;
-	alts[MMouse].v = &mousectl->Mouse;
+	alts[MMouse].v = (Mouse *)mousectl;
 	alts[MMouse].op = CHANRCV;
 	alts[MPlumb].c = cplumb;
 	alts[MPlumb].v = ±
@@ -483,7 +483,7 @@ mousethread(void *v)
 			 * underfoot.  Can't just receive into m because this introduces
 			 * another race; see /sys/src/libdraw/mouse.c.
 			 */
-			m = mousectl->Mouse;
+			m = *(Mouse *)mousectl;
 			qlock(&row);
 			t = rowwhich(&row, m.xy);
 			if(t!=mousetext && mousetext!=nil && mousetext->w!=nil){

sys/src/cmd/acme/scrl.c

@@ -98,7 +98,7 @@ scrsleep(uint dt)
 	alts[0].v = nil;
 	alts[0].op = CHANRCV;
 	alts[1].c = mousectl->c;
-	alts[1].v = &mousectl->Mouse;
+	alts[1].v = (Mouse *)mousectl;
 	alts[1].op = CHANRCV;
 	alts[2].op = CHANEND;
 	for(;;)
@@ -157,7 +157,7 @@ textscroll(Text *t, int but)
 		if(first){
 			flushimage(display, 1);
 			sleep(200);
-			nbrecv(mousectl->c, &mousectl->Mouse);
+			nbrecv(mousectl->c, (Mouse *)mousectl);
 			first = FALSE;
 		}
 		scrsleep(80);

sys/src/cmd/rio/dat.h

@@ -115,7 +115,7 @@ struct Stringpair	/* rune and nrune or byte and nbyte */
 
 struct Mousestate
 {
-	Mouse;
+	Mouse mouse;
 	uint32_t	counter;	/* serial no. of mouse event */
 };
 

sys/src/cmd/rio/rio.c

@@ -129,8 +129,8 @@ threadmain(int argc, char *argv[])
 {
 	char *initstr, *kbdin, *s;
 	char buf[256];
-	Image *i;
-	Rectangle r;
+	//Image *i;
+	//Rectangle r;
 
 	if(strstr(argv[0], ".out") == nil){
 		menu3str[Exit] = nil;
@@ -196,7 +196,7 @@ threadmain(int argc, char *argv[])
 	mousectl = initmouse(nil, screen);
 	if(mousectl == nil)
 		error("can't find mouse");
-	mouse = mousectl;
+	mouse = (Mouse *)mousectl;
 	keyboardctl = initkeyboard(nil);
 	if(keyboardctl == nil)
 		error("can't find keyboard");
@@ -492,7 +492,7 @@ mousethread(void* v)
 	alts[MReshape].v = nil;
 	alts[MReshape].op = CHANRCV;
 	alts[MMouse].c = mousectl->c;
-	alts[MMouse].v = &mousectl->Mouse;
+	alts[MMouse].v = (Mouse *)mousectl;
 	alts[MMouse].op = CHANRCV;
 	alts[NALT].op = CHANEND;
 
@@ -544,7 +544,7 @@ mousethread(void* v)
 					sending = FALSE;
 				}else
 					wsetcursor(winput, 0);
-				tmp = mousectl->Mouse;
+				tmp = *(Mouse *)mousectl;
 				tmp.xy = xy;
 				send(winput->mc.c, &tmp);
 				continue;

sys/src/cmd/rio/scrl.c

@@ -113,7 +113,7 @@ wscrsleep(Window *w, uint dt)
 	alts[0].v = nil;
 	alts[0].op = CHANRCV;
 	alts[1].c = w->mc.c;
-	alts[1].v = &w->mc.Mouse;
+	alts[1].v = (Mouse *)&w->mc;
 	alts[1].op = CHANRCV;
 	alts[2].op = CHANEND;
 	for(;;)
@@ -181,7 +181,8 @@ wscroll(Window *w, int but)
 			if(first){
 				flushimage(display, 1);
 				sleep(200);
-				nbrecv(w->mc.c, &w->mc.Mouse);
+				nbrecv(w->mc.c, (Mouse *)&w->mc);
+				nbrecv(w->mc.c, (Mouse *)&w->mc);
 				first = FALSE;
 			}
 			wscrsleep(w, 100);

sys/src/cmd/rio/wind.c

@@ -225,7 +225,7 @@ winctl(void *arg)
 	alts[WKey].v = &kbdr;
 	alts[WKey].op = CHANRCV;
 	alts[WMouse].c = w->mc.c;
-	alts[WMouse].v = &w->mc.Mouse;
+	alts[WMouse].v = (Mouse *)&w->mc;
 	alts[WMouse].op = CHANRCV;
 	alts[WMouseread].c = w->mouseread;
 	alts[WMouseread].v = &mrm;
@@ -294,7 +294,7 @@ winctl(void *arg)
 						w->mouse.wi = 0;
 					if(w->mouse.wi == w->mouse.ri)
 						w->mouse.qfull = TRUE;
-					mp->Mouse = w->mc.Mouse;
+					*(Mouse *)mp = *(Mouse *)&w->mc;
 					mp->counter = w->mouse.counter;
 					lastb = w->mc.buttons;
 				}
@@ -311,10 +311,10 @@ winctl(void *arg)
 				if(++w->mouse.ri == nelem(w->mouse.queue))
 					w->mouse.ri = 0;
 			} else
-				m = (Mousestate){w->mc.Mouse, w->mouse.counter};
+				m = (Mousestate){*(Mouse *)&w->mc, w->mouse.counter};
 
 			w->mouse.lastcounter = m.counter;
-			send(mrm.cm, &m.Mouse);
+			send(mrm.cm, (Mouse *)&m);
 			continue;
 		case WCtl:
 			if(wctlmesg(w, wcm.type, wcm.r, wcm.image) == Exited){

sys/src/cmd/samterm/io.c

@@ -52,7 +52,7 @@ initio(void)
 		fprint(2, "samterm: mouse init failed: %r\n");
 		threadexitsall("mouse");
 	}
-	mousep = mousectl;
+	mousep = (Mouse *)mousectl;
 	keyboardctl = initkeyboard(nil);
 	if(keyboardctl == nil){
 		fprint(2, "samterm: keyboard init failed: %r\n");
@@ -131,7 +131,7 @@ again:
 		alts[RKeyboard].op = CHANNOP;
 
 	alts[RMouse].c = mousectl->c;
-	alts[RMouse].v = &mousectl->Mouse;
+	alts[RMouse].v = (Mouse *)&mousectl;
 	alts[RMouse].op = CHANRCV;
 	if(block & (1<<RMouse))
 		alts[RMouse].op = CHANNOP;