Support for Windows PuTTY connecting straight to a local serial port
[u/mdw/putty] / mac / macctrls.c
index 4aa9ce9..e5e774d 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: macctrls.c,v 1.16 2003/03/28 00:06:17 ben Exp $ */
+/* $Id$ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.
 
 #include <MacTypes.h>
 #include <Appearance.h>
+#include <ColorPicker.h>
 #include <Controls.h>
 #include <ControlDefinitions.h>
+#include <Events.h>
+#include <Lists.h>
 #include <Menus.h>
 #include <Resources.h>
 #include <Script.h>
@@ -60,7 +63,9 @@ union macctrl {
            MACCTRL_RADIO,
            MACCTRL_CHECKBOX,
            MACCTRL_BUTTON,
-           MACCTRL_POPUP
+           MACCTRL_LISTBOX,
+           MACCTRL_POPUP,
+           MACCTRL_GROUPBOX
        } type;
        /* Template from which this was generated */
        union control *ctrl;
@@ -76,10 +81,17 @@ union macctrl {
     struct {
        struct macctrl_generic generic;
        ControlRef tbctrl;
+       ControlRef tblabel;
+       ControlRef tbbutton;
+       MenuRef menu;
+       int menuid;
+       unsigned int nids;
+       int *ids;
     } editbox;
     struct {
        struct macctrl_generic generic;
        ControlRef *tbctrls;
+       ControlRef tblabel;
     } radio;
     struct {
        struct macctrl_generic generic;
@@ -88,19 +100,35 @@ union macctrl {
     struct {
        struct macctrl_generic generic;
        ControlRef tbctrl;
+       ControlRef tbring;
     } button;
     struct {
        struct macctrl_generic generic;
        ControlRef tbctrl;
+       ControlRef tbup;
+       ControlRef tbdown;
+       ListHandle list;
+       unsigned int nids;
+       int *ids;
+    } listbox;
+    struct {
+       struct macctrl_generic generic;
+       ControlRef tbctrl;
        MenuRef menu;
        int menuid;
        unsigned int nids;
        int *ids;
     } popup;
+    struct {
+       struct macctrl_generic generic;
+       ControlRef tbctrl;
+    } groupbox;
 };
 
 struct mac_layoutstate {
     Point pos;
+    Point boxpos;
+    char *boxname;
     unsigned int width;
     unsigned int panelnum;
 };
@@ -116,7 +144,9 @@ struct mac_layoutstate {
 
 static void macctrl_layoutset(struct mac_layoutstate *, struct controlset *, 
                              WindowPtr, struct macctrls *);
+static void macctrl_hideshowpanel(struct macctrls *, unsigned int, int);
 static void macctrl_switchtopanel(struct macctrls *, unsigned int);
+static void macctrl_setfocus(struct macctrls *, union macctrl *);
 static void macctrl_text(struct macctrls *, WindowPtr,
                         struct mac_layoutstate *, union control *);
 static void macctrl_editbox(struct macctrls *, WindowPtr,
@@ -127,15 +157,24 @@ static void macctrl_checkbox(struct macctrls *, WindowPtr,
                             struct mac_layoutstate *, union control *);
 static void macctrl_button(struct macctrls *, WindowPtr,
                           struct mac_layoutstate *, union control *);
+static void macctrl_listbox(struct macctrls *, WindowPtr,
+                           struct mac_layoutstate *, union control *);
 static void macctrl_popup(struct macctrls *, WindowPtr,
                          struct mac_layoutstate *, union control *);
+static void macctrl_groupbox(struct macctrls *, WindowPtr,
+                            struct mac_layoutstate *, union control *);
+static void draglist_up(union macctrl *, struct macctrls *);
+static void draglist_down(union macctrl *, struct macctrls *);
+
 #if !TARGET_API_MAC_CARBON
-static pascal SInt32 macctrl_sys7_text_cdef(SInt16, ControlRef,
-                                           ControlDefProcMessage, SInt32);
 static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16, ControlRef,
                                               ControlDefProcMessage, SInt32);
 static pascal SInt32 macctrl_sys7_default_cdef(SInt16, ControlRef,
                                               ControlDefProcMessage, SInt32);
+static pascal SInt32 macctrl_sys7_listbox_cdef(SInt16, ControlRef,
+                                              ControlDefProcMessage, SInt32);
+static pascal SInt32 macctrl_sys7_groupbox_cdef(SInt16, ControlRef,
+                                               ControlDefProcMessage, SInt32);
 #endif
 
 #if !TARGET_API_MAC_CARBON
@@ -160,12 +199,14 @@ static void macctrl_init()
     PatchCDEF cdef;
 
     if (inited) return;
-    cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_Text);
-    (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_text_cdef);
     cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_EditBox);
     (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_editbox_cdef);
     cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_Default);
     (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_default_cdef);
+    cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_ListBox);
+    (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_listbox_cdef);
+    cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_GroupBox);
+    (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_groupbox_cdef);
     inited = 1;
 #endif
 }
@@ -197,6 +238,18 @@ static int macctrl_cmp_byctrl_find(void *av, void *bv)
        return 0;
 }
 
+static union control panellist;
+
+static void panellist_handler(union control *ctrl, void *dlg, void *data,
+                             int event)
+{
+    struct macctrls *mcs = dlg;
+
+    /* XXX what if there's no selection? */
+    if (event == EVENT_SELCHANGE)
+       macctrl_switchtopanel(mcs, dlg_listbox_index(ctrl, dlg) + 1);
+}
+
 void macctrl_layoutbox(struct controlbox *cb, WindowPtr window,
                       struct macctrls *mcs)
 {
@@ -206,89 +259,231 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window,
     Rect rect;
 
     macctrl_init();
+    if (mac_gestalts.apprvers >= 0x100)
+       CreateRootControl(window, &root);
 #if TARGET_API_MAC_CARBON
     GetPortBounds(GetWindowPort(window), &rect);
 #else
     rect = window->portRect;
 #endif
-    curstate.pos.h = rect.left + 13;
-    curstate.pos.v = rect.bottom - 59;
-    curstate.width = rect.right - rect.left - (13 * 2);
-    if (mac_gestalts.apprvers >= 0x100)
-       CreateRootControl(window, &root);
     mcs->window = window;
     mcs->byctrl = newtree234(macctrl_cmp_byctrl);
+    mcs->focus = NULL;
+    mcs->defbutton = NULL;
+    mcs->canbutton = NULL;
+    mcs->curpanel = 1;
     /* Count the number of panels */
     mcs->npanels = 1;
     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;
+
+    curstate.pos.h = rect.left + 13;
+    curstate.pos.v = rect.top + 13;
+    curstate.width = 160;
+    panellist.listbox.type = CTRL_LISTBOX;
+    panellist.listbox.handler = &panellist_handler;
+    panellist.listbox.height = 20;
+    panellist.listbox.percentwidth = 100;
+    macctrl_listbox(mcs, window, &curstate, &panellist);
+    /* XXX Start with panel 1 active */
+
+    curstate.pos.h = rect.left + 13 + 160 + 13;
+    curstate.pos.v = rect.bottom - 33;
+    curstate.width = rect.right - (rect.left + 13 + 160) - (13 * 2);
     for (i = 0; i < cb->nctrlsets; i++) {
        if (i > 0 && strcmp(cb->ctrlsets[i]->pathname,
                            cb->ctrlsets[i-1]->pathname)) {
            curstate.pos.v = rect.top + 13;
            curstate.panelnum++;
            assert(curstate.panelnum < mcs->npanels);
+           dlg_listbox_add(&panellist, mcs, cb->ctrlsets[i]->pathname);
        }
        macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs);
     }
     macctrl_switchtopanel(mcs, 1);
+    macctrl_hideshowpanel(mcs, 0, TRUE);
+    /* 14 = proxies, 19 = portfwd, 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, colspan;
+    struct mac_layoutstate cols[MAXCOLS], pos;
+
+    /* Start a containing box, if we have a boxname. */
+    if (s->boxname && *s->boxname) {
+       curstate->boxpos = curstate->pos;
+       if (s->boxtitle) {
+           curstate->boxname = s->boxtitle;
+           curstate->pos.v += 10; /* XXX determine font height */
+       } else {
+           curstate->boxname = NULL;
+       }
+       curstate->pos.v += 6;
+       curstate->pos.h += 12;
+       curstate->width -= 24;
+    }
 
-    fprintf(stderr, "--- begin set ---\n");
-    fprintf(stderr, "pathname = %s\n", s->pathname);
-    if (s->boxname && *s->boxname)
-       fprintf(stderr, "boxname = %s\n", s->boxname);
-    if (s->boxtitle)
-       fprintf(stderr, "boxtitle = %s\n", s->boxtitle);
+    /* Draw a title, if we have one. */
+    if (!s->boxname && s->boxtitle) {
+       union control *ctrl = snew(union control);
+       ctrl->generic.handler = NULL;
+       ctrl->text.label = dupstr(s->boxtitle);
+       macctrl_text(mcs, window, curstate, ctrl);
+       /* FIXME: should be highlighted, centred or boxed */
+    }
 
+    cols[0] = *curstate;
+    ncols = 1;
 
     for (i = 0; i < s->ncontrols; i++) {
        union control *ctrl = s->ctrls[i];
-       char const *s;
-
-       switch (ctrl->generic.type) {
-         case CTRL_TEXT: s = "text"; break;
-         case CTRL_EDITBOX: s = "editbox"; break;
-         case CTRL_RADIO: s = "radio"; break;
-         case CTRL_CHECKBOX: s = "checkbox"; break;
-         case CTRL_BUTTON: s = "button"; break;
-         case CTRL_LISTBOX: s = "listbox"; break;
-         case CTRL_COLUMNS: s = "columns"; break;
-         case CTRL_FILESELECT: s = "fileselect"; break;
-         case CTRL_FONTSELECT: s = "fontselect"; break;
-         case CTRL_TABDELAY: s = "tabdelay"; break;
-         default: s = "unknown"; break;
+
+       colstart = COLUMN_START(ctrl->generic.column);
+       colspan = COLUMN_SPAN(ctrl->generic.column);
+       if (ctrl->generic.type == CTRL_COLUMNS) {
+           if (ctrl->columns.ncols != 1) {
+               ncols = ctrl->columns.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 {
+               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;
+           }
+       } else {
+           pos = cols[colstart];
+           pos.width = cols[colstart + colspan - 1].width +
+               (cols[colstart + colspan - 1].pos.h - cols[colstart].pos.h);
+
+           for (j = colstart; j < colstart + colspan; j++)
+               if (pos.pos.v < cols[j].pos.v)
+                   pos.pos.v = cols[j].pos.v;
+
+           switch (ctrl->generic.type) {
+             case CTRL_TEXT:
+               macctrl_text(mcs, window, &pos, ctrl);
+               break;
+             case CTRL_EDITBOX:
+               macctrl_editbox(mcs, window, &pos, ctrl);
+               break;
+             case CTRL_RADIO:
+               macctrl_radio(mcs, window, &pos, ctrl);
+               break;
+             case CTRL_CHECKBOX:
+               macctrl_checkbox(mcs, window, &pos, ctrl);
+               break;
+             case CTRL_BUTTON:
+               macctrl_button(mcs, window, &pos, ctrl);
+               break;
+             case CTRL_LISTBOX:
+               if (ctrl->listbox.height == 0)
+                   macctrl_popup(mcs, window, &pos, ctrl);
+               else
+                   macctrl_listbox(mcs, window, &pos, ctrl);
+               break;
+           }
+           for (j = colstart; j < colstart + colspan; j++)
+               cols[j].pos.v = pos.pos.v;
        }
-       fprintf(stderr, "  control: %s\n", s);
-       switch (ctrl->generic.type) {
-         case CTRL_TEXT:
-           macctrl_text(mcs, window, curstate, ctrl);
+    }
+    for (j = 0; j < ncols; j++)
+       if (cols[j].pos.v > curstate->pos.v)
+           curstate->pos.v = cols[j].pos.v;
+
+    if (s->boxname && *s->boxname) {
+       union control *ctrl = snew(union control);
+       /* We're coming out of a box, so set the width back */
+       curstate->pos.h -= 12;
+       curstate->width += 24;
+       /* And draw the box to the original width */
+       macctrl_groupbox(mcs, window, curstate, ctrl);
+    }
+}
+
+static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel,
+                                 int showit)
+{
+    union macctrl *mc;
+    int j;
+
+#define hideshow(c) do {                                               \
+    if (showit) ShowControl(c); else HideControl(c);                   \
+} while (0)
+
+    for (mc = mcs->panels[panel]; mc != NULL; mc = mc->generic.next) {
+#if !TARGET_API_MAC_CARBON
+       if (mcs->focus == mc)
+           macctrl_setfocus(mcs, NULL);
+#endif
+       switch (mc->generic.type) {
+         case MACCTRL_TEXT:
+           hideshow(mc->text.tbctrl);
+           break;
+         case MACCTRL_EDITBOX:
+           hideshow(mc->editbox.tbctrl);
+           if (mc->editbox.tblabel != NULL)
+               hideshow(mc->editbox.tblabel);
+           if (mc->editbox.tbbutton != NULL)
+               hideshow(mc->editbox.tbbutton);
            break;
-         case CTRL_EDITBOX:
-           macctrl_editbox(mcs, window, curstate, ctrl);
+         case MACCTRL_RADIO:
+           for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++)
+               hideshow(mc->radio.tbctrls[j]);
+           if (mc->radio.tblabel != NULL)
+               hideshow(mc->radio.tblabel);
+           break;
+         case MACCTRL_CHECKBOX:
+           hideshow(mc->checkbox.tbctrl);
            break;
-         case CTRL_RADIO:
-           macctrl_radio(mcs, window, curstate, ctrl);
+         case MACCTRL_BUTTON:
+           hideshow(mc->button.tbctrl);
+           if (mc->button.tbring != NULL)
+               hideshow(mc->button.tbring);
            break;
-         case CTRL_CHECKBOX:
-           macctrl_checkbox(mcs, window, curstate, ctrl);
+         case MACCTRL_LISTBOX:
+           hideshow(mc->listbox.tbctrl);
+           if (mc->listbox.tbup != NULL)
+               hideshow(mc->listbox.tbup);
+           if (mc->listbox.tbdown != NULL)
+               hideshow(mc->listbox.tbdown);
+           /*
+            * At least under Mac OS 8.1, hiding a list box
+            * doesn't hide its scroll bars.
+            */
+#if TARGET_API_MAC_CARBON
+           hideshow(GetListVerticalScrollBar(mc->listbox.list));
+#else
+           hideshow((*mc->listbox.list)->vScroll);
+#endif
            break;
-         case CTRL_BUTTON:
-           macctrl_button(mcs, window, curstate, ctrl);
+         case MACCTRL_POPUP:
+           hideshow(mc->popup.tbctrl);
            break;
-         case CTRL_LISTBOX:
-           if (ctrl->listbox.height == 0)
-               macctrl_popup(mcs, window, curstate, ctrl);
+         case MACCTRL_GROUPBOX:
+           hideshow(mc->groupbox.tbctrl);
            break;
        }
     }
@@ -296,48 +491,60 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate,
 
 static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which)
 {
-    unsigned int i, j;
-    union macctrl *mc;
-
-#define hideshow(c) do {                                               \
-    if (i == which) ShowControl(c); else HideControl(c);               \
-} while (0)
 
+    macctrl_hideshowpanel(mcs, mcs->curpanel, FALSE);
+    macctrl_hideshowpanel(mcs, which, TRUE);
     mcs->curpanel = which;
-    /* Panel 0 is special and always visible. */
-    for (i = 1; i < mcs->npanels; i++)
-       for (mc = mcs->panels[i]; mc != NULL; mc = mc->generic.next)
-           switch (mc->generic.type) {
-             case MACCTRL_TEXT:
-               hideshow(mc->text.tbctrl);
-               break;
-             case MACCTRL_EDITBOX:
-               hideshow(mc->editbox.tbctrl);
-               break;
-             case MACCTRL_RADIO:
-               for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++)
-                   hideshow(mc->radio.tbctrls[j]);
-               break;
-             case MACCTRL_CHECKBOX:
-               hideshow(mc->checkbox.tbctrl);
-               break;
-             case MACCTRL_BUTTON:
-               hideshow(mc->button.tbctrl);
-               break;
-             case MACCTRL_POPUP:
-               hideshow(mc->popup.tbctrl);
-               break;
-           }
 }
 
+#if !TARGET_API_MAC_CARBON
+/*
+ * System 7 focus manipulation
+ */
+static void macctrl_defocus(union macctrl *mc)
+{
+
+    assert(mac_gestalts.apprvers < 0x100);
+    switch (mc->generic.type) {
+      case MACCTRL_EDITBOX:
+       TEDeactivate((TEHandle)(*mc->editbox.tbctrl)->contrlData);
+       break;
+    }
+}
+
+static void macctrl_enfocus(union macctrl *mc)
+{
+
+    assert(mac_gestalts.apprvers < 0x100);
+    switch (mc->generic.type) {
+      case MACCTRL_EDITBOX:
+       TEActivate((TEHandle)(*mc->editbox.tbctrl)->contrlData);
+       break;
+    }
+}
+
+static void macctrl_setfocus(struct macctrls *mcs, union macctrl *mc)
+{
+
+    if (mcs->focus == mc)
+       return;
+    if (mcs->focus != NULL)
+       macctrl_defocus(mcs->focus);
+    mcs->focus = mc;
+    if (mc != NULL)
+       macctrl_enfocus(mc);
+}
+#endif
+
 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;
 
-    fprintf(stderr, "    label = %s\n", ctrl->text.label);
+    assert(ctrl->text.label != NULL);
     mc->generic.type = MACCTRL_TEXT;
     mc->generic.ctrl = ctrl;
     mc->generic.privdata = NULL;
@@ -346,10 +553,9 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window,
     bounds.top = curstate->pos.v;
     bounds.bottom = bounds.top + 16;
     if (mac_gestalts.apprvers >= 0x100) {
-       SInt16 height;
        Size olen;
 
-       mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
+       mc->text.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
                                     kControlStaticTextProc, (long)mc);
        SetControlData(mc->text.tbctrl, kControlEntireControl,
                       kControlStaticTextTextTag,
@@ -357,82 +563,117 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window,
        GetControlData(mc->text.tbctrl, kControlEntireControl,
                       kControlStaticTextTextHeightTag,
                       sizeof(height), &height, &olen);
-       fprintf(stderr, "    height = %d\n", height);
-       SizeControl(mc->text.tbctrl, curstate->width, height);
-       curstate->pos.v += height + 6;
-    } else {
-       Str255 title;
+    }
+#if !TARGET_API_MAC_CARBON
+    else {
+       TEHandle te;
 
-       c2pstrcpy(title, ctrl->text.label);
-       mc->text.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 0,
+       mc->text.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
                                     SYS7_TEXT_PROC, (long)mc);
+       te = (TEHandle)(*mc->text.tbctrl)->contrlData;
+       TESetText(ctrl->text.label, strlen(ctrl->text.label), te);
+       height = TEGetHeight(1, (*te)->nLines, te);
     }
+#endif
+    SizeControl(mc->text.tbctrl, curstate->width, height);
+    curstate->pos.v += height + 6;
     add234(mcs->byctrl, mc);
     mc->generic.next = mcs->panels[curstate->panelnum];
     mcs->panels[curstate->panelnum] = mc;
 }
 
-#if !TARGET_API_MAC_CARBON
-static pascal SInt32 macctrl_sys7_text_cdef(SInt16 variant, ControlRef control,
-                                    ControlDefProcMessage msg, SInt32 param)
-{
-    RgnHandle rgn;
-
-    switch (msg) {
-      case drawCntl:
-       if ((*control)->contrlVis)
-           TETextBox((*control)->contrlTitle + 1, (*control)->contrlTitle[0],
-                     &(*control)->contrlRect, teFlushDefault);
-       return 0;
-      case calcCRgns:
-       if (param & (1 << 31)) {
-           param &= ~(1 << 31);
-           goto calcthumbrgn;
-       }
-       /* FALLTHROUGH */
-      case calcCntlRgn:
-       rgn = (RgnHandle)param;
-       RectRgn(rgn, &(*control)->contrlRect);
-       return 0;
-      case calcThumbRgn:
-      calcthumbrgn:
-       rgn = (RgnHandle)param;
-       SetEmptyRgn(rgn);
-       return 0;
-    }
-
-    return 0;
-}
-#endif
-
 static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
                            struct mac_layoutstate *curstate,
                            union control *ctrl)
 {
-    union macctrl *mc = smalloc(sizeof *mc);
-    Rect bounds;
+    union macctrl *mc = snew(union macctrl);
+    Rect lbounds, bounds, butbounds;
+    static int nextmenuid = MENU_MIN;
+    int menuid;
+    MenuRef menu;
 
-    fprintf(stderr, "    label = %s\n", ctrl->editbox.label);
-    fprintf(stderr, "    percentwidth = %d\n", ctrl->editbox.percentwidth);
-    if (ctrl->editbox.password) fprintf(stderr, "    password\n");
-    if (ctrl->editbox.has_list) fprintf(stderr, "    has list\n");
     mc->generic.type = MACCTRL_EDITBOX;
     mc->generic.ctrl = ctrl;
     mc->generic.privdata = NULL;
-    bounds.left = curstate->pos.h;
-    bounds.right = bounds.left + curstate->width;
+    lbounds.left = curstate->pos.h;
+    lbounds.top = curstate->pos.v;
+    if (ctrl->editbox.percentwidth == 100) {
+       if (ctrl->editbox.label != NULL) {
+           lbounds.right = lbounds.left + curstate->width;
+           lbounds.bottom = lbounds.top + 16;
+           curstate->pos.v += 18;
+       }
+       bounds.left = curstate->pos.h;
+       bounds.right = bounds.left + curstate->width;
+    } else {
+       lbounds.right = lbounds.left +
+           curstate->width * (100 - ctrl->editbox.percentwidth) / 100;
+       lbounds.bottom = lbounds.top + 22;
+       bounds.left = lbounds.right;
+       bounds.right = lbounds.left + curstate->width;
+    }
     bounds.top = curstate->pos.v;
     bounds.bottom = bounds.top + 22;
+
+    if (ctrl->editbox.has_list) {
+       butbounds = bounds;
+       butbounds.left = butbounds.right - 20;
+       bounds.right -= 26; /* enough for 6 px gap and a button */
+    }
+
     if (mac_gestalts.apprvers >= 0x100) {
-       InsetRect(&bounds, 2, 2);
-       mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
-                                    ctrl->editbox.password ?
-                                    kControlEditTextPasswordProc :
-                                    kControlEditTextProc, (long)mc);
-    } else {
-       mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
-                                    SYS7_EDITBOX_PROC, (long)mc);
+       if (ctrl->editbox.label == NULL)
+           mc->editbox.tblabel = NULL;
+       else {
+           mc->editbox.tblabel = NewControl(window, &lbounds, NULL, FALSE,
+                                            0, 0, 0, kControlStaticTextProc,
+                                            (long)mc);
+           SetControlData(mc->editbox.tblabel, kControlEntireControl,
+                          kControlStaticTextTextTag,
+                          strlen(ctrl->editbox.label), ctrl->editbox.label);
+       }
+       InsetRect(&bounds, 3, 3);
+       mc->editbox.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
+                                       ctrl->editbox.password ?
+                                       kControlEditTextPasswordProc :
+                                       kControlEditTextProc, (long)mc);
     }
+#if !TARGET_API_MAC_CARBON
+    else {
+       if (ctrl->editbox.label == NULL)
+           mc->editbox.tblabel = NULL;
+       else {
+           mc->editbox.tblabel = NewControl(window, &lbounds, NULL, FALSE,
+                                            0, 0, 0, SYS7_TEXT_PROC,
+                                            (long)mc);
+           TESetText(ctrl->editbox.label, strlen(ctrl->editbox.label),
+                     (TEHandle)(*mc->editbox.tblabel)->contrlData);
+       }
+       mc->editbox.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
+                                       SYS7_EDITBOX_PROC, (long)mc);
+    }
+#endif
+
+    if (ctrl->editbox.has_list) {
+       while (GetMenuHandle(nextmenuid) != NULL)
+           if (++nextmenuid >= MENU_MAX) nextmenuid = MENU_MIN;
+       menuid = nextmenuid++;
+       menu = NewMenu(menuid, "\pdummy");
+       if (menu == NULL) goto nomenu;
+       mc->editbox.menu = menu;
+       mc->editbox.menuid = menuid;
+       InsertMenu(menu, kInsertHierarchicalMenu);
+       mc->editbox.nids = 0;
+       mc->editbox.ids = NULL;
+
+       mc->editbox.tbbutton = NewControl(window, &butbounds, NULL, FALSE,
+                                         popupTitleLeftJust, menuid, 0,
+                                         popupMenuProc + popupFixedWidth,
+                                         (long)mc);
+    }
+
+  nomenu:
+
     curstate->pos.v += 28;
     add234(mcs->byctrl, mc);
     mc->generic.next = mcs->panels[curstate->panelnum];
@@ -450,11 +691,13 @@ static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant,
     Rect rect;
     TEHandle te;
     long ssfs;
+    Point mouse;
 
     switch (msg) {
       case initCntl:
        rect = (*control)->contrlRect;
-       InsetRect(&rect, 3, 3); /* 2 if it's 20 pixels high */
+       if (variant == SYS7_EDITBOX_VARIANT)
+           InsetRect(&rect, 3, 3); /* 2 if it's 20 pixels high */
        te = TENew(&rect, &rect);
        ssfs = GetScriptVariable(smSystemScript, smScriptSysFondSize);
        (*te)->txSize = LoWord(ssfs);
@@ -467,12 +710,24 @@ static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant,
       case drawCntl:
        if ((*control)->contrlVis) {
            rect = (*control)->contrlRect;
-           PenNormal();
-           FrameRect(&rect);
-           InsetRect(&rect, 3, 3);
+           if (variant == SYS7_EDITBOX_VARIANT) {
+               PenNormal();
+               FrameRect(&rect);
+               InsetRect(&rect, 3, 3);
+           }
+           EraseRect(&rect);
+           (*(TEHandle)(*control)->contrlData)->viewRect = rect;
            TEUpdate(&rect, (TEHandle)(*control)->contrlData);
        }
        return 0;
+      case testCntl:
+       if (variant == SYS7_TEXT_VARIANT)
+           return kControlNoPart;
+       mouse.h = LoWord(param);
+       mouse.v = HiWord(param);
+       rect = (*control)->contrlRect;
+       InsetRect(&rect, 3, 3);
+       return PtInRect(mouse, &rect) ? kControlEditTextPart : kControlNoPart;
       case calcCRgns:
        if (param & (1 << 31)) {
            param &= ~(1 << 31);
@@ -493,25 +748,47 @@ static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant,
     return 0;
 }
 #endif
-
+                            
 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;
 
-    fprintf(stderr, "    label = %s\n", ctrl->radio.label);
     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;
+    bounds.left = curstate->pos.h;
+    bounds.right = bounds.left + curstate->width;
+    if (ctrl->radio.label == NULL)
+       mc->radio.tblabel = NULL;
+    else {
+       if (mac_gestalts.apprvers >= 0x100) {
+           mc->radio.tblabel = NewControl(window, &bounds, NULL, FALSE,
+                                          0, 0, 0, kControlStaticTextProc,
+                                          (long)mc);
+           SetControlData(mc->radio.tblabel, kControlEntireControl,
+                          kControlStaticTextTextTag,
+                          strlen(ctrl->radio.label), ctrl->radio.label);
+       }
+#if !TARGET_API_MAC_CARBON
+       else {
+           mc->radio.tblabel = NewControl(window, &bounds, NULL, FALSE,
+                                          0, 0, 0, SYS7_TEXT_PROC, (long)mc);
+           TESetText(ctrl->radio.label, strlen(ctrl->radio.label),
+                     (TEHandle)(*mc->radio.tblabel)->contrlData);
+       }
+#endif
+       curstate->pos.v += 18;
+    }
     for (i = 0; i < ctrl->radio.nbuttons; i++) {
-       fprintf(stderr, "    button = %s\n", ctrl->radio.buttons[i]);
        bounds.top = curstate->pos.v - 2;
        bounds.bottom = bounds.top + 18;
        bounds.left = curstate->pos.h + colwidth * (i % ctrl->radio.ncolumns);
@@ -522,7 +799,7 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window,
        } else
            bounds.right = bounds.left + colwidth - 13;
        c2pstrcpy(title, ctrl->radio.buttons[i]);
-       mc->radio.tbctrls[i] = NewControl(window, &bounds, title, TRUE,
+       mc->radio.tbctrls[i] = NewControl(window, &bounds, title, FALSE,
                                          0, 0, 1, radioButProc, (long)mc);
     }
     curstate->pos.v += 4;
@@ -536,11 +813,11 @@ 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;
 
-    fprintf(stderr, "    label = %s\n", ctrl->checkbox.label);
+    assert(ctrl->checkbox.label != NULL);
     mc->generic.type = MACCTRL_CHECKBOX;
     mc->generic.ctrl = ctrl;
     mc->generic.privdata = NULL;
@@ -549,7 +826,7 @@ static void macctrl_checkbox(struct macctrls *mcs, WindowPtr window,
     bounds.top = curstate->pos.v;
     bounds.bottom = bounds.top + 16;
     c2pstrcpy(title, ctrl->checkbox.label);
-    mc->checkbox.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 1,
+    mc->checkbox.tbctrl = NewControl(window, &bounds, title, FALSE, 0, 0, 1,
                                     checkBoxProc, (long)mc);
     add234(mcs->byctrl, mc);
     curstate->pos.v += 22;
@@ -562,23 +839,22 @@ 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;
 
-    fprintf(stderr, "    label = %s\n", ctrl->button.label);
-    if (ctrl->button.isdefault)
-       fprintf(stderr, "    is default\n");
+    assert(ctrl->button.label != NULL);
     mc->generic.type = MACCTRL_BUTTON;
     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);
-    mc->button.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 1,
+    mc->button.tbctrl = NewControl(window, &bounds, title, FALSE, 0, 0, 1,
                                   pushButProc, (long)mc);
+    mc->button.tbring = NULL;
     if (mac_gestalts.apprvers >= 0x100) {
        Boolean isdefault = ctrl->button.isdefault;
 
@@ -587,40 +863,267 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window,
                       sizeof(isdefault), &isdefault);
     } else if (ctrl->button.isdefault) {
        InsetRect(&bounds, -4, -4);
-       NewControl(window, &bounds, title, TRUE, 0, 0, 1,
-                  SYS7_DEFAULT_PROC, (long)mc);
+       mc->button.tbring = NewControl(window, &bounds, title, FALSE, 0, 0, 1,
+                                      SYS7_DEFAULT_PROC, (long)mc);
+    }
+    if (mac_gestalts.apprvers >= 0x110) {
+       Boolean iscancel = ctrl->button.iscancel;
+
+       SetControlData(mc->button.tbctrl, kControlEntireControl,
+                      kControlPushButtonCancelTag,
+                      sizeof(iscancel), &iscancel);
+    }
+    if (ctrl->button.isdefault)
+       mcs->defbutton = mc;
+    if (ctrl->button.iscancel)
+       mcs->canbutton = mc;
+    add234(mcs->byctrl, mc);
+    mc->generic.next = mcs->panels[curstate->panelnum];
+    mcs->panels[curstate->panelnum] = mc;
+    curstate->pos.v += 26;
+}
+
+#if !TARGET_API_MAC_CARBON
+static pascal SInt32 macctrl_sys7_default_cdef(SInt16 variant,
+                                              ControlRef control,
+                                              ControlDefProcMessage msg,
+                                              SInt32 param)
+{
+    RgnHandle rgn;
+    Rect rect;
+    int oval;
+    PenState savestate;
+
+    switch (msg) {
+      case drawCntl:
+       if ((*control)->contrlVis) {
+           rect = (*control)->contrlRect;
+           GetPenState(&savestate);
+           PenNormal();
+           PenSize(3, 3);
+           if ((*control)->contrlHilite == kControlInactivePart)
+               PenPat(&qd.gray);
+           oval = (rect.bottom - rect.top) / 2 + 2;
+           FrameRoundRect(&rect, oval, oval);
+           SetPenState(&savestate);
+       }
+       return 0;
+      case calcCRgns:
+       if (param & (1 << 31)) {
+           param &= ~(1 << 31);
+           goto calcthumbrgn;
+       }
+       /* FALLTHROUGH */
+      case calcCntlRgn:
+       rgn = (RgnHandle)param;
+       RectRgn(rgn, &(*control)->contrlRect);
+       return 0;
+      case calcThumbRgn:
+      calcthumbrgn:
+       rgn = (RgnHandle)param;
+       SetEmptyRgn(rgn);
+       return 0;
+    }
+
+    return 0;
+}
+#endif
+
+static void macctrl_listbox(struct macctrls *mcs, WindowPtr window,
+                           struct mac_layoutstate *curstate,
+                           union control *ctrl)
+{
+    union macctrl *mc = snew(union macctrl);
+    Rect bounds, upbounds, downbounds;
+    Size olen;
+
+    /* XXX Use label */
+    assert(ctrl->listbox.percentwidth == 100);
+    mc->generic.type = MACCTRL_LISTBOX;
+    mc->generic.ctrl = ctrl;
+    mc->generic.privdata = NULL;
+    /* The list starts off empty */
+    mc->listbox.nids = 0;
+    mc->listbox.ids = NULL;
+    bounds.left = curstate->pos.h;
+    bounds.right = bounds.left + curstate->width;
+    bounds.top = curstate->pos.v;
+    bounds.bottom = bounds.top + 16 * ctrl->listbox.height + 2;
+
+    if (ctrl->listbox.draglist) {
+       upbounds = downbounds = bounds;
+       upbounds.left = upbounds.right - 58;
+       upbounds.bottom = upbounds.top + 20;
+       downbounds.left = downbounds.right - 58;
+       downbounds.top = upbounds.bottom + 6;
+       downbounds.bottom = downbounds.top + 20;
+       bounds.right -= 64; /* enough for 6 px gap and a button */
+    }
+
+    if (mac_gestalts.apprvers >= 0x100) {
+       InsetRect(&bounds, 3, 3);
+       mc->listbox.tbctrl = NewControl(window, &bounds, NULL, FALSE,
+                                       ldes_Default, 0, 0,
+                                       kControlListBoxProc, (long)mc);
+       if (GetControlData(mc->listbox.tbctrl, kControlEntireControl,
+                          kControlListBoxListHandleTag,
+                          sizeof(mc->listbox.list), &mc->listbox.list,
+                          &olen) != noErr) {
+           DisposeControl(mc->listbox.tbctrl);
+           sfree(mc);
+           return;
+       }
+    }
+#if !TARGET_API_MAC_CARBON
+    else {
+       InsetRect(&bounds, -3, -3);
+       mc->listbox.tbctrl = NewControl(window, &bounds, NULL, FALSE,
+                                       0, 0, 0,
+                                       SYS7_LISTBOX_PROC, (long)mc);
+       mc->listbox.list = (ListHandle)(*mc->listbox.tbctrl)->contrlData;
+       (*mc->listbox.list)->refCon = (long)mc;
+    }
+#endif
+    if (!ctrl->listbox.multisel) {
+#if TARGET_API_MAC_CARBON
+       SetListSelectionFlags(mc->listbox.list, lOnlyOne);
+#else
+       (*mc->listbox.list)->selFlags = lOnlyOne;
+#endif
+    }
+
+    if (ctrl->listbox.draglist) {
+       mc->listbox.tbup = NewControl(window, &upbounds, "\pUp", FALSE, 0, 0, 1,
+                                     pushButProc, (long)mc);
+       mc->listbox.tbdown = NewControl(window, &downbounds, "\pDown", FALSE, 0, 0, 1,
+                                     pushButProc, (long)mc);
+    }
+
+    add234(mcs->byctrl, mc);
+    curstate->pos.v += 6 + 16 * ctrl->listbox.height + 2;
+    mc->generic.next = mcs->panels[curstate->panelnum];
+    mcs->panels[curstate->panelnum] = mc;
+    ctrlevent(mcs, mc, EVENT_REFRESH);
+#if TARGET_API_MAC_CARBON
+    HideControl(GetListVerticalScrollBar(mc->listbox.list));
+#else
+    HideControl((*mc->listbox.list)->vScroll);
+#endif
+}
+
+#if !TARGET_API_MAC_CARBON
+static pascal SInt32 macctrl_sys7_listbox_cdef(SInt16 variant,
+                                              ControlRef control,
+                                              ControlDefProcMessage msg,
+                                              SInt32 param)
+{
+    RgnHandle rgn;
+    Rect rect;
+    ListHandle list;
+    long ssfs;
+    Point mouse;
+    ListBounds bounds;
+    Point csize;
+    short savefont;
+    short savesize;
+    GrafPtr curport;
+
+    switch (msg) {
+      case initCntl:
+       rect = (*control)->contrlRect;
+       InsetRect(&rect, 4, 4);
+       rect.right -= 15; /* scroll bar */
+       bounds.top = bounds.bottom = bounds.left = 0;
+       bounds.right = 1;
+       csize.h = csize.v = 0;
+       GetPort(&curport);
+       savefont = curport->txFont;
+       savesize = curport->txSize;
+       ssfs = GetScriptVariable(smSystemScript, smScriptSysFondSize);
+       TextFont(HiWord(ssfs));
+       TextSize(LoWord(ssfs));
+       list = LNew(&rect, &bounds, csize, 0, (*control)->contrlOwner,
+                   TRUE, FALSE, FALSE, TRUE);
+       SetControlReference((*list)->vScroll, (long)list);
+       (*control)->contrlData = (Handle)list;
+       TextFont(savefont);
+       TextSize(savesize);
+       return noErr;
+      case dispCntl:
+       /*
+        * If the dialogue box is being destroyed, the scroll bar
+        * might have gone already.  In our situation, this is the
+        * only time we destroy a control, so NULL out the scroll bar
+        * handle to prevent LDispose trying to free it.
+        */
+       list = (ListHandle)(*control)->contrlData;
+       (*list)->vScroll = NULL;
+       LDispose(list);
+       return 0;
+      case drawCntl:
+       if ((*control)->contrlVis) {
+           rect = (*control)->contrlRect;
+           /* XXX input focus highlighting? */
+           InsetRect(&rect, 3, 3);
+           PenNormal();
+           FrameRect(&rect);
+           list = (ListHandle)(*control)->contrlData;
+           LActivate((*control)->contrlHilite != kControlInactivePart, list);
+           GetPort(&curport);
+           LUpdate(curport->visRgn, list);
+       }
+       return 0;
+      case testCntl:
+       mouse.h = LoWord(param);
+       mouse.v = HiWord(param);
+       rect = (*control)->contrlRect;
+       InsetRect(&rect, 4, 4);
+       /*
+        * We deliberately exclude the scrollbar so that LClick() can see it.
+        */
+       rect.right -= 15;
+       return PtInRect(mouse, &rect) ? kControlListBoxPart : kControlNoPart;
+      case calcCRgns:
+       if (param & (1 << 31)) {
+           param &= ~(1 << 31);
+           goto calcthumbrgn;
+       }
+       /* FALLTHROUGH */
+      case calcCntlRgn:
+       rgn = (RgnHandle)param;
+       RectRgn(rgn, &(*control)->contrlRect);
+       return 0;
+      case calcThumbRgn:
+      calcthumbrgn:
+       rgn = (RgnHandle)param;
+       SetEmptyRgn(rgn);
+       return 0;
     }
-    if (mac_gestalts.apprvers >= 0x110) {
-       Boolean iscancel = ctrl->button.iscancel;
 
-       SetControlData(mc->button.tbctrl, kControlEntireControl,
-                      kControlPushButtonCancelTag,
-                      sizeof(iscancel), &iscancel);
-    }
-    add234(mcs->byctrl, mc);
-    mc->generic.next = mcs->panels[curstate->panelnum];
-    mcs->panels[curstate->panelnum] = mc;
-    curstate->pos.v += 26;
+    return 0;
 }
+#endif
 
 #if !TARGET_API_MAC_CARBON
-static pascal SInt32 macctrl_sys7_default_cdef(SInt16 variant,
-                                              ControlRef control,
-                                              ControlDefProcMessage msg,
-                                              SInt32 param)
+static pascal SInt32 macctrl_sys7_groupbox_cdef(SInt16 variant,
+                                               ControlRef control,
+                                               ControlDefProcMessage msg,
+                                               SInt32 param)
 {
     RgnHandle rgn;
     Rect rect;
-    int oval;
+    PenState savestate;
 
     switch (msg) {
       case drawCntl:
        if ((*control)->contrlVis) {
            rect = (*control)->contrlRect;
+           GetPenState(&savestate);
            PenNormal();
            PenSize(3, 3);
-           oval = (rect.bottom - rect.top) / 2 + 2;
-           FrameRoundRect(&rect, oval, oval);
+           PenPat(&qd.gray);
+           FrameRect(&rect);
+           SetPenState(&savestate);
        }
        return 0;
       case calcCRgns:
@@ -639,7 +1142,6 @@ static pascal SInt32 macctrl_sys7_default_cdef(SInt16 variant,
        SetEmptyRgn(rgn);
        return 0;
     }
-
     return 0;
 }
 #endif
@@ -648,7 +1150,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;
@@ -664,13 +1166,10 @@ static void macctrl_popup(struct macctrls *mcs, WindowPtr window,
     assert(!ctrl->listbox.draglist);
     assert(!ctrl->listbox.multisel);
 
-    fprintf(stderr, "    label = %s\n", ctrl->listbox.label);
-    fprintf(stderr, "    percentwidth = %d\n", ctrl->listbox.percentwidth);
-
     mc->generic.type = MACCTRL_POPUP;
     mc->generic.ctrl = ctrl;
     mc->generic.privdata = NULL;
-    c2pstrcpy(title, ctrl->button.label);
+    c2pstrcpy(title, ctrl->button.label == NULL ? "" : ctrl->button.label);
 
     /* Find a spare menu ID and create the menu */
     while (GetMenuHandle(nextmenuid) != NULL)
@@ -692,7 +1191,7 @@ static void macctrl_popup(struct macctrls *mcs, WindowPtr window,
     bounds.bottom = bounds.top + 20;
     /* XXX handle percentwidth == 100 */
     labelwidth = curstate->width * (100 - ctrl->listbox.percentwidth) / 100;
-    mc->popup.tbctrl = NewControl(window, &bounds, title, TRUE,
+    mc->popup.tbctrl = NewControl(window, &bounds, title, FALSE,
                                  popupTitleLeftJust, menuid, labelwidth,
                                  popupMenuProc + popupFixedWidth, (long)mc);
     add234(mcs->byctrl, mc);
@@ -702,6 +1201,39 @@ static void macctrl_popup(struct macctrls *mcs, WindowPtr window,
     ctrlevent(mcs, mc, EVENT_REFRESH);
 }
 
+static void macctrl_groupbox(struct macctrls *mcs, WindowPtr window,
+                            struct mac_layoutstate *curstate,
+                            union control *ctrl)
+{
+    union macctrl *mc = snew (union macctrl);
+    Str255 ptitle;
+    Rect r;
+
+    r.top = curstate->boxpos.v;
+    r.left = curstate->boxpos.h;
+    r.bottom = curstate->pos.v;
+    r.right = curstate->boxpos.h + curstate->width;
+
+    mc->generic.type = MACCTRL_GROUPBOX;
+    mc->generic.privdata = NULL;
+    mc->generic.ctrl = ctrl;
+    mc->generic.ctrl->generic.handler = NULL;
+
+    if (curstate->boxname)
+       c2pstrcpy(ptitle, curstate->boxname);
+    else
+       c2pstrcpy(ptitle, "");
+    if (mac_gestalts.apprvers >= 0x100) { /* Appearance Manager */
+       mc->groupbox.tbctrl = NewControl(window, &r, ptitle, FALSE, 0, 0, 1,
+                                        kControlGroupBoxTextTitleProc, (long)mc);
+    } else {
+       mc->groupbox.tbctrl = NewControl(window, &r, ptitle, FALSE, 0, 0, 1,
+                                        SYS7_GROUPBOX_PROC, (long)mc);
+    }
+    add234(mcs->byctrl, mc);
+    mc->generic.next = mcs->panels[curstate->panelnum];
+    mcs->panels[curstate->panelnum] = mc;
+}
 
 void macctrl_activate(WindowPtr window, EventRecord *event)
 {
@@ -721,35 +1253,61 @@ void macctrl_activate(WindowPtr window, EventRecord *event)
                                 TRUE);
     state = active ? kControlNoPart : kControlInactivePart;
     for (i = 0; i <= mcs->curpanel; i += mcs->curpanel)
-       for (mc = mcs->panels[i]; mc != NULL; mc = mc->generic.next)
+       for (mc = mcs->panels[i]; mc != NULL; mc = mc->generic.next) {
            switch (mc->generic.type) {
              case MACCTRL_TEXT:
                HiliteControl(mc->text.tbctrl, state);
                break;
              case MACCTRL_EDITBOX:
                HiliteControl(mc->editbox.tbctrl, state);
+               if (mc->editbox.tblabel != NULL)
+                   HiliteControl(mc->editbox.tblabel, state);
+               if (mc->editbox.tbbutton != NULL)
+                   HiliteControl(mc->editbox.tbbutton, state);
                break;
              case MACCTRL_RADIO:
                for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++)
                    HiliteControl(mc->radio.tbctrls[j], state);
+               if (mc->radio.tblabel != NULL)
+                   HiliteControl(mc->radio.tblabel, state);
                break;
              case MACCTRL_CHECKBOX:
                HiliteControl(mc->checkbox.tbctrl, state);
                break;
              case MACCTRL_BUTTON:
                HiliteControl(mc->button.tbctrl, state);
+               if (mc->button.tbring != NULL)
+                   HiliteControl(mc->button.tbring, state);                
+               break;
+             case MACCTRL_LISTBOX:
+               HiliteControl(mc->listbox.tbctrl, state);
+               if (mc->listbox.tbup != NULL)
+                   HiliteControl(mc->listbox.tbup, state);
+               if (mc->listbox.tbdown != NULL)
+                   HiliteControl(mc->listbox.tbdown, state);
                break;
              case MACCTRL_POPUP:
                HiliteControl(mc->popup.tbctrl, state);
                break;
+             case MACCTRL_GROUPBOX:
+               HiliteControl(mc->popup.tbctrl, state);
+           }
+#if !TARGET_API_MAC_CARBON
+           if (mcs->focus == mc) {
+               if (active)
+                   macctrl_enfocus(mc);
+               else
+                   macctrl_defocus(mc);
            }
+#endif
+       }
     SetPort(saveport);
 }
 
 void macctrl_click(WindowPtr window, EventRecord *event)
 {
     Point mouse;
-    ControlHandle control;
+    ControlHandle control, oldfocus;
     int part, trackresult;
     GrafPtr saveport;
     union macctrl *mc;
@@ -763,16 +1321,65 @@ void macctrl_click(WindowPtr window, EventRecord *event)
     GlobalToLocal(&mouse);
     part = FindControl(mouse, window, &control);
     if (control != NULL) {
+#if !TARGET_API_MAC_CARBON
+       /*
+        * Special magic for scroll bars in list boxes, whose refcon
+        * is the list.
+        */
+       if (part == kControlUpButtonPart || part == kControlDownButtonPart ||
+           part == kControlPageUpPart || part == kControlPageDownPart ||
+           part == kControlIndicatorPart)
+           mc = (union macctrl *)
+               (*(ListHandle)GetControlReference(control))->refCon;
+       else
+#endif
+           mc = (union macctrl *)GetControlReference(control);
        if (mac_gestalts.apprvers >= 0x100) {
            if (GetControlFeatures(control, &features) == noErr &&
                (features & kControlSupportsFocus) &&
-               (features & kControlGetsFocusOnClick))
+               (features & kControlGetsFocusOnClick) &&
+               GetKeyboardFocus(window, &oldfocus) == noErr &&
+               control != oldfocus)
                SetKeyboardFocus(window, control, part);
            trackresult = HandleControlClick(control, mouse, event->modifiers,
                                             (ControlActionUPP)-1);
-       } else
+       } else {
+#if !TARGET_API_MAC_CARBON
+           if (mc->generic.type == MACCTRL_EDITBOX &&
+               control == mc->editbox.tbctrl) {
+               TEHandle te = (TEHandle)(*control)->contrlData;
+
+               macctrl_setfocus(mcs, mc);
+               TEClick(mouse, !!(event->modifiers & shiftKey), te);
+               goto done;
+           }
+           if (mc->generic.type == MACCTRL_EDITBOX &&
+               control == mc->editbox.tbbutton) {
+               dlg_editbox_set(mc->generic.ctrl, mcs,
+                               cp_enumerate(dlg_listbox_index(mc->generic.ctrl, mcs)));
+               ctrlevent(mcs, mc, EVENT_VALCHANGE);
+           }
+           if (mc->generic.type == MACCTRL_LISTBOX &&
+               (control == mc->listbox.tbctrl ||
+                control == (*mc->listbox.list)->vScroll)) {
+
+               macctrl_setfocus(mcs, mc);
+               if (LClick(mouse, event->modifiers, mc->listbox.list))
+                   /* double-click */
+                   ctrlevent(mcs, mc, EVENT_ACTION);
+               else
+                   ctrlevent(mcs, mc, EVENT_SELCHANGE);
+               goto done;
+           }
+           if (mc->generic.type == MACCTRL_LISTBOX &&
+               control == mc->listbox.tbup)
+               draglist_up(mc, mcs);
+           if (mc->generic.type == MACCTRL_LISTBOX &&
+               control == mc->listbox.tbdown)
+               draglist_down(mc, mcs);
+#endif
            trackresult = TrackControl(control, mouse, (ControlActionUPP)-1);
-       mc = (union macctrl *)GetControlReference(control);
+       }
        switch (mc->generic.type) {
          case MACCTRL_RADIO:
            if (trackresult != 0) {
@@ -796,11 +1403,28 @@ void macctrl_click(WindowPtr window, EventRecord *event)
            if (trackresult != 0)
                ctrlevent(mcs, mc, EVENT_ACTION);
            break;
+         case MACCTRL_EDITBOX:
+           if (control == mc->editbox.tbbutton) {
+               dlg_editbox_set(mc->generic.ctrl, mcs,
+                               cp_enumerate(dlg_listbox_index(mc->generic.ctrl, mcs)));
+               ctrlevent(mcs, mc, EVENT_VALCHANGE);
+           }
+           break;
+         case MACCTRL_LISTBOX:
+           if (control == mc->listbox.tbup)
+               draglist_up(mc, mcs);
+           if (control == mc->listbox.tbdown)
+               draglist_down(mc, mcs);
+
+           /* FIXME spot double-click */
+           ctrlevent(mcs, mc, EVENT_SELCHANGE);
+           break;
          case MACCTRL_POPUP:
            ctrlevent(mcs, mc, EVENT_SELCHANGE);
            break;
        }
     }
+  done:
     SetPort(saveport);
 }
 
@@ -809,14 +1433,65 @@ void macctrl_key(WindowPtr window, EventRecord *event)
     ControlRef control;
     struct macctrls *mcs = mac_winctrls(window);
     union macctrl *mc;
+    unsigned long dummy;
+
+    switch (event->message & charCodeMask) {
+      case kEnterCharCode:
+      case kReturnCharCode:
+       if (mcs->defbutton != NULL) {
+           assert(mcs->defbutton->generic.type == MACCTRL_BUTTON);
+           HiliteControl(mcs->defbutton->button.tbctrl, kControlButtonPart);
+           /*
+            * I'd like to delay unhilighting the button until after
+            * the event has been processed, but by them the entire
+            * dialgue box might have been destroyed.
+            */
+           Delay(6, &dummy);
+           HiliteControl(mcs->defbutton->button.tbctrl, kControlNoPart);
+           ctrlevent(mcs, mcs->defbutton, EVENT_ACTION);
+       }
+       return;
+      case kEscapeCharCode:
+       if (mcs->canbutton != NULL) {
+           assert(mcs->canbutton->generic.type == MACCTRL_BUTTON);
+           HiliteControl(mcs->canbutton->button.tbctrl, kControlButtonPart);
+           Delay(6, &dummy);
+           HiliteControl(mcs->defbutton->button.tbctrl, kControlNoPart);
+           ctrlevent(mcs, mcs->canbutton, EVENT_ACTION);
+       }
+       return;
+    }
+    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);
+           switch (mc->generic.type) {
+             case MACCTRL_LISTBOX:
+               ctrlevent(mcs, mc, EVENT_SELCHANGE);
+               break;
+             default:
+               ctrlevent(mcs, mc, EVENT_VALCHANGE);
+               break;
+           }
+       }
+    }
+#if !TARGET_API_MAC_CARBON
+    else {
+       TEHandle te;
 
-    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 (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)
@@ -946,16 +1621,28 @@ 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)
 {
     struct macctrls *mcs = dlg;
     union macctrl *mc;
+    int i;
 
-    if (ctrl == NULL)
-       return; /* FIXME */
+    if (ctrl == NULL) {
+        /* NULL means refresh every control */
+        for (i = 0 ; i < mcs->npanels; i++) {
+           for (mc = mcs->panels[i]; mc != NULL; mc = mc->generic.next) {
+               ctrlevent(mcs, mc, EVENT_REFRESH);
+           }
+        }
+        return;
+    }
+    /* Just refresh a specific control */
     mc = findbyctrl(mcs, ctrl);
     assert(mc != NULL);
     ctrlevent(mcs, mc, EVENT_REFRESH);
@@ -1002,7 +1689,7 @@ void dlg_radiobutton_set(union control *ctrl, void *dlg, int whichbutton)
     union macctrl *mc = findbyctrl(mcs, ctrl);
     int i;
 
-    assert(mc != NULL);
+    if (mc == NULL) return;
     for (i = 0; i < ctrl->radio.nbuttons; i++) {
        if (i == whichbutton)
            SetControlValue(mc->radio.tbctrls[i],
@@ -1039,7 +1726,7 @@ void dlg_checkbox_set(union control *ctrl, void *dlg, int checked)
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
 
-    assert(mc != NULL);
+    if (mc == NULL) return;
     SetControlValue(mc->checkbox.tbctrl,
                    checked ? kControlCheckBoxCheckedValue :
                              kControlCheckBoxUncheckedValue);
@@ -1065,21 +1752,22 @@ void dlg_editbox_set(union control *ctrl, void *dlg, char const *text)
     union macctrl *mc = findbyctrl(mcs, ctrl);
     GrafPtr saveport;
 
-    assert(mc != NULL);
+    if (mc == NULL) return;
     assert(mc->generic.type == MACCTRL_EDITBOX);
     GetPort(&saveport);
     SetPort((GrafPtr)(GetWindowPort(mcs->window)));
-    if (mac_gestalts.apprvers >= 0x100) {
+    if (mac_gestalts.apprvers >= 0x100)
        SetControlData(mc->editbox.tbctrl, kControlEntireControl,
                       ctrl->editbox.password ?
                       kControlEditTextPasswordTag :
                       kControlEditTextTextTag,
                       strlen(text), text);
-    } else {
+#if !TARGET_API_MAC_CARBON
+    else
        TESetText(text, strlen(text),
                  (TEHandle)(*mc->editbox.tbctrl)->contrlData);
-    }
-       DrawOneControl(mc->editbox.tbctrl);
+#endif
+    DrawOneControl(mc->editbox.tbctrl);
     SetPort(saveport);
 }
 
@@ -1099,14 +1787,20 @@ void dlg_editbox_get(union control *ctrl, void *dlg, char *buffer, int length)
                           length - 1, buffer, &olen) != noErr)
            olen = 0;
        if (olen > length - 1)
-           buffer[length - 1] = '\0';
-       else
-           buffer[olen] = '\0';
-       buffer[olen] = '\0';
-    } else
-       buffer[0] = '\0';
-    fprintf(stderr, "dlg_editbox_get: %s\n", buffer);
-};
+           olen = length - 1;
+    }
+#if !TARGET_API_MAC_CARBON
+    else {
+       TEHandle te = (TEHandle)(*mc->editbox.tbctrl)->contrlData;
+
+       olen = (*te)->teLength;
+       if (olen > length - 1)
+           olen = length - 1;
+       memcpy(buffer, *(*te)->hText, olen);
+    }
+#endif
+    buffer[olen] = '\0';
+}
 
 
 /*
@@ -1120,7 +1814,7 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg)
     MenuRef menu = mc->popup.menu;
     unsigned int i, n;
 
-    fprintf(stderr, "      popup_clear\n");
+    if (mc == NULL) return;
     n = CountMenuItems(menu);
     for (i = 0; i < n; i++)
        DeleteMenuItem(menu, n - i);
@@ -1130,11 +1824,49 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg)
     SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu));
 }
 
+static void dlg_macedit_clear(union control *ctrl, void *dlg)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    MenuRef menu = mc->editbox.menu;
+    unsigned int i, n;
+
+    if (mc == NULL) return;
+    n = CountMenuItems(menu);
+    for (i = 0; i < n; i++)
+       DeleteMenuItem(menu, n - i);
+    mc->editbox.nids = 0;
+    sfree(mc->editbox.ids);
+    mc->editbox.ids = NULL;
+    SetControlMaximum(mc->editbox.tbbutton, CountMenuItems(menu));
+}
+
+static void dlg_maclist_clear(union control *ctrl, void *dlg)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+
+    if (mc == NULL) return;
+    LDelRow(0, 0, mc->listbox.list);
+    mc->listbox.nids = 0;
+    sfree(mc->listbox.ids);
+    mc->listbox.ids = NULL;
+    DrawOneControl(mc->listbox.tbctrl);
+}
+
 void dlg_listbox_clear(union control *ctrl, void *dlg)
 {
 
-    if (ctrl->listbox.height == 0)
-       dlg_macpopup_clear(ctrl, dlg);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           dlg_macpopup_clear(ctrl, dlg);
+       else
+           dlg_maclist_clear(ctrl, dlg);
+       break;
+      case CTRL_EDITBOX:
+       dlg_macedit_clear(ctrl, dlg);
+    }
 }
 
 static void dlg_macpopup_del(union control *ctrl, void *dlg, int index)
@@ -1143,7 +1875,7 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index)
     union macctrl *mc = findbyctrl(mcs, ctrl);
     MenuRef menu = mc->popup.menu;
 
-    fprintf(stderr, "      popup_del %d\n", index);
+    if (mc == NULL) return;
     DeleteMenuItem(menu, index + 1);
     if (mc->popup.ids != NULL)
        memcpy(mc->popup.ids + index, mc->popup.ids + index + 1,
@@ -1151,11 +1883,46 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index)
     SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu));
 }
 
+static void dlg_macedit_del(union control *ctrl, void *dlg, int index)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    MenuRef menu = mc->editbox.menu;
+
+    if (mc == NULL) return;
+    DeleteMenuItem(menu, index + 1);
+    if (mc->editbox.ids != NULL)
+       memcpy(mc->editbox.ids + index, mc->editbox.ids + index + 1,
+              (mc->editbox.nids - index - 1) * sizeof(*mc->editbox.ids));
+    SetControlMaximum(mc->editbox.tbbutton, CountMenuItems(menu));
+}
+
+static void dlg_maclist_del(union control *ctrl, void *dlg, int index)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+
+    if (mc == NULL) return;
+    LDelRow(1, index, mc->listbox.list);
+    if (mc->listbox.ids != NULL)
+       memcpy(mc->listbox.ids + index, mc->listbox.ids + index + 1,
+              (mc->listbox.nids - index - 1) * sizeof(*mc->listbox.ids));
+    DrawOneControl(mc->listbox.tbctrl);
+}
+
 void dlg_listbox_del(union control *ctrl, void *dlg, int index)
 {
 
-    if (ctrl->listbox.height == 0)
-       dlg_macpopup_del(ctrl, dlg, index);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           dlg_macpopup_del(ctrl, dlg, index);
+       else
+           dlg_maclist_del(ctrl, dlg, index);
+       break;
+      case CTRL_EDITBOX:
+       dlg_macedit_del(ctrl, dlg, index);
+    }
 }
 
 static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text)
@@ -1165,7 +1932,7 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text)
     MenuRef menu = mc->popup.menu;
     Str255 itemstring;
 
-    fprintf(stderr, "      popup_add %s\n", text);
+    if (mc == NULL) return;
     assert(text[0] != '\0');
     c2pstrcpy(itemstring, text);
     AppendMenu(menu, "\pdummy");
@@ -1173,11 +1940,54 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text)
     SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu));
 }
 
+static void dlg_macedit_add(union control *ctrl, void *dlg, char const *text)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    MenuRef menu = mc->editbox.menu;
+    Str255 itemstring;
+
+    if (mc == NULL) return;
+    assert(text[0] != '\0');
+    c2pstrcpy(itemstring, text);
+    AppendMenu(menu, "\pdummy");
+    SetMenuItemText(menu, CountMenuItems(menu), itemstring);
+    SetControlMaximum(mc->editbox.tbbutton, CountMenuItems(menu));
+}
+
+static void dlg_maclist_add(union control *ctrl, void *dlg, char const *text)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    ListBounds bounds;
+    Cell cell = { 0, 0 };
+
+    if (mc == NULL) return;
+#if TARGET_API_MAC_CARBON
+    GetListDataBounds(mc->listbox.list, &bounds);
+#else
+    bounds = (*mc->listbox.list)->dataBounds;
+#endif
+    cell.v = bounds.bottom;
+    LAddRow(1, cell.v, mc->listbox.list);
+    LSetCell(text, strlen(text), cell, mc->listbox.list);
+    DrawOneControl(mc->listbox.tbctrl);
+}
+
 void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
 {
 
-    if (ctrl->listbox.height == 0)
-       dlg_macpopup_add(ctrl, dlg, text);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           dlg_macpopup_add(ctrl, dlg, text);
+       else
+           dlg_maclist_add(ctrl, dlg, text);
+       break;
+      case CTRL_EDITBOX:
+       dlg_macedit_add(ctrl, dlg, text);
+       break;
+    }
 }
 
 static void dlg_macpopup_addwithid(union control *ctrl, void *dlg,
@@ -1188,23 +1998,72 @@ static void dlg_macpopup_addwithid(union control *ctrl, void *dlg,
     MenuRef menu = mc->popup.menu;
     unsigned int index;
 
-    fprintf(stderr, "      popup_addwthindex %s, %d\n", text, id);
+    if (mc == NULL) return;
     dlg_macpopup_add(ctrl, dlg, text);
     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;
 }
 
+static void dlg_macedit_addwithid(union control *ctrl, void *dlg,
+                                  char const *text, int id)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    MenuRef menu = mc->editbox.menu;
+    unsigned int index;
+
+    if (mc == NULL) return;
+    dlg_macedit_add(ctrl, dlg, text);
+    index = CountMenuItems(menu) - 1;
+    if (mc->editbox.nids <= index) {
+       mc->editbox.nids = index + 1;
+       mc->editbox.ids = sresize(mc->editbox.ids, mc->editbox.nids, int);
+    }
+    mc->editbox.ids[index] = id;
+}
+
+static void dlg_maclist_addwithid(union control *ctrl, void *dlg,
+                                 char const *text, int id)
+{
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    ListBounds bounds;
+    int index;
+
+    if (mc == NULL) return;
+    dlg_maclist_add(ctrl, dlg, text);
+#if TARGET_API_MAC_CARBON
+    GetListDataBounds(mc->listbox.list, &bounds);
+#else
+    bounds = (*mc->listbox.list)->dataBounds;
+#endif
+    index = bounds.bottom;
+    if (mc->listbox.nids <= index) {
+       mc->listbox.nids = index + 1;
+       mc->listbox.ids = sresize(mc->listbox.ids, mc->listbox.nids, int);
+    }
+    mc->listbox.ids[index] = id;
+}
+
 void dlg_listbox_addwithid(union control *ctrl, void *dlg,
                           char const *text, int id)
 {
 
-    if (ctrl->listbox.height == 0)
-       dlg_macpopup_addwithid(ctrl, dlg, text, id);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           dlg_macpopup_addwithid(ctrl, dlg, text, id);
+       else
+           dlg_maclist_addwithid(ctrl, dlg, text, id);
+       break;
+      case CTRL_EDITBOX:
+       dlg_macedit_addwithid(ctrl, dlg, text, id);
+       break;
+    }
 }
 
 int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
@@ -1212,42 +2071,150 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
 
-    if (ctrl->listbox.height == 0) {
-       assert(mc->popup.ids != NULL && mc->popup.nids > index);
-       return mc->popup.ids[index];
+    assert(mc != NULL);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0) {
+           assert(mc->popup.ids != NULL && mc->popup.nids > index);
+           return mc->popup.ids[index];
+       } else {
+           assert(mc->listbox.ids != NULL && mc->listbox.nids > index);
+           return mc->listbox.ids[index];
+       }
+      case CTRL_EDITBOX:
+       assert(mc->editbox.ids != NULL && mc->editbox.nids > index);
+       return mc->editbox.ids[index];
     }
-    return 0;
+    return -1;
 }
 
 int dlg_listbox_index(union control *ctrl, void *dlg)
 {
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
+    Cell cell = { 0, 0 };
 
-    if (ctrl->listbox.height == 0)
-       return GetControlValue(mc->popup.tbctrl) - 1;
-    return 0;
-};
+    assert(mc != NULL);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           return GetControlValue(mc->popup.tbctrl) - 1;
+       else {
+           if (LGetSelect(TRUE, &cell, mc->listbox.list))
+               return cell.v;
+           else
+               return -1;
+       }
+      case CTRL_EDITBOX:
+       return GetControlValue(mc->editbox.tbbutton) - 1;
+    }
+    return -1;
+}
 
 int dlg_listbox_issel(union control *ctrl, void *dlg, int index)
 {
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
+    Cell cell = { 0, 0 };
 
-    if (ctrl->listbox.height == 0)
-       return GetControlValue(mc->popup.tbctrl) - 1 == index;
-    return 0;
-};
+    assert(mc != NULL);
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           return GetControlValue(mc->popup.tbctrl) - 1 == index;
+       else {
+           cell.v = index;
+           return LGetSelect(FALSE, &cell, mc->listbox.list);
+       }
+      case CTRL_EDITBOX:
+       return GetControlValue(mc->editbox.tbbutton) - 1 == index;
+    }
+    return FALSE;
+}
 
 void dlg_listbox_select(union control *ctrl, void *dlg, int index)
 {
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
 
-    if (ctrl->listbox.height == 0)
-       SetControlValue(mc->popup.tbctrl, index + 1);
-};
+    if (mc == NULL) return;
+    switch (ctrl->generic.type) {
+      case CTRL_LISTBOX:
+       if (ctrl->listbox.height == 0)
+           SetControlValue(mc->popup.tbctrl, index + 1);
+       break;
+      case CTRL_EDITBOX:
+       SetControlValue(mc->editbox.tbbutton, index + 1);
+    }
+}
+
+static void draglist_move(union macctrl *mc, struct macctrls *mcs,
+                         int direction)
+{
+    ListBounds bounds;
+    Cell cell = {0, 0};
+    char current[255];
+    char new[255];
+    short curlength = 255;
+    short newlength = 255;
+    int curid, newid;
+
+    int index = dlg_listbox_index(mc->generic.ctrl, mcs);
+
+#if TARGET_API_MAC_CARBON
+    GetListDataBounds(mc->listbox.list, &bounds);
+#else
+    bounds = (*mc->listbox.list)->dataBounds;
+#endif
+
+    if ((index < 0) ||
+       (index == 0 && direction < 0) ||
+       (index == bounds.bottom-1 && direction > 0)) {
+       SysBeep(30);
+       return;
+    }
+
+    /* Swap the contents of the selected and target list cells */
+
+    cell.v = index;
+    LGetCell(current, &curlength, cell, mc->listbox.list);
+    current[curlength] = '\0';
+    cell.v += direction;
+    LGetCell(new, &newlength, cell, mc->listbox.list);
+    new[newlength] = '\0';
+
+    cell.v = index;
+    LSetCell(new, newlength, cell, mc->listbox.list);
+    cell.v += direction;
+    LSetCell(current, curlength, cell, mc->listbox.list);
 
+    /* Move the selection to the target list cell */
+
+    cell.v = index;
+    LSetSelect(FALSE, cell, mc->listbox.list);
+    cell.v += direction;
+    LSetSelect(TRUE, cell, mc->listbox.list);
+    DrawOneControl(mc->listbox.tbctrl);
+
+    /* Swap the ids of the list cells */
+
+    curid = mc->listbox.ids[index];
+    newid = mc->listbox.ids[index + direction];
+    mc->listbox.ids[index] = newid;
+    mc->listbox.ids[index + direction] = curid;
+                           
+    ctrlevent(mcs, mc, EVENT_VALCHANGE);
+}
+
+static void draglist_up(union macctrl *mc, struct macctrls *mcs)
+{
+    draglist_move(mc, mcs, -1);
+}
+
+static void draglist_down(union macctrl *mc, struct macctrls *mcs)
+{
+    draglist_move(mc, mcs, +1);
+}
 
 /*
  * Text control
@@ -1257,16 +2224,16 @@ void dlg_text_set(union control *ctrl, void *dlg, char const *text)
 {
     struct macctrls *mcs = dlg;
     union macctrl *mc = findbyctrl(mcs, ctrl);
-    Str255 title;
 
-    assert(mc != NULL);
+    if (mc == NULL) return;
     if (mac_gestalts.apprvers >= 0x100)
        SetControlData(mc->text.tbctrl, kControlEntireControl,
                       kControlStaticTextTextTag, strlen(text), text);
-    else {
-       c2pstrcpy(title, text);
-       SetControlTitle(mc->text.tbctrl, title);
-    }
+#if !TARGET_API_MAC_CARBON
+    else
+       TESetText(text, strlen(text),
+                 (TEHandle)(*mc->text.tbctrl)->contrlData);
+#endif
 }
 
 
@@ -1330,16 +2297,47 @@ void printer_finish_enum(printer_enum *pe)
 void dlg_coloursel_start(union control *ctrl, void *dlg,
                         int r, int g, int b)
 {
-
+    struct macctrls *mcs = dlg;
+    union macctrl *mc = findbyctrl(mcs, ctrl);
+    Point where = {-1, -1}; /* Screen with greatest colour depth */
+    RGBColor incolour;
+
+    if (HAVE_COLOR_QD()) {
+       incolour.red = r * 0x0101;
+       incolour.green = g * 0x0101;
+       incolour.blue = b * 0x0101;
+       mcs->gotcolour = GetColor(where, "\pModify Colour:", &incolour,
+                                 &mcs->thecolour);
+       ctrlevent(mcs, mc, EVENT_CALLBACK);
+    } else
+       dlg_beep(dlg);
 }
 
 int dlg_coloursel_results(union control *ctrl, void *dlg,
                          int *r, int *g, int *b)
 {
+    struct macctrls *mcs = dlg;
 
-    return 0;
+    if (mcs->gotcolour) {
+       *r = mcs->thecolour.red >> 8;
+       *g = mcs->thecolour.green >> 8;
+       *b = mcs->thecolour.blue >> 8;
+       return 1;
+    } else
+       return 0;
+}
+
+void dlg_label_change(union control *ctrl, void *dlg, char const *text)
+{
+    /*
+     * This function is currently only used by the config box to
+     * switch the labels on the host and port boxes between serial
+     * and network modes. Since the Mac port does not have a serial
+     * back end, this function can safely do nothing.
+     */
 }
 
+
 /*
  * Local Variables:
  * c-file-style: "simon"