X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/01c034ad857128c51482a563befb374e38ebe668..32874aeac8dacbca26663777b39a79efc5d8dc4b:/winctrls.c

diff --git a/winctrls.c b/winctrls.c
index 0e85dbe4..f87d2658 100644
--- a/winctrls.c
+++ b/winctrls.c
@@ -22,7 +22,8 @@
 #define PROGBARHEIGHT 14
 
 void ctlposinit(struct ctlpos *cp, HWND hwnd,
-                int leftborder, int rightborder, int topborder) {
+		int leftborder, int rightborder, int topborder)
+{
     RECT r, r2;
     cp->hwnd = hwnd;
     cp->font = SendMessage(hwnd, WM_GETFONT, 0, 0);
@@ -33,14 +34,14 @@ void ctlposinit(struct ctlpos *cp, HWND hwnd,
     r2.bottom = 8;
     MapDialogRect(hwnd, &r2);
     cp->dlu4inpix = r2.right;
-    cp->width = (r.right * 4) / (r2.right) - 2*GAPBETWEEN;
+    cp->width = (r.right * 4) / (r2.right) - 2 * GAPBETWEEN;
     cp->xoff = leftborder;
     cp->width -= leftborder + rightborder;
 }
 
 void doctl(struct ctlpos *cp, RECT r,
-           char *wclass, int wstyle, int exstyle,
-           char *wtext, int wid) {
+	   char *wclass, int wstyle, int exstyle, char *wtext, int wid)
+{
     HWND ctl;
     /*
      * Note nonstandard use of RECT. This is deliberate: by
@@ -52,19 +53,22 @@ void doctl(struct ctlpos *cp, RECT r,
     MapDialogRect(cp->hwnd, &r);
 
     ctl = CreateWindowEx(exstyle, wclass, wtext, wstyle,
-                         r.left, r.top, r.right, r.bottom,
-                         cp->hwnd, (HMENU)wid, hinst, NULL);
+			 r.left, r.top, r.right, r.bottom,
+			 cp->hwnd, (HMENU) wid, hinst, NULL);
     SendMessage(ctl, WM_SETFONT, cp->font, MAKELPARAM(TRUE, 0));
 }
 
 /*
  * A title bar across the top of a sub-dialog.
  */
-void bartitle(struct ctlpos *cp, char *name, int id) {
+void bartitle(struct ctlpos *cp, char *name, int id)
+{
     RECT r;
 
-    r.left = GAPBETWEEN; r.right = cp->width;
-    r.top = cp->ypos; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.right = cp->width;
+    r.top = cp->ypos;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPBETWEEN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, name, id);
 }
@@ -72,14 +76,15 @@ void bartitle(struct ctlpos *cp, char *name, int id) {
 /*
  * Begin a grouping box, with or without a group title.
  */
-void beginbox(struct ctlpos *cp, char *name, int idbox) {
+void beginbox(struct ctlpos *cp, char *name, int idbox)
+{
     cp->boxystart = cp->ypos;
     if (!name)
-        cp->boxystart -= STATICHEIGHT/2;
+	cp->boxystart -= STATICHEIGHT / 2;
     if (name)
-        cp->ypos += STATICHEIGHT;
+	cp->ypos += STATICHEIGHT;
     cp->ypos += GAPYBOX;
-    cp->width -= 2*GAPXBOX;
+    cp->width -= 2 * GAPXBOX;
     cp->xoff += GAPXBOX;
     cp->boxid = idbox;
     cp->boxtext = name;
@@ -88,15 +93,18 @@ void beginbox(struct ctlpos *cp, char *name, int idbox) {
 /*
  * End a grouping box.
  */
-void endbox(struct ctlpos *cp) {
+void endbox(struct ctlpos *cp)
+{
     RECT r;
     cp->xoff -= GAPXBOX;
-    cp->width += 2*GAPXBOX;
+    cp->width += 2 * GAPXBOX;
     cp->ypos += GAPYBOX - GAPBETWEEN;
-    r.left = GAPBETWEEN; r.right = cp->width;
-    r.top = cp->boxystart; r.bottom = cp->ypos - cp->boxystart;
+    r.left = GAPBETWEEN;
+    r.right = cp->width;
+    r.top = cp->boxystart;
+    r.bottom = cp->ypos - cp->boxystart;
     doctl(cp, r, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 0,
-          cp->boxtext ? cp->boxtext : "", cp->boxid);
+	  cp->boxtext ? cp->boxtext : "", cp->boxid);
     cp->ypos += GAPYBOX;
 }
 
@@ -104,7 +112,8 @@ void endbox(struct ctlpos *cp) {
  * Some edit boxes. Each one has a static above it. The percentages
  * of the horizontal space are provided.
  */
-void multiedit(struct ctlpos *cp, ...) {
+void multiedit(struct ctlpos *cp, ...)
+{
     RECT r;
     va_list ap;
     int percent, xpos;
@@ -112,31 +121,31 @@ void multiedit(struct ctlpos *cp, ...) {
     percent = xpos = 0;
     va_start(ap, cp);
     while (1) {
-        char *text;
-        int staticid, editid, pcwidth;
-        text = va_arg(ap, char *);
-        if (!text)
-            break;
-        staticid = va_arg(ap, int);
-        editid = va_arg(ap, int);
-        pcwidth = va_arg(ap, int);
-
-        r.left = xpos + GAPBETWEEN;
-        percent += pcwidth;
-        xpos = (cp->width + GAPBETWEEN) * percent / 100;
-        r.right = xpos - r.left;
-
-        r.top = cp->ypos; r.bottom = STATICHEIGHT;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
-              text, staticid);
-        r.top = cp->ypos + 8 + GAPWITHIN; r.bottom = EDITHEIGHT;
-        doctl(cp, r, "EDIT",
-              WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-              WS_EX_CLIENTEDGE,
-              "", editid);
+	char *text;
+	int staticid, editid, pcwidth;
+	text = va_arg(ap, char *);
+	if (!text)
+	    break;
+	staticid = va_arg(ap, int);
+	editid = va_arg(ap, int);
+	pcwidth = va_arg(ap, int);
+
+	r.left = xpos + GAPBETWEEN;
+	percent += pcwidth;
+	xpos = (cp->width + GAPBETWEEN) * percent / 100;
+	r.right = xpos - r.left;
+
+	r.top = cp->ypos;
+	r.bottom = STATICHEIGHT;
+	doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, staticid);
+	r.top = cp->ypos + 8 + GAPWITHIN;
+	r.bottom = EDITHEIGHT;
+	doctl(cp, r, "EDIT",
+	      WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
+	      WS_EX_CLIENTEDGE, "", editid);
     }
     va_end(ap);
-    cp->ypos += 8+GAPWITHIN+12+GAPBETWEEN;
+    cp->ypos += 8 + GAPWITHIN + 12 + GAPBETWEEN;
 }
 
 /*
@@ -153,16 +162,18 @@ void multiedit(struct ctlpos *cp, ...) {
  * 
  * (*) Button1  (*) Button2  (*) ButtonWithReallyLongTitle
  */
-void radioline(struct ctlpos *cp,
-               char *text, int id, int nacross, ...) {
+void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...)
+{
     RECT r;
     va_list ap;
     int group;
     int i;
     char *btext;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
     va_start(ap, nacross);
@@ -170,29 +181,30 @@ void radioline(struct ctlpos *cp,
     i = 0;
     btext = va_arg(ap, char *);
     while (1) {
-        char *nextbtext;
-        int bid;
-        if (!btext)
-            break;
-	if (i==nacross) {
+	char *nextbtext;
+	int bid;
+	if (!btext)
+	    break;
+	if (i == nacross) {
 	    cp->ypos += r.bottom + GAPBETWEEN;
-	    i=0;
+	    i = 0;
 	}
-        bid = va_arg(ap, int);
-        nextbtext = va_arg(ap, char *);
-        r.left = GAPBETWEEN + i * (cp->width+GAPBETWEEN)/nacross;
-        if (nextbtext)
-            r.right = (i+1) * (cp->width+GAPBETWEEN)/nacross - r.left;
-        else
-            r.right = cp->width - r.left;
-        r.top = cp->ypos; r.bottom = RADIOHEIGHT;
-        doctl(cp, r, "BUTTON",
-              BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
-              0,
-              btext, bid);
-        group = 0;
-        i++;
-        btext = nextbtext;
+	bid = va_arg(ap, int);
+	nextbtext = va_arg(ap, char *);
+	r.left = GAPBETWEEN + i * (cp->width + GAPBETWEEN) / nacross;
+	if (nextbtext)
+	    r.right =
+		(i + 1) * (cp->width + GAPBETWEEN) / nacross - r.left;
+	else
+	    r.right = cp->width - r.left;
+	r.top = cp->ypos;
+	r.bottom = RADIOHEIGHT;
+	doctl(cp, r, "BUTTON",
+	      BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+	      group, 0, btext, bid);
+	group = 0;
+	i++;
+	btext = nextbtext;
     }
     va_end(ap);
     cp->ypos += r.bottom + GAPBETWEEN;
@@ -202,32 +214,36 @@ void radioline(struct ctlpos *cp,
  * A set of radio buttons on multiple lines, with a static above
  * them.
  */
-void radiobig(struct ctlpos *cp, char *text, int id, ...) {
+void radiobig(struct ctlpos *cp, char *text, int id, ...)
+{
     RECT r;
     va_list ap;
     int group;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
     va_start(ap, id);
     group = WS_GROUP;
     while (1) {
-        char *btext;
-        int bid;
-        btext = va_arg(ap, char *);
-        if (!btext)
-            break;
-        bid = va_arg(ap, int);
-        r.left = GAPBETWEEN; r.top = cp->ypos;
-        r.right = cp->width; r.bottom = STATICHEIGHT;
-        cp->ypos += r.bottom + GAPWITHIN;
-        doctl(cp, r, "BUTTON",
-              BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
-              0,
-              btext, bid);
-        group = 0;
+	char *btext;
+	int bid;
+	btext = va_arg(ap, char *);
+	if (!btext)
+	    break;
+	bid = va_arg(ap, int);
+	r.left = GAPBETWEEN;
+	r.top = cp->ypos;
+	r.right = cp->width;
+	r.bottom = STATICHEIGHT;
+	cp->ypos += r.bottom + GAPWITHIN;
+	doctl(cp, r, "BUTTON",
+	      BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+	      group, 0, btext, bid);
+	group = 0;
     }
     va_end(ap);
     cp->ypos += GAPBETWEEN - GAPWITHIN;
@@ -236,25 +252,31 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...) {
 /*
  * A single standalone checkbox.
  */
-void checkbox(struct ctlpos *cp, char *text, int id) {
+void checkbox(struct ctlpos *cp, char *text, int id)
+{
     RECT r;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = CHECKBOXHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = CHECKBOXHEIGHT;
     cp->ypos += r.bottom + GAPBETWEEN;
     doctl(cp, r, "BUTTON",
-          BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0,
-          text, id);
+	  BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0,
+	  text, id);
 }
 
 /*
  * A single standalone static text control.
  */
-void statictext(struct ctlpos *cp, char *text, int id) {
+void statictext(struct ctlpos *cp, char *text, int id)
+{
     RECT r;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPBETWEEN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
 }
@@ -263,26 +285,30 @@ void statictext(struct ctlpos *cp, char *text, int id) {
  * A button on the right hand side, with a static to its left.
  */
 void staticbtn(struct ctlpos *cp, char *stext, int sid,
-               char *btext, int bid) {
+	       char *btext, int bid)
+{
     const int height = (PUSHBTNHEIGHT > STATICHEIGHT ?
-                        PUSHBTNHEIGHT : STATICHEIGHT);
+			PUSHBTNHEIGHT : STATICHEIGHT);
     RECT r;
     int lwid, rwid, rpos;
 
     rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
-    lwid = rpos - 2*GAPBETWEEN;
+    lwid = rpos - 2 * GAPBETWEEN;
     rwid = cp->width + GAPBETWEEN - rpos;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
-    r.right = lwid; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos + (height - STATICHEIGHT) / 2;
+    r.right = lwid;
+    r.bottom = STATICHEIGHT;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
-    r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
-    r.right = rwid; r.bottom = PUSHBTNHEIGHT;
+    r.left = rpos;
+    r.top = cp->ypos + (height - PUSHBTNHEIGHT) / 2;
+    r.right = rwid;
+    r.bottom = PUSHBTNHEIGHT;
     doctl(cp, r, "BUTTON",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-          0,
-          btext, bid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
+	  0, btext, bid);
 
     cp->ypos += height + GAPBETWEEN;
 }
@@ -291,38 +317,45 @@ void staticbtn(struct ctlpos *cp, char *stext, int sid,
  * An edit control on the right hand side, with a static to its left.
  */
 static void staticedit_internal(struct ctlpos *cp, char *stext,
-                                int sid, int eid, int percentedit,
-                                int style) {
+				int sid, int eid, int percentedit,
+				int style)
+{
     const int height = (EDITHEIGHT > STATICHEIGHT ?
-                        EDITHEIGHT : STATICHEIGHT);
+			EDITHEIGHT : STATICHEIGHT);
     RECT r;
     int lwid, rwid, rpos;
 
-    rpos = GAPBETWEEN + (100-percentedit) * (cp->width + GAPBETWEEN) / 100;
-    lwid = rpos - 2*GAPBETWEEN;
+    rpos =
+	GAPBETWEEN + (100 - percentedit) * (cp->width + GAPBETWEEN) / 100;
+    lwid = rpos - 2 * GAPBETWEEN;
     rwid = cp->width + GAPBETWEEN - rpos;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
-    r.right = lwid; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos + (height - STATICHEIGHT) / 2;
+    r.right = lwid;
+    r.bottom = STATICHEIGHT;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
-    r.left = rpos; r.top = cp->ypos + (height-EDITHEIGHT)/2;
-    r.right = rwid; r.bottom = EDITHEIGHT;
+    r.left = rpos;
+    r.top = cp->ypos + (height - EDITHEIGHT) / 2;
+    r.right = rwid;
+    r.bottom = EDITHEIGHT;
     doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | style,
-          WS_EX_CLIENTEDGE,
-          "", eid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | style,
+	  WS_EX_CLIENTEDGE, "", eid);
 
     cp->ypos += height + GAPBETWEEN;
 }
 
 void staticedit(struct ctlpos *cp, char *stext,
-                int sid, int eid, int percentedit) {
+		int sid, int eid, int percentedit)
+{
     staticedit_internal(cp, stext, sid, eid, percentedit, 0);
 }
 
 void staticpassedit(struct ctlpos *cp, char *stext,
-                    int sid, int eid, int percentedit) {
+		    int sid, int eid, int percentedit)
+{
     staticedit_internal(cp, stext, sid, eid, percentedit, ES_PASSWORD);
 }
 
@@ -330,59 +363,67 @@ void staticpassedit(struct ctlpos *cp, char *stext,
  * A big multiline edit control with a static labelling it.
  */
 void bigeditctrl(struct ctlpos *cp, char *stext,
-                 int sid, int eid, int lines) {
+		 int sid, int eid, int lines)
+{
     RECT r;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = EDITHEIGHT + (lines-1) * STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = EDITHEIGHT + (lines - 1) * STATICHEIGHT;
     cp->ypos += r.bottom + GAPBETWEEN;
     doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE,
-          WS_EX_CLIENTEDGE,
-          "", eid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE,
+	  WS_EX_CLIENTEDGE, "", eid);
 }
 
 /*
  * A tab-control substitute when a real tab control is unavailable.
  */
-void ersatztab(struct ctlpos *cp, char *stext, int sid,
-               int lid, int s2id) {
+void ersatztab(struct ctlpos *cp, char *stext, int sid, int lid, int s2id)
+{
     const int height = (COMBOHEIGHT > STATICHEIGHT ?
-                        COMBOHEIGHT : STATICHEIGHT);
+			COMBOHEIGHT : STATICHEIGHT);
     RECT r;
     int bigwid, lwid, rwid, rpos;
     static const int BIGGAP = 15;
     static const int MEDGAP = 3;
 
-    bigwid = cp->width + 2*GAPBETWEEN - 2*BIGGAP;
+    bigwid = cp->width + 2 * GAPBETWEEN - 2 * BIGGAP;
     cp->ypos += MEDGAP;
     rpos = BIGGAP + (bigwid + BIGGAP) / 2;
-    lwid = rpos - 2*BIGGAP;
+    lwid = rpos - 2 * BIGGAP;
     rwid = bigwid + BIGGAP - rpos;
 
-    r.left = BIGGAP; r.top = cp->ypos + (height-STATICHEIGHT)/2;
-    r.right = lwid; r.bottom = STATICHEIGHT;
+    r.left = BIGGAP;
+    r.top = cp->ypos + (height - STATICHEIGHT) / 2;
+    r.right = lwid;
+    r.bottom = STATICHEIGHT;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
-    r.left = rpos; r.top = cp->ypos + (height-COMBOHEIGHT)/2;
-    r.right = rwid; r.bottom = COMBOHEIGHT*10;
+    r.left = rpos;
+    r.top = cp->ypos + (height - COMBOHEIGHT) / 2;
+    r.right = rwid;
+    r.bottom = COMBOHEIGHT * 10;
     doctl(cp, r, "COMBOBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-          CBS_DROPDOWNLIST | CBS_HASSTRINGS,
-          WS_EX_CLIENTEDGE,
-          "", lid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+	  CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_CLIENTEDGE, "", lid);
 
     cp->ypos += height + MEDGAP + GAPBETWEEN;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = 2;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = 2;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ,
-          0, "", s2id);
+	  0, "", s2id);
 }
 
 /*
@@ -390,34 +431,39 @@ void ersatztab(struct ctlpos *cp, char *stext, int sid,
  * and a button on the right.
  */
 void editbutton(struct ctlpos *cp, char *stext, int sid,
-                int eid, char *btext, int bid) {
+		int eid, char *btext, int bid)
+{
     const int height = (EDITHEIGHT > PUSHBTNHEIGHT ?
-                        EDITHEIGHT : PUSHBTNHEIGHT);
+			EDITHEIGHT : PUSHBTNHEIGHT);
     RECT r;
     int lwid, rwid, rpos;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
     rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
-    lwid = rpos - 2*GAPBETWEEN;
+    lwid = rpos - 2 * GAPBETWEEN;
     rwid = cp->width + GAPBETWEEN - rpos;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos + (height-EDITHEIGHT)/2;
-    r.right = lwid; r.bottom = EDITHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos + (height - EDITHEIGHT) / 2;
+    r.right = lwid;
+    r.bottom = EDITHEIGHT;
     doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-          WS_EX_CLIENTEDGE,
-          "", eid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
+	  WS_EX_CLIENTEDGE, "", eid);
 
-    r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
-    r.right = rwid; r.bottom = PUSHBTNHEIGHT;
+    r.left = rpos;
+    r.top = cp->ypos + (height - PUSHBTNHEIGHT) / 2;
+    r.right = rwid;
+    r.bottom = PUSHBTNHEIGHT;
     doctl(cp, r, "BUTTON",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-          0,
-          btext, bid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
+	  0, btext, bid);
 
     cp->ypos += height + GAPBETWEEN;
 }
@@ -429,7 +475,8 @@ void editbutton(struct ctlpos *cp, char *stext, int sid,
  * buttons.
  */
 void sesssaver(struct ctlpos *cp, char *text,
-               int staticid, int editid, int listid, ...) {
+	       int staticid, int editid, int listid, ...)
+{
     RECT r;
     va_list ap;
     int lwid, rwid, rpos;
@@ -437,23 +484,26 @@ void sesssaver(struct ctlpos *cp, char *text,
     const int LISTDEFHEIGHT = 66;
 
     rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
-    lwid = rpos - 2*GAPBETWEEN;
+    lwid = rpos - 2 * GAPBETWEEN;
     rwid = cp->width + GAPBETWEEN - rpos;
 
     /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = lwid;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, staticid);
 
     /* The edit control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = EDITHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = lwid;
+    r.bottom = EDITHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-          WS_EX_CLIENTEDGE,
-          "", editid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
+	  WS_EX_CLIENTEDGE, "", editid);
 
     /*
      * The buttons (we should hold off on the list box until we
@@ -462,31 +512,34 @@ void sesssaver(struct ctlpos *cp, char *text,
     va_start(ap, listid);
     y = cp->ypos;
     while (1) {
-        char *btext = va_arg(ap, char *);
-        int bid;
-        if (!btext) break;
-        bid = va_arg(ap, int);
-        r.left = rpos; r.top = y;
-        r.right = rwid; r.bottom = PUSHBTNHEIGHT;
-        y += r.bottom + GAPWITHIN;
-        doctl(cp, r, "BUTTON",
-              WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-              0,
-              btext, bid);
+	char *btext = va_arg(ap, char *);
+	int bid;
+	if (!btext)
+	    break;
+	bid = va_arg(ap, int);
+	r.left = rpos;
+	r.top = y;
+	r.right = rwid;
+	r.bottom = PUSHBTNHEIGHT;
+	y += r.bottom + GAPWITHIN;
+	doctl(cp, r, "BUTTON",
+	      WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
+	      0, btext, bid);
     }
 
     /* Compute list box height. LISTDEFHEIGHT, or height of buttons. */
     y -= cp->ypos;
     y -= GAPWITHIN;
-    if (y < LISTDEFHEIGHT) y = LISTDEFHEIGHT;
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = y;
+    if (y < LISTDEFHEIGHT)
+	y = LISTDEFHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = lwid;
+    r.bottom = y;
     cp->ypos += y + GAPBETWEEN;
     doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | 
-          LBS_NOTIFY | LBS_HASSTRINGS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
+	  LBS_NOTIFY | LBS_HASSTRINGS, WS_EX_CLIENTEDGE, "", listid);
 }
 
 /*
@@ -495,66 +548,65 @@ void sesssaver(struct ctlpos *cp, char *text,
  * statics, and two buttons; then a list box.
  */
 void envsetter(struct ctlpos *cp, char *stext, int sid,
-               char *e1stext, int e1sid, int e1id,
-               char *e2stext, int e2sid, int e2id,
-               int listid,
-               char *b1text, int b1id, char *b2text, int b2id) {
+	       char *e1stext, int e1sid, int e1id,
+	       char *e2stext, int e2sid, int e2id,
+	       int listid, char *b1text, int b1id, char *b2text, int b2id)
+{
     RECT r;
-    const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
-                        STATICHEIGHT :
-                        EDITHEIGHT > PUSHBTNHEIGHT ?
-                        EDITHEIGHT : PUSHBTNHEIGHT);
+    const int height = (STATICHEIGHT > EDITHEIGHT
+			&& STATICHEIGHT >
+			PUSHBTNHEIGHT ? STATICHEIGHT : EDITHEIGHT >
+			PUSHBTNHEIGHT ? EDITHEIGHT : PUSHBTNHEIGHT);
     const static int percents[] = { 20, 35, 10, 25 };
     int i, j, xpos, percent;
     const int LISTHEIGHT = 42;
 
     /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
     /* The statics+edits+buttons. */
     for (j = 0; j < 2; j++) {
-        percent = 10;
-        for (i = 0; i < 4; i++) {
-            xpos = (cp->width + GAPBETWEEN) * percent / 100;
-            r.left = xpos + GAPBETWEEN;
-            percent += percents[i];
-            xpos = (cp->width + GAPBETWEEN) * percent / 100;
-            r.right = xpos - r.left;
-            r.top = cp->ypos;
-            r.bottom = (i==0 ? STATICHEIGHT :
-                        i==1 ? EDITHEIGHT :
-                        PUSHBTNHEIGHT);
-            r.top += (height-r.bottom)/2;
-            if (i==0) {
-                doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
-                      j==0 ? e1stext : e2stext, j==0 ? e1sid : e2sid);
-            } else if (i==1) {
-                doctl(cp, r, "EDIT",
-                      WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-                      WS_EX_CLIENTEDGE,
-                      "", j==0 ? e1id : e2id);
-            } else if (i==3) {
-                doctl(cp, r, "BUTTON",
-                      WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-                      0,
-                      j==0 ? b1text : b2text, j==0 ? b1id : b2id);
-            }
-        }
-        cp->ypos += height + GAPWITHIN;
+	percent = 10;
+	for (i = 0; i < 4; i++) {
+	    xpos = (cp->width + GAPBETWEEN) * percent / 100;
+	    r.left = xpos + GAPBETWEEN;
+	    percent += percents[i];
+	    xpos = (cp->width + GAPBETWEEN) * percent / 100;
+	    r.right = xpos - r.left;
+	    r.top = cp->ypos;
+	    r.bottom = (i == 0 ? STATICHEIGHT :
+			i == 1 ? EDITHEIGHT : PUSHBTNHEIGHT);
+	    r.top += (height - r.bottom) / 2;
+	    if (i == 0) {
+		doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
+		      j == 0 ? e1stext : e2stext, j == 0 ? e1sid : e2sid);
+	    } else if (i == 1) {
+		doctl(cp, r, "EDIT",
+		      WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
+		      WS_EX_CLIENTEDGE, "", j == 0 ? e1id : e2id);
+	    } else if (i == 3) {
+		doctl(cp, r, "BUTTON",
+		      WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
+		      0, j == 0 ? b1text : b2text, j == 0 ? b1id : b2id);
+	    }
+	}
+	cp->ypos += height + GAPWITHIN;
     }
 
     /* The list box. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = LISTHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = LISTHEIGHT;
     cp->ypos += r.bottom + GAPBETWEEN;
     doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
-          LBS_USETABSTOPS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS
+	  | LBS_USETABSTOPS, WS_EX_CLIENTEDGE, "", listid);
 }
 
 /*
@@ -563,56 +615,58 @@ void envsetter(struct ctlpos *cp, char *stext, int sid,
  * button-and-static-and-edit. 
  */
 void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
-               char *btext, int bid, int eid, char *s2text, int s2id) {
+	       char *btext, int bid, int eid, char *s2text, int s2id)
+{
     RECT r;
-    const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
-                        STATICHEIGHT :
-                        EDITHEIGHT > PUSHBTNHEIGHT ?
-                        EDITHEIGHT : PUSHBTNHEIGHT);
+    const int height = (STATICHEIGHT > EDITHEIGHT
+			&& STATICHEIGHT >
+			PUSHBTNHEIGHT ? STATICHEIGHT : EDITHEIGHT >
+			PUSHBTNHEIGHT ? EDITHEIGHT : PUSHBTNHEIGHT);
     const static int percents[] = { 30, 40, 30 };
     int i, xpos, percent;
     const int LISTHEIGHT = 66;
 
     /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
 
     /* The list box. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = LISTHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = LISTHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
-          LBS_USETABSTOPS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS
+	  | LBS_USETABSTOPS, WS_EX_CLIENTEDGE, "", listid);
 
     /* The button+static+edit. */
     percent = xpos = 0;
     for (i = 0; i < 3; i++) {
-        r.left = xpos + GAPBETWEEN;
-        percent += percents[i];
-        xpos = (cp->width + GAPBETWEEN) * percent / 100;
-        r.right = xpos - r.left;
-        r.top = cp->ypos;
-        r.bottom = (i==0 ? PUSHBTNHEIGHT :
-                    i==1 ? STATICHEIGHT :
-                    EDITHEIGHT);
-        r.top += (height-r.bottom)/2;
-        if (i==0) {
-            doctl(cp, r, "BUTTON",
-                  WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-                  0, btext, bid);
-        } else if (i==1) {
-            doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_CENTER,
-                  0, s2text, s2id);
-        } else if (i==2) {
-            doctl(cp, r, "EDIT",
-                  WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-                  WS_EX_CLIENTEDGE, "", eid);
-        }
+	r.left = xpos + GAPBETWEEN;
+	percent += percents[i];
+	xpos = (cp->width + GAPBETWEEN) * percent / 100;
+	r.right = xpos - r.left;
+	r.top = cp->ypos;
+	r.bottom = (i == 0 ? PUSHBTNHEIGHT :
+		    i == 1 ? STATICHEIGHT : EDITHEIGHT);
+	r.top += (height - r.bottom) / 2;
+	if (i == 0) {
+	    doctl(cp, r, "BUTTON",
+		  WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
+		  0, btext, bid);
+	} else if (i == 1) {
+	    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_CENTER,
+		  0, s2text, s2id);
+	} else if (i == 2) {
+	    doctl(cp, r, "EDIT",
+		  WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
+		  WS_EX_CLIENTEDGE, "", eid);
+	}
     }
     cp->ypos += height + GAPBETWEEN;
 }
@@ -623,7 +677,8 @@ void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
  * two-part statics followed by a button.
  */
 void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
-                char *btext, int bid, ...) {
+		char *btext, int bid, ...)
+{
     RECT r;
     int y;
     va_list ap;
@@ -631,49 +686,58 @@ void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
     const int LISTHEIGHT = 66;
 
     /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = STATICHEIGHT;
     cp->ypos += r.bottom + GAPWITHIN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-    
+
     rpos = GAPBETWEEN + 2 * (cp->width + GAPBETWEEN) / 3;
-    lwid = rpos - 2*GAPBETWEEN;
+    lwid = rpos - 2 * GAPBETWEEN;
     rwid = cp->width + GAPBETWEEN - rpos;
 
     /* The list box. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = LISTHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = lwid;
+    r.bottom = LISTHEIGHT;
     doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
-          LBS_USETABSTOPS | LBS_NOTIFY,
-          WS_EX_CLIENTEDGE,
-          "", listid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS
+	  | LBS_USETABSTOPS | LBS_NOTIFY, WS_EX_CLIENTEDGE, "", listid);
 
     /* The statics. */
     y = cp->ypos;
     va_start(ap, bid);
     while (1) {
-        char *ltext;
-        int lid, rid;
-        ltext = va_arg(ap, char *);
-        if (!ltext) break;
-        lid = va_arg(ap, int);
-        rid = va_arg(ap, int);
-        r.top = y; r.bottom = STATICHEIGHT;
-        y += r.bottom + GAPWITHIN;
-        r.left = rpos; r.right = rwid/2;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, ltext, lid);
-        r.left = rpos + r.right; r.right = rwid - r.right;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_RIGHT, 0, "", rid);
+	char *ltext;
+	int lid, rid;
+	ltext = va_arg(ap, char *);
+	if (!ltext)
+	    break;
+	lid = va_arg(ap, int);
+	rid = va_arg(ap, int);
+	r.top = y;
+	r.bottom = STATICHEIGHT;
+	y += r.bottom + GAPWITHIN;
+	r.left = rpos;
+	r.right = rwid / 2;
+	doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, ltext, lid);
+	r.left = rpos + r.right;
+	r.right = rwid - r.right;
+	doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_RIGHT, 0, "",
+	      rid);
     }
     va_end(ap);
 
     /* The button. */
-    r.top = y + 2*GAPWITHIN; r.bottom = PUSHBTNHEIGHT;
-    r.left = rpos; r.right = rwid;
+    r.top = y + 2 * GAPWITHIN;
+    r.bottom = PUSHBTNHEIGHT;
+    r.left = rpos;
+    r.right = rwid;
     doctl(cp, r, "BUTTON",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-          0, btext, bid);
+	  WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
+	  0, btext, bid);
 
     cp->ypos += LISTHEIGHT + GAPBETWEEN;
 }
@@ -683,17 +747,19 @@ void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
  * to be smooth and unbroken, without those ugly divisions; some
  * older compilers may not support that, but that's life.
  */
-void progressbar(struct ctlpos *cp, int id) {
+void progressbar(struct ctlpos *cp, int id)
+{
     RECT r;
 
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = PROGBARHEIGHT;
+    r.left = GAPBETWEEN;
+    r.top = cp->ypos;
+    r.right = cp->width;
+    r.bottom = PROGBARHEIGHT;
     cp->ypos += r.bottom + GAPBETWEEN;
 
-    doctl(cp, r, PROGRESS_CLASS,
-          WS_CHILD | WS_VISIBLE
+    doctl(cp, r, PROGRESS_CLASS, WS_CHILD | WS_VISIBLE
 #ifdef PBS_SMOOTH
-          | PBS_SMOOTH
+	  | PBS_SMOOTH
 #endif
-          , WS_EX_CLIENTEDGE, "", id);
+	  , WS_EX_CLIENTEDGE, "", id);
 }