X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f28d33e8164e6db6ef5c4bdca7c81945415aa4a9..91156e95a89b4618e6a306fda3717ab3b28dd080:/mac/macctrls.c

diff --git a/mac/macctrls.c b/mac/macctrls.c
index 24b8775c..0ee332c7 100644
--- a/mac/macctrls.c
+++ b/mac/macctrls.c
@@ -1,4 +1,4 @@
-/* $Id: macctrls.c,v 1.20 2003/03/29 22:04:21 ben Exp $ */
+/* $Id: macctrls.c,v 1.26 2003/04/05 15:08:17 ben Exp $ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.
@@ -211,7 +211,7 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window,
     rect = window->portRect;
 #endif
     curstate.pos.h = rect.left + 13;
-    curstate.pos.v = rect.bottom - 59;
+    curstate.pos.v = rect.bottom - 33;
     curstate.width = rect.right - rect.left - (13 * 2);
     if (mac_gestalts.apprvers >= 0x100)
 	CreateRootControl(window, &root);
@@ -223,7 +223,7 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window,
     for (i = 1; i < cb->nctrlsets; i++)
 	if (strcmp(cb->ctrlsets[i]->pathname, cb->ctrlsets[i-1]->pathname))
 	    mcs->npanels++;
-    mcs->panels = smalloc(sizeof(*mcs->panels) * mcs->npanels);
+    mcs->panels = snewn(mcs->npanels, union macctrl *);
     memset(mcs->panels, 0, sizeof(*mcs->panels) * mcs->npanels);
     curstate.panelnum = 0;
     for (i = 0; i < cb->nctrlsets; i++) {
@@ -235,15 +235,18 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window,
 	}
 	macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs);
     }
-    macctrl_switchtopanel(mcs, 2);
+    macctrl_switchtopanel(mcs, 1);
     /* 14 = proxies, 20 = SSH bugs */
 }
 
+#define MAXCOLS 16
+
 static void macctrl_layoutset(struct mac_layoutstate *curstate,
 			      struct controlset *s,
 			      WindowPtr window, struct macctrls *mcs)
 {
-    unsigned int i;
+    unsigned int i, j, ncols, colstart;
+    struct mac_layoutstate cols[MAXCOLS];
 
     fprintf(stderr, "--- begin set ---\n");
     fprintf(stderr, "pathname = %s\n", s->pathname);
@@ -252,11 +255,14 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate,
     if (s->boxtitle)
 	fprintf(stderr, "boxtitle = %s\n", s->boxtitle);
 
+    cols[0] = *curstate;
+    ncols = 1;
 
     for (i = 0; i < s->ncontrols; i++) {
 	union control *ctrl = s->ctrls[i];
 	char const *s;
 
+	colstart = COLUMN_START(ctrl->generic.column);
 	switch (ctrl->generic.type) {
 	  case CTRL_TEXT: s = "text"; break;
 	  case CTRL_EDITBOX: s = "editbox"; break;
@@ -272,27 +278,55 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate,
 	}
 	fprintf(stderr, "  control: %s\n", s);
 	switch (ctrl->generic.type) {
+	  case CTRL_COLUMNS:
+	    if (ctrl->columns.ncols != 1) {
+		ncols = ctrl->columns.ncols;
+		fprintf(stderr, "  split to %d\n", ncols);
+		assert(ncols <= MAXCOLS);
+		for (j = 0; j < ncols; j++) {
+		    cols[j] = cols[0];
+ 		    if (j > 0)
+			cols[j].pos.h = cols[j-1].pos.h + cols[j-1].width + 6;
+		    if (j == ncols - 1)
+			cols[j].width = curstate->width -
+			    (cols[j].pos.h - curstate->pos.h);
+		    else
+			cols[j].width = (curstate->width + 6) * 
+			    ctrl->columns.percentages[j] / 100 - 6;
+		}
+	    } else {
+		fprintf(stderr, "  join\n");
+		for (j = 0; j < ncols; j++)
+		    if (cols[j].pos.v > cols[0].pos.v)
+			cols[0].pos.v = cols[j].pos.v;
+		cols[0].width = curstate->width;
+		ncols = 1;
+	    }
+	    break;
 	  case CTRL_TEXT:
-	    macctrl_text(mcs, window, curstate, ctrl);
+	    macctrl_text(mcs, window, &cols[colstart], ctrl);
 	    break;
 	  case CTRL_EDITBOX:
-	    macctrl_editbox(mcs, window, curstate, ctrl);
+	    macctrl_editbox(mcs, window, &cols[colstart], ctrl);
 	    break;
 	  case CTRL_RADIO:
-	    macctrl_radio(mcs, window, curstate, ctrl);
+	    macctrl_radio(mcs, window, &cols[colstart], ctrl);
 	    break;
 	  case CTRL_CHECKBOX:
-	    macctrl_checkbox(mcs, window, curstate, ctrl);
+	    macctrl_checkbox(mcs, window, &cols[colstart], ctrl);
 	    break;
 	  case CTRL_BUTTON:
-	    macctrl_button(mcs, window, curstate, ctrl);
+	    macctrl_button(mcs, window, &cols[colstart], ctrl);
 	    break;
 	  case CTRL_LISTBOX:
 	    if (ctrl->listbox.height == 0)
-		macctrl_popup(mcs, window, curstate, ctrl);
+		macctrl_popup(mcs, window, &cols[colstart], ctrl);
 	    break;
 	}
     }
+    for (j = 0; j < ncols; j++)
+	if (cols[j].pos.v > curstate->pos.v)
+	    curstate->pos.v = cols[j].pos.v;
 }
 
 static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which)
@@ -379,7 +413,7 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window,
 			 struct mac_layoutstate *curstate,
 			 union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
+    union macctrl *mc = snew(union macctrl);
     Rect bounds;
     SInt16 height;
 
@@ -426,7 +460,7 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
 			    struct mac_layoutstate *curstate,
 			    union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
+    union macctrl *mc = snew(union macctrl);
     Rect lbounds, bounds;
 
     fprintf(stderr, "    label = %s\n", ctrl->editbox.label);
@@ -459,7 +493,7 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
 	SetControlData(mc->editbox.tblabel, kControlEntireControl,
 		       kControlStaticTextTextTag,
 		       strlen(ctrl->editbox.label), ctrl->editbox.label);
-	InsetRect(&bounds, 2, 2);
+	InsetRect(&bounds, 3, 3);
 	mc->editbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
 					ctrl->editbox.password ?
 					kControlEditTextPasswordProc :
@@ -553,7 +587,7 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window,
 			  struct mac_layoutstate *curstate,
 			  union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
+    union macctrl *mc = snew(union macctrl);
     Rect bounds;
     Str255 title;
     unsigned int i, colwidth;
@@ -562,8 +596,7 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window,
     mc->generic.type = MACCTRL_RADIO;
     mc->generic.ctrl = ctrl;
     mc->generic.privdata = NULL;
-    mc->radio.tbctrls =
-	smalloc(sizeof(*mc->radio.tbctrls) * ctrl->radio.nbuttons);
+    mc->radio.tbctrls = snewn(ctrl->radio.nbuttons, ControlRef);
     colwidth = (curstate->width + 13) /	ctrl->radio.ncolumns;
     bounds.top = curstate->pos.v;
     bounds.bottom = bounds.top + 16;
@@ -611,7 +644,7 @@ static void macctrl_checkbox(struct macctrls *mcs, WindowPtr window,
 			     struct mac_layoutstate *curstate,
 			     union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
+    union macctrl *mc = snew(union macctrl);
     Rect bounds;
     Str255 title;
 
@@ -637,7 +670,7 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window,
 			   struct mac_layoutstate *curstate,
 			   union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
+    union macctrl *mc = snew(union macctrl);
     Rect bounds;
     Str255 title;
 
@@ -648,7 +681,7 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window,
     mc->generic.ctrl = ctrl;
     mc->generic.privdata = NULL;
     bounds.left = curstate->pos.h;
-    bounds.right = bounds.left + 100; /* XXX measure string */
+    bounds.right = bounds.left + curstate->width;
     bounds.top = curstate->pos.v;
     bounds.bottom = bounds.top + 20;
     c2pstrcpy(title, ctrl->button.label);
@@ -723,7 +756,7 @@ static void macctrl_popup(struct macctrls *mcs, WindowPtr window,
 			  struct mac_layoutstate *curstate,
 			  union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
+    union macctrl *mc = snew(union macctrl);
     Rect bounds;
     Str255 title;
     unsigned int labelwidth;
@@ -908,13 +941,30 @@ void macctrl_key(WindowPtr window, EventRecord *event)
     struct macctrls *mcs = mac_winctrls(window);
     union macctrl *mc;
 
-    if (mac_gestalts.apprvers >= 0x100 &&
-	GetKeyboardFocus(window, &control) == noErr && control != NULL) {
-	HandleControlKey(control, (event->message & keyCodeMask) >> 8,
-			 event->message & charCodeMask, event->modifiers);
-	mc =  (union macctrl *)GetControlReference(control);
-	ctrlevent(mcs, mc, EVENT_VALCHANGE);
+    if (mac_gestalts.apprvers >= 0x100) {
+	if (GetKeyboardFocus(window, &control) == noErr && control != NULL) {
+	    HandleControlKey(control, (event->message & keyCodeMask) >> 8,
+			     event->message & charCodeMask, event->modifiers);
+	    mc = (union macctrl *)GetControlReference(control);
+	    ctrlevent(mcs, mc, EVENT_VALCHANGE);
+	}
+    }
+#if !TARGET_API_MAC_CARBON
+    else {
+	TEHandle te;
+
+	if (mcs->focus != NULL) {
+	    mc = mcs->focus;
+	    switch (mc->generic.type) {
+	      case MACCTRL_EDITBOX:
+		te = (TEHandle)(*mc->editbox.tbctrl)->contrlData;
+		TEKey(event->message & charCodeMask, te);
+		ctrlevent(mcs, mc, EVENT_VALCHANGE);
+		break;
+	    }
+	}
     }
+#endif
 }
 
 void macctrl_update(WindowPtr window)
@@ -1044,7 +1094,10 @@ void dlg_error_msg(void *dlg, char *msg)
 
 void dlg_end(void *dlg, int value)
 {
+    struct macctrls *mcs = dlg;
 
+    if (mcs->end != NULL)
+	(*mcs->end)(mcs->window, value);
 };
 
 void dlg_refresh(union control *ctrl, void *dlg)
@@ -1299,8 +1352,7 @@ static void dlg_macpopup_addwithid(union control *ctrl, void *dlg,
     index = CountMenuItems(menu) - 1;
     if (mc->popup.nids <= index) {
 	mc->popup.nids = index + 1;
-	mc->popup.ids = srealloc(mc->popup.ids,
-				 mc->popup.nids * sizeof(*mc->popup.ids));
+	mc->popup.ids = sresize(mc->popup.ids, mc->popup.nids, int);
     }
     mc->popup.ids[index] = id;
 }