X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1f1ec0e5f5c665264f91cc0675ce575d85adbb98..06567a99c718a3f451c07bba69933c34d5e9111f:/mac/macctrls.c diff --git a/mac/macctrls.c b/mac/macctrls.c index 17b39a7a..4cf32861 100644 --- a/mac/macctrls.c +++ b/mac/macctrls.c @@ -1,4 +1,4 @@ -/* $Id: macctrls.c,v 1.13 2003/03/25 23:18:59 ben Exp $ */ +/* $Id: macctrls.c,v 1.30 2003/04/05 22:00:57 ben Exp $ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -29,10 +29,14 @@ #include #include #include +#include #include #include +#include #include +#include #include +#include #include #include @@ -57,6 +61,7 @@ union macctrl { MACCTRL_RADIO, MACCTRL_CHECKBOX, MACCTRL_BUTTON, + MACCTRL_LISTBOX, MACCTRL_POPUP } type; /* Template from which this was generated */ @@ -73,10 +78,12 @@ union macctrl { struct { struct macctrl_generic generic; ControlRef tbctrl; + ControlRef tblabel; } editbox; struct { struct macctrl_generic generic; ControlRef *tbctrls; + ControlRef tblabel; } radio; struct { struct macctrl_generic generic; @@ -85,10 +92,17 @@ union macctrl { struct { struct macctrl_generic generic; ControlRef tbctrl; + ControlRef tbring; } button; struct { struct macctrl_generic generic; ControlRef tbctrl; + unsigned int nids; + int *ids; + } listbox; + struct { + struct macctrl_generic generic; + ControlRef tbctrl; MenuRef menu; int menuid; unsigned int nids; @@ -114,6 +128,7 @@ struct mac_layoutstate { static void macctrl_layoutset(struct mac_layoutstate *, struct controlset *, WindowPtr, struct macctrls *); 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, @@ -124,11 +139,13 @@ 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 *); #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); #endif @@ -155,8 +172,8 @@ 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); inited = 1; @@ -205,18 +222,21 @@ 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); mcs->window = window; mcs->byctrl = newtree234(macctrl_cmp_byctrl); + mcs->focus = NULL; + mcs->defbutton = NULL; + mcs->canbutton = NULL; /* 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; for (i = 0; i < cb->nctrlsets; i++) { @@ -228,14 +248,18 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, } macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs); } - macctrl_switchtopanel(mcs, 1); + macctrl_switchtopanel(mcs, 19); + /* 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); @@ -244,11 +268,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; @@ -264,33 +291,66 @@ 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); + else + macctrl_listbox(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) { unsigned int i, j; union macctrl *mc; + ListHandle list; + Size olen; + #define hideshow(c) do { \ if (i == which) ShowControl(c); else HideControl(c); \ @@ -299,17 +359,25 @@ static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which) 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) + for (mc = mcs->panels[i]; 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); break; 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); @@ -317,19 +385,77 @@ static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which) case MACCTRL_BUTTON: hideshow(mc->button.tbctrl); break; + case MACCTRL_LISTBOX: + hideshow(mc->listbox.tbctrl); + /* + * At least under Mac OS 8.1, hiding a list box + * doesn't hide its scroll bars. + */ + if (mac_gestalts.apprvers >= 0x100) { + if (GetControlData(mc->listbox.tbctrl, + kControlEntireControl, + kControlListBoxListHandleTag, + sizeof(list), &list, &olen) == noErr) +#if TARGET_API_MAC_CARBON + hideshow(GetListVerticalScrollBar(list)); +#else + hideshow((*list)->vScroll); +#endif + } + 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 != 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; + assert(ctrl->text.label != NULL); fprintf(stderr, " label = %s\n", ctrl->text.label); mc->generic.type = MACCTRL_TEXT; mc->generic.ctrl = ctrl; @@ -339,7 +465,6 @@ 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, @@ -350,33 +475,145 @@ 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, TRUE, 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 + fprintf(stderr, " height = %d\n", height); + 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; } +static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, + struct mac_layoutstate *curstate, + union control *ctrl) +{ + union macctrl *mc = snew(union macctrl); + Rect lbounds, bounds; + + if (ctrl->editbox.label != NULL) + 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; + 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 (mac_gestalts.apprvers >= 0x100) { + if (ctrl->editbox.label == NULL) + mc->editbox.tblabel = NULL; + else { + mc->editbox.tblabel = NewControl(window, &lbounds, NULL, TRUE, + 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, TRUE, 0, 0, 0, + ctrl->editbox.password ? + kControlEditTextPasswordProc : + kControlEditTextProc, (long)mc); + } #if !TARGET_API_MAC_CARBON -static pascal SInt32 macctrl_sys7_text_cdef(SInt16 variant, ControlRef control, - ControlDefProcMessage msg, SInt32 param) + else { + if (ctrl->editbox.label == NULL) + mc->editbox.tblabel = NULL; + else { + mc->editbox.tblabel = NewControl(window, &lbounds, NULL, TRUE, + 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, TRUE, 0, 0, 0, + SYS7_EDITBOX_PROC, (long)mc); + } +#endif + curstate->pos.v += 28; + add234(mcs->byctrl, mc); + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; + ctrlevent(mcs, mc, EVENT_REFRESH); +} + +#if !TARGET_API_MAC_CARBON +static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant, + ControlRef control, + ControlDefProcMessage msg, + SInt32 param) { RgnHandle rgn; + Rect rect; + TEHandle te; + long ssfs; + Point mouse; switch (msg) { + case initCntl: + rect = (*control)->contrlRect; + 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); + (*te)->txFont = HiWord(ssfs); + (*control)->contrlData = (Handle)te; + return noErr; + case dispCntl: + TEDispose((TEHandle)(*control)->contrlData); + return 0; case drawCntl: - if ((*control)->contrlVis) - TETextBox((*control)->contrlTitle + 1, (*control)->contrlTitle[0], - &(*control)->contrlRect, teFlushDefault); + if ((*control)->contrlVis) { + rect = (*control)->contrlRect; + if (variant == SYS7_EDITBOX_VARIANT) { + PenNormal(); + FrameRect(&rect); + InsetRect(&rect, 3, 3); + } + (*(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); @@ -398,55 +635,47 @@ static pascal SInt32 macctrl_sys7_text_cdef(SInt16 variant, ControlRef control, } #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; - - 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; - bounds.top = curstate->pos.v + 2; - bounds.bottom = bounds.top + 18; - if (mac_gestalts.apprvers >= 0x100) { - mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0, - ctrl->editbox.password ? - kControlEditTextPasswordProc : - kControlEditTextProc, (long)mc); - curstate->pos.v += 28; - add234(mcs->byctrl, mc); - mc->generic.next = mcs->panels[curstate->panelnum]; - mcs->panels[curstate->panelnum] = mc; - ctrlevent(mcs, mc, EVENT_REFRESH); - } else { - /* Do a System 7 version */ - } -} - 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); + if (ctrl->radio.label != NULL) + 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, TRUE, + 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, TRUE, + 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; @@ -473,10 +702,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; + assert(ctrl->checkbox.label != NULL); fprintf(stderr, " label = %s\n", ctrl->checkbox.label); mc->generic.type = MACCTRL_CHECKBOX; mc->generic.ctrl = ctrl; @@ -499,10 +729,11 @@ 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; + assert(ctrl->button.label != NULL); fprintf(stderr, " label = %s\n", ctrl->button.label); if (ctrl->button.isdefault) fprintf(stderr, " is default\n"); @@ -510,12 +741,13 @@ 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); mc->button.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 1, pushButProc, (long)mc); + mc->button.tbring = NULL; if (mac_gestalts.apprvers >= 0x100) { Boolean isdefault = ctrl->button.isdefault; @@ -524,8 +756,8 @@ 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, TRUE, 0, 0, 1, + SYS7_DEFAULT_PROC, (long)mc); } if (mac_gestalts.apprvers >= 0x110) { Boolean iscancel = ctrl->button.iscancel; @@ -534,6 +766,10 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window, 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; @@ -549,15 +785,20 @@ static pascal SInt32 macctrl_sys7_default_cdef(SInt16 variant, 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: @@ -581,11 +822,64 @@ static pascal SInt32 macctrl_sys7_default_cdef(SInt16 variant, } #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; + ListHandle list; + Size olen; + + if (mac_gestalts.apprvers < 0x100) + return; + if (ctrl->listbox.label != NULL) + fprintf(stderr, " label = %s\n", ctrl->listbox.label); + fprintf(stderr, " height = %d\n", ctrl->listbox.height); + if (ctrl->listbox.draglist) + fprintf(stderr, " draglist\n"); + if (ctrl->listbox.multisel) + fprintf(stderr, " multisel\n"); + fprintf(stderr, " ncols = %d\n", ctrl->listbox.ncols); + 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 + 20 * ctrl->listbox.height; + + mc->button.tbctrl = NewControl(window, &bounds, NULL, TRUE, + ldes_Default, 0, 0, + kControlListBoxProc, (long)mc); + if (!ctrl->listbox.multisel) { + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return; +#if TARGET_API_MAC_CARBON + SetListSelectionFlags(list, lOnlyOne); +#else + (*list)->selFlags = lOnlyOne; +#endif + } + add234(mcs->byctrl, mc); + curstate->pos.v += 6 + 20 * ctrl->listbox.height; + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; + ctrlevent(mcs, mc, EVENT_REFRESH); +} + + 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; @@ -601,13 +895,14 @@ 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); + if (ctrl->listbox.label != NULL) + 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) @@ -658,28 +953,46 @@ 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); 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); break; case MACCTRL_POPUP: HiliteControl(mc->popup.tbctrl, state); break; } +#if !TARGET_API_MAC_CARBON + if (mcs->focus == mc) { + if (active) + macctrl_enfocus(mc); + else + macctrl_defocus(mc); + } +#endif + } SetPort(saveport); } @@ -700,6 +1013,7 @@ void macctrl_click(WindowPtr window, EventRecord *event) GlobalToLocal(&mouse); part = FindControl(mouse, window, &control); if (control != NULL) { + mc = (union macctrl *)GetControlReference(control); if (mac_gestalts.apprvers >= 0x100) { if (GetControlFeatures(control, &features) == noErr && (features & kControlSupportsFocus) && @@ -707,9 +1021,19 @@ void macctrl_click(WindowPtr window, EventRecord *event) 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; + } +#endif trackresult = TrackControl(control, mouse, (ControlActionUPP)-1); - mc = (union macctrl *)GetControlReference(control); + } switch (mc->generic.type) { case MACCTRL_RADIO: if (trackresult != 0) { @@ -733,11 +1057,16 @@ void macctrl_click(WindowPtr window, EventRecord *event) if (trackresult != 0) ctrlevent(mcs, mc, EVENT_ACTION); break; + case MACCTRL_LISTBOX: + /* FIXME spot double-click */ + ctrlevent(mcs, mc, EVENT_SELCHANGE); + break; case MACCTRL_POPUP: ctrlevent(mcs, mc, EVENT_SELCHANGE); break; } } + done: SetPort(saveport); } @@ -746,14 +1075,58 @@ 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); + ctrlevent(mcs, mc, EVENT_VALCHANGE); + } + } +#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) @@ -883,7 +1256,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) @@ -939,7 +1315,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], @@ -976,7 +1352,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); @@ -1002,20 +1378,24 @@ 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); - if (mac_gestalts.apprvers >= 0x100) { + GetPort(&saveport); + SetPort((GrafPtr)(GetWindowPort(mcs->window))); + if (mac_gestalts.apprvers >= 0x100) SetControlData(mc->editbox.tbctrl, kControlEntireControl, ctrl->editbox.password ? kControlEditTextPasswordTag : kControlEditTextTextTag, strlen(text), text); - GetPort(&saveport); - SetPort((GrafPtr)(GetWindowPort(mcs->window))); - DrawOneControl(mc->editbox.tbctrl); - SetPort(saveport); - } -}; +#if !TARGET_API_MAC_CARBON + else + TESetText(text, strlen(text), + (TEHandle)(*mc->editbox.tbctrl)->contrlData); +#endif + DrawOneControl(mc->editbox.tbctrl); + SetPort(saveport); +} void dlg_editbox_get(union control *ctrl, void *dlg, char *buffer, int length) { @@ -1033,14 +1413,21 @@ 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'; + 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'; fprintf(stderr, "dlg_editbox_get: %s\n", buffer); -}; +} /* @@ -1054,14 +1441,35 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg) MenuRef menu = mc->popup.menu; unsigned int i, n; + if (mc == NULL) return; fprintf(stderr, " popup_clear\n"); - n = CountMItems(menu); + n = CountMenuItems(menu); for (i = 0; i < n; i++) DeleteMenuItem(menu, n - i); mc->popup.nids = 0; sfree(mc->popup.ids); mc->popup.ids = NULL; - SetControlMaximum(mc->popup.tbctrl, CountMItems(menu)); + SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); +} + +static void dlg_maclist_clear(union control *ctrl, void *dlg) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + ListHandle list; + Size olen; + + if (mc == NULL) return; + fprintf(stderr, " maclist_clear\n"); + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return; + LDelRow(0, 0, 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) @@ -1069,6 +1477,8 @@ void dlg_listbox_clear(union control *ctrl, void *dlg) if (ctrl->listbox.height == 0) dlg_macpopup_clear(ctrl, dlg); + else + dlg_maclist_clear(ctrl, dlg); } static void dlg_macpopup_del(union control *ctrl, void *dlg, int index) @@ -1077,12 +1487,33 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index) union macctrl *mc = findbyctrl(mcs, ctrl); MenuRef menu = mc->popup.menu; + if (mc == NULL) return; fprintf(stderr, " popup_del %d\n", index); DeleteMenuItem(menu, index + 1); if (mc->popup.ids != NULL) memcpy(mc->popup.ids + index, mc->popup.ids + index + 1, (mc->popup.nids - index - 1) * sizeof(*mc->popup.ids)); - SetControlMaximum(mc->popup.tbctrl, CountMItems(menu)); + SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); +} + +static void dlg_maclist_del(union control *ctrl, void *dlg, int index) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + ListHandle list; + Size olen; + + if (mc == NULL) return; + fprintf(stderr, " maclist_del %d\n", index); + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return; + LDelRow(1, index, 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) @@ -1090,6 +1521,8 @@ void dlg_listbox_del(union control *ctrl, void *dlg, int index) if (ctrl->listbox.height == 0) dlg_macpopup_del(ctrl, dlg, index); + else + dlg_maclist_del(ctrl, dlg, index); } static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text) @@ -1099,12 +1532,40 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text) MenuRef menu = mc->popup.menu; Str255 itemstring; + if (mc == NULL) return; fprintf(stderr, " popup_add %s\n", text); assert(text[0] != '\0'); c2pstrcpy(itemstring, text); AppendMenu(menu, "\pdummy"); - SetMenuItemText(menu, CountMItems(menu), itemstring); - SetControlMaximum(mc->popup.tbctrl, CountMItems(menu)); + SetMenuItemText(menu, CountMenuItems(menu), itemstring); + SetControlMaximum(mc->popup.tbctrl, 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); + ListHandle list; + Size olen; + ListBounds bounds; + Cell cell = { 0, 0 }; + + if (mc == NULL) return; + fprintf(stderr, " maclist_add %s\n", text); + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return; +#if TARGET_API_MAC_CARBON + GetListDataBounds(list, &bounds); +#else + bounds = (*list)->dataBounds; +#endif + cell.v = bounds.bottom; + LAddRow(1, cell.v, list); + LSetCell(text, strlen(text), cell, list); + DrawOneControl(mc->listbox.tbctrl); } void dlg_listbox_add(union control *ctrl, void *dlg, char const *text) @@ -1112,33 +1573,67 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text) if (ctrl->listbox.height == 0) dlg_macpopup_add(ctrl, dlg, text); + else + dlg_maclist_add(ctrl, dlg, text); } -static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg, - char const *text, int id) +static void dlg_macpopup_addwithid(union control *ctrl, void *dlg, + char const *text, int id) { struct macctrls *mcs = dlg; union macctrl *mc = findbyctrl(mcs, ctrl); MenuRef menu = mc->popup.menu; unsigned int index; - fprintf(stderr, " popup_addwthindex %s, %d\n", text, id); + if (mc == NULL) return; + fprintf(stderr, " popup_addwthid %s, %d\n", text, id); dlg_macpopup_add(ctrl, dlg, text); - index = CountMItems(menu) - 1; + 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; } -void dlg_listbox_addwithindex(union control *ctrl, void *dlg, - char const *text, int 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); + ListHandle list; + Size olen; + ListBounds bounds; + int index; + + if (mc == NULL) return; + fprintf(stderr, " maclist_addwithid %s %d\n", text, id); + dlg_maclist_add(ctrl, dlg, text); + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return; +#if TARGET_API_MAC_CARBON + GetListDataBounds(list, &bounds); +#else + bounds = (*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_addwithindex(ctrl, dlg, text, id); + dlg_macpopup_addwithid(ctrl, dlg, text, id); + else + dlg_maclist_addwithid(ctrl, dlg, text, id); } int dlg_listbox_getid(union control *ctrl, void *dlg, int index) @@ -1146,6 +1641,7 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index) struct macctrls *mcs = dlg; union macctrl *mc = findbyctrl(mcs, ctrl); + assert(mc != NULL); if (ctrl->listbox.height == 0) { assert(mc->popup.ids != NULL && mc->popup.nids > index); return mc->popup.ids[index]; @@ -1153,15 +1649,52 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index) return 0; } -int dlg_listbox_index(union control *ctrl, void *dlg) +static int dlg_maclist_index(union control *ctrl, void *dlg) { struct macctrls *mcs = dlg; union macctrl *mc = findbyctrl(mcs, ctrl); + ListHandle list; + Size olen; + Cell cell = { 0, 0 }; - if (ctrl->listbox.height == 0) + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return -1; + if (LGetSelect(TRUE, &cell, list)) + return cell.v; + else + return -1; +} + +int dlg_listbox_index(union control *ctrl, void *dlg) +{ + struct macctrls *mcs = dlg; + union macctrl *mc; + + if (ctrl->listbox.height == 0) { + mc = findbyctrl(mcs, ctrl); + assert(mc != NULL); return GetControlValue(mc->popup.tbctrl) - 1; - return 0; -}; + } else + return dlg_maclist_index(ctrl, dlg); +} + +static int dlg_maclist_issel(union control *ctrl, void *dlg, int index) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + ListHandle list; + Size olen; + Cell cell = { 0, 0 }; + + if (GetControlData(mc->listbox.tbctrl, kControlEntireControl, + kControlListBoxListHandleTag, sizeof(list), &list, + &olen) != noErr) + return FALSE; + cell.v = index; + return LGetSelect(FALSE, &cell, list); +} int dlg_listbox_issel(union control *ctrl, void *dlg, int index) { @@ -1170,14 +1703,16 @@ int dlg_listbox_issel(union control *ctrl, void *dlg, int index) if (ctrl->listbox.height == 0) return GetControlValue(mc->popup.tbctrl) - 1 == index; - return 0; -}; + else + return dlg_maclist_issel(ctrl, dlg, index); +} void dlg_listbox_select(union control *ctrl, void *dlg, int index) { struct macctrls *mcs = dlg; union macctrl *mc = findbyctrl(mcs, ctrl); + if (mc == NULL) return; if (ctrl->listbox.height == 0) SetControlValue(mc->popup.tbctrl, index + 1); }; @@ -1191,16 +1726,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 }