deanon libcontrol.

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

sys/src/libcontrol/entry.c

@@ -190,7 +190,7 @@ entryctl(Control *c, CParse *cp)
 		break;
 	case EData:
 		_ctlargcount(&e->Control, cp, 1);
-		chanprint(e->data, "%S", e->text);
+		chanprint(e->Control.data, "%S", e->text);
 		break;
 	case EFocus:
 		_ctlargcount(&e->Control, cp, 2);

sys/src/libcontrol/keyboard.c

@@ -535,7 +535,7 @@ createkeyboard(Controlset *cs, char *name)
 	k->Control.format = ctlstrdup("%q: value 0x%x");
 	k->border = 0;
 	k->lastbut = 0;
-	k->Controlkey = nil;
+	k->Control.key = nil;
 	k->state = SRegular;
 	k->Control.ctl = keyboardctl;
 	k->Control.mouse = keyboardmouse;

sys/src/libcontrol/label.c

@@ -83,18 +83,18 @@ labelshow(Label *l)
 	Rectangle r;
 	Point p;
 
-	if (l->hidden)
+	if (l->Control.hidden)
 		return;
-	r = l->rect;
-	draw(l->screen, r, l->image->image, nil, l->image->image->r.min);
+	r = l->Control.rect;
+	draw(l->Control.screen, r, l->image->image, nil, l->image->image->r.min);
 	if(l->border > 0){
-		border(l->screen, r, l->border, l->bordercolor->image, l->bordercolor->image->r.min);
+		border(l->Control.screen, r, l->border, l->bordercolor->image, l->bordercolor->image->r.min);
 		r = insetrect(r, l->border);
 	}
 	p = _ctlalignpoint(r,
 		stringwidth(l->font->font, l->text),
 		l->font->font->height, l->align);
-	_string(l->screen, p, l->textcolor->image,
+	_string(l->Control.screen, p, l->textcolor->image,
 		ZP, l->font->font, l->text, nil, strlen(l->text),
 		r, nil, ZP, SoverD);
 	flushimage(display, 1);
@@ -111,81 +111,81 @@ labelctl(Control *c, CParse *cp)
 	cmd = _ctllookup(cp->args[0], cmds, nelem(cmds));
 	switch(cmd){
 	default:
-		ctlerror("%q: unrecognized message '%s'", l->name, cp->str);
+		ctlerror("%q: unrecognized message '%s'", l->Control.name, cp->str);
 		break;
 	case EAlign:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
+		_ctlargcount(&l->Control, cp, 2);
 		l->align = _ctlalignment(cp->args[1]);
 		break;
 	case EBorder:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
+		_ctlargcount(&l->Control, cp, 2);
 		if(cp->iargs[1] < 0)
-			ctlerror("%q: bad border: %c", l->name, cp->str);
+			ctlerror("%q: bad border: %c", l->Control.name, cp->str);
 		l->border = cp->iargs[1];
 		break;
 	case EBordercolor:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
-		_setctlimage(_setctlimage(ll->Control, &l->bordercolor, cp->args[1]);
+		_ctlargcount(&l->Control, cp, 2);
+		_setctlimage(&l->Control, &l->bordercolor, cp->args[1]);
 		break;
 	case EFocus:
 		/* ignore focus change */
 		break;
 	case EFont:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
-		_setctlfont(_setctlfont(_setctlfont(ll->Controll->Control, &l->font, cp->args[1]);
+		_ctlargcount(&l->Control, cp, 2);
+		_setctlfont(&l->Control, &l->font, cp->args[1]);
 		break;
 	case EHide:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 1);
-		l->hidden = 1;
+		_ctlargcount(&l->Control, cp, 1);
+		l->Control.hidden = 1;
 		break;
 	case EImage:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
-		_setctlimage(_setctlimage(ll->Control, &l->image, cp->args[1]);
+		_ctlargcount(&l->Control, cp, 2);
+		_setctlimage(&l->Control, &l->image, cp->args[1]);
 		break;
 	case ERect:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 5);
+		_ctlargcount(&l->Control, cp, 5);
 		r.min.x = cp->iargs[1];
 		r.min.y = cp->iargs[2];
 		r.max.x = cp->iargs[3];
 		r.max.y = cp->iargs[4];
 		if(Dx(r)<=0 || Dy(r)<=0)
-			ctlerror("%q: bad rectangle: %s", l->name, cp->str);
-		l->rect = r;
+			ctlerror("%q: bad rectangle: %s", l->Control.name, cp->str);
+		l->Control.rect = r;
 		break;
 	case EReveal:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 1);
-		l->hidden = 0;
+		_ctlargcount(&l->Control, cp, 1);
+		l->Control.hidden = 0;
 		labelshow(l);
 		break;
 	case EShow:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 1);
+		_ctlargcount(&l->Control, cp, 1);
 		labelshow(l);
 		/*
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
-		_setctlimage(_setctlimage(ll->Control, &l->textcolor, cp->args[1]);
+		_ctlargcount(&l->Control, cp, 2);
+		_setctlimage(&l->Control, &l->textcolor, cp->args[1]);
 		*/
 		break;
 	case ESize:
 		if (cp->nargs == 3)
 			r.max = Pt(0x7fffffff, 0x7fffffff);
 		else{
-			_ctlargcount(_ctlargcount(ll->Control, cp, 5);
+			_ctlargcount(&l->Control, cp, 5);
 			r.max.x = cp->iargs[3];
 			r.max.y = cp->iargs[4];
 		}
 		r.min.x = cp->iargs[1];
 		r.min.y = cp->iargs[2];
 		if(r.min.x<=0 || r.min.y<=0 || r.max.x<=0 || r.max.y<=0 || r.max.x < r.min.x || r.max.y < r.min.y)
-			ctlerror("%q: bad sizes: %s", l->name, cp->str);
-		l->size.min = r.min;
-		l->size.max = r.max;
+			ctlerror("%q: bad sizes: %s", l->Control.name, cp->str);
+		l->Control.size.min = r.min;
+		l->Control.size.max = r.max;
 		break;
 	case ETextcolor:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
-		_setctlimage(_setctlimage(ll->Control, &l->textcolor, cp->args[1]);
+		_ctlargcount(&l->Control, cp, 2);
+		_setctlimage(&l->Control, &l->textcolor, cp->args[1]);
 		break;
 	case EValue:
-		_ctlargcount(_ctlargcount(ll->Control, cp, 2);
+		_ctlargcount(&l->Control, cp, 2);
 		if(strcmp(cp->args[1], l->text) != 0){
 			free(l->text);
 			l->text = ctlstrdup(cp->args[1]);
@@ -207,7 +207,7 @@ createlabel(Controlset *cs, char *name)
 	l->bordercolor = _getctlimage("black");
 	l->font = _getctlfont("font");
 	l->border = 0;
-	l->ctl = labelctl;
-	l->exit = labelfree;
+	l->Control.ctl = labelctl;
+	l->Control.exit = labelfree;
 	return (Control *)l;
 }

sys/src/libcontrol/menu.c

@@ -177,7 +177,7 @@ menuhide(Menu0 *m)
 	if(m->selection >= 0)
 		m->prevsel = m->selection;
 	m->selection = -1;
-	_ctlfocus(m, 0);
+	_ctlfocus(&m->Control, 0);
 }
 
 static void
@@ -242,7 +242,7 @@ menuctl(Control *c, CParse *cp)
 		break;
 	case EBordercolor:
 		_ctlargcount(&m->Control, cp, 2);
-		_setctlimage(_setctlimage(mm->Control, &m->bordercolor, cp->args[1]);
+		_setctlimage(&m->Control, &m->bordercolor, cp->args[1]);
 		menushow(m);
 		break;
 	case EFocus:
@@ -252,7 +252,7 @@ menuctl(Control *c, CParse *cp)
 		break;
 	case EFont:
 		_ctlargcount(&m->Control, cp, 2);
-		_setctlfont(_setctlfont(_setctlfont(mm->Controlm->Control, &m->font, cp->args[1]);
+		_setctlfont(&m->Control, &m->font, cp->args[1]);
 		break;
 	case EFormat:
 		_ctlargcount(&m->Control, cp, 2);
@@ -264,7 +264,7 @@ menuctl(Control *c, CParse *cp)
 		break;
 	case EImage:
 		_ctlargcount(&m->Control, cp, 2);
-		_setctlimage(_setctlimage(mm->Control, &m->image, cp->args[1]);
+		_setctlimage(&m->Control, &m->image, cp->args[1]);
 		menushow(m);
 		break;
 	case ERect:
@@ -285,12 +285,12 @@ menuctl(Control *c, CParse *cp)
 		break;
 	case ESelectcolor:
 		_ctlargcount(&m->Control, cp, 2);
-		_setctlimage(_setctlimage(mm->Control, &m->selectcolor, cp->args[1]);
+		_setctlimage(&m->Control, &m->selectcolor, cp->args[1]);
 		menushow(m);
 		break;
 	case ESelecttextcolor:
 		_ctlargcount(&m->Control, cp, 2);
-		_setctlimage(_setctlimage(mm->Control, &m->selecttextcolor, cp->args[1]);
+		_setctlimage(&m->Control, &m->selecttextcolor, cp->args[1]);
 		menushow(m);
 		break;
 	case EShow:
@@ -314,7 +314,7 @@ menuctl(Control *c, CParse *cp)
 		break;
 	case ETextcolor:
 			     _ctlargcount(&m->Control, cp, 2);
-			     _setctlimage(_setctlimage(mm->Control, &m->textcolor, cp->args[1]);
+			     _setctlimage(&m->Control, &m->textcolor, cp->args[1]);
 		menushow(m);
 		break;
 	case EWindow:
@@ -342,7 +342,7 @@ menuctl(Control *c, CParse *cp)
 		m->selection = up;
 		menushow(m);
 		h = m->font->font->height;
-		moveto(m->controlset->mousectl,
+		moveto(m->Control.controlset->mousectl,
 			Pt(m->Control.rect.min.x+Dx(m->Control.rect)/2, m->Control.rect.min.y+up*h+h/2));
 //		_ctlfocus(m, 1);
 		break;

sys/src/libcontrol/scribble.c

@@ -264,7 +264,7 @@ displaylast(Scrib *w)
 	npt = s->ps.npts;
 	if (npt > 2)
 		npt = 2;
-	poly(w->screen, s->pt + (s->ps.npts - npt), npt, Endsquare, Endsquare,
+	poly(w->Control.screen, s->pt + (s->ps.npts - npt), npt, Endsquare, Endsquare,
 		0, w->color->image, ZP);
 	flushimage(display, 1);
 }

sys/src/libcontrol/tabs.c

@@ -129,7 +129,7 @@ tabctl(Control *c, CParse *cp)
 			_ctladdgroup(t->tabrow, cbut);
 			_ctlprint(t->tabstack, "add %q", cp->args[i+1]);
 			_ctlprint(cbut, "format '%%s: %q button %%d'", t->Control.name);
-			controlwire(cbut, "event", t->controlset->Control.ctl);
+			controlwire(cbut, "event", t->Control.controlset->ctl);
 			t->buttons = ctlrealloc(t->buttons, (t->nbuttons+1)*sizeof(Control*));
 			t->buttons[t->nbuttons] = cbut;
 			t->nbuttons++;
@@ -260,6 +260,6 @@ createtab(Controlset *cs, char *name)
 	t->bordercolor = _getctlimage("black");
 	t->image = _getctlimage("white");
 	t->Control.setsize = tabsize;
-	&t->Control.activate = activatetab;
+	t->Control.activate = activatetab;
 	return (Control*)t;
 }

sys/src/libcontrol/text.c

@@ -238,7 +238,7 @@ textshow(Text *t)
 			Point p2;
 			 p2.x = p.x + 0.5*runestringnwidth(f, text, ntext);
 			 p2.y = p.y + 0.5*f->height;
-			moveto(t->controlset->mousectl, p2);
+			moveto(t->Control.controlset->mousectl, p2);
 			t->warp = -1;
 		}
 		_string(t->Control.screen, p, t->textcolor->image,