X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/47c65db48a3928af282a1eb8dfed1348d0c3f864..f5dd8adbec0c362f609e2f115ff5859ce4969d09:/mac/macctrls.c diff --git a/mac/macctrls.c b/mac/macctrls.c index f717b6d9..db454cf2 100644 --- a/mac/macctrls.c +++ b/mac/macctrls.c @@ -1,4 +1,4 @@ -/* $Id: macctrls.c,v 1.24 2003/04/03 23:18:06 ben Exp $ */ +/* $Id: macctrls.c,v 1.39 2003/04/14 23:47:07 ben Exp $ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -27,8 +27,11 @@ #include #include +#include #include #include +#include +#include #include #include #include @@ -60,6 +63,7 @@ union macctrl { MACCTRL_RADIO, MACCTRL_CHECKBOX, MACCTRL_BUTTON, + MACCTRL_LISTBOX, MACCTRL_POPUP } type; /* Template from which this was generated */ @@ -90,10 +94,18 @@ union macctrl { struct { struct macctrl_generic generic; ControlRef tbctrl; + ControlRef tbring; } button; struct { struct macctrl_generic generic; ControlRef tbctrl; + ListHandle list; + unsigned int nids; + int *ids; + } listbox; + struct { + struct macctrl_generic generic; + ControlRef tbctrl; MenuRef menu; int menuid; unsigned int nids; @@ -130,6 +142,8 @@ 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 @@ -137,6 +151,8 @@ 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); #endif #if !TARGET_API_MAC_CARBON @@ -165,6 +181,8 @@ static void macctrl_init() (*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); inited = 1; #endif } @@ -196,6 +214,17 @@ 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; + + if (event == EVENT_SELCHANGE) + macctrl_switchtopanel(mcs, dlg_listbox_index(ctrl, dlg) + 1); +} + void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, struct macctrls *mcs) { @@ -205,19 +234,18 @@ 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 - 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++) @@ -226,17 +254,31 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, 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); + + 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); - /* 14 = proxies, 20 = SSH bugs */ + /* 14 = proxies, 19 = portfwd, 20 = SSH bugs */ } #define MAXCOLS 16 @@ -248,40 +290,17 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, unsigned int i, j, ncols, colstart; struct mac_layoutstate cols[MAXCOLS]; - 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); - 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; - 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; - } - 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]; @@ -295,7 +314,6 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, 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; @@ -321,6 +339,8 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, case CTRL_LISTBOX: if (ctrl->listbox.height == 0) macctrl_popup(mcs, window, &cols[colstart], ctrl); + else + macctrl_listbox(mcs, window, &cols[colstart], ctrl); break; } } @@ -352,12 +372,14 @@ static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which) break; case MACCTRL_EDITBOX: hideshow(mc->editbox.tbctrl); - hideshow(mc->editbox.tblabel); + 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]); - hideshow(mc->radio.tblabel); + if (mc->radio.tblabel != NULL) + hideshow(mc->radio.tblabel); break; case MACCTRL_CHECKBOX: hideshow(mc->checkbox.tbctrl); @@ -365,6 +387,18 @@ 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 TARGET_API_MAC_CARBON + hideshow(GetListVerticalScrollBar(mc->listbox.list)); +#else + hideshow((*mc->listbox.list)->vScroll); +#endif + break; case MACCTRL_POPUP: hideshow(mc->popup.tbctrl); break; @@ -401,6 +435,8 @@ static void macctrl_enfocus(union macctrl *mc) 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; @@ -417,7 +453,7 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window, 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; @@ -448,7 +484,6 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window, 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); @@ -463,21 +498,19 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, union macctrl *mc = snew(union macctrl); Rect lbounds, 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; lbounds.left = curstate->pos.h; lbounds.top = curstate->pos.v; if (ctrl->editbox.percentwidth == 100) { - lbounds.right = lbounds.left + curstate->width; - lbounds.bottom = lbounds.top + 16; + 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; - curstate->pos.v += 18; } else { lbounds.right = lbounds.left + curstate->width * (100 - ctrl->editbox.percentwidth) / 100; @@ -488,11 +521,16 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, bounds.top = curstate->pos.v; bounds.bottom = bounds.top + 22; if (mac_gestalts.apprvers >= 0x100) { - 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); + 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 ? @@ -501,10 +539,15 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, } #if !TARGET_API_MAC_CARBON 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); + 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); } @@ -550,6 +593,7 @@ static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant, FrameRect(&rect); InsetRect(&rect, 3, 3); } + EraseRect(&rect); (*(TEHandle)(*control)->contrlData)->viewRect = rect; TEUpdate(&rect, (TEHandle)(*control)->contrlData); } @@ -592,7 +636,6 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window, 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; @@ -602,24 +645,28 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window, bounds.bottom = bounds.top + 16; bounds.left = curstate->pos.h; bounds.right = bounds.left + curstate->width; - 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 + if (ctrl->radio.label == NULL) + mc->radio.tblabel = NULL; 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); - } + 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; + 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); @@ -648,7 +695,7 @@ static void macctrl_checkbox(struct macctrls *mcs, WindowPtr window, 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; @@ -674,9 +721,7 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window, 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; @@ -687,6 +732,7 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window, 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; @@ -695,8 +741,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; @@ -705,6 +751,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; @@ -720,15 +770,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: @@ -752,6 +807,157 @@ 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; + Size olen; + + 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 (mac_gestalts.apprvers >= 0x100) { + InsetRect(&bounds, 3, 3); + mc->listbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, + 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, TRUE, + 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 + } + 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 +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; + } + + return 0; +} +#endif + static void macctrl_popup(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) @@ -772,13 +978,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) @@ -836,18 +1039,25 @@ void macctrl_activate(WindowPtr window, EventRecord *event) break; case MACCTRL_EDITBOX: HiliteControl(mc->editbox.tbctrl, state); - HiliteControl(mc->editbox.tblabel, 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); - HiliteControl(mc->radio.tblabel, 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); @@ -868,7 +1078,7 @@ void macctrl_activate(WindowPtr window, EventRecord *event) void macctrl_click(WindowPtr window, EventRecord *event) { Point mouse; - ControlHandle control; + ControlHandle control, oldfocus; int part, trackresult; GrafPtr saveport; union macctrl *mc; @@ -882,11 +1092,25 @@ void macctrl_click(WindowPtr window, EventRecord *event) GlobalToLocal(&mouse); part = FindControl(mouse, window, &control); if (control != NULL) { - mc = (union macctrl *)GetControlReference(control); +#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); @@ -900,6 +1124,18 @@ void macctrl_click(WindowPtr window, EventRecord *event) TEClick(mouse, !!(event->modifiers & shiftKey), te); goto done; } + 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; + } #endif trackresult = TrackControl(control, mouse, (ControlActionUPP)-1); } @@ -926,6 +1162,10 @@ 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; @@ -940,13 +1180,47 @@ 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); + 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 @@ -954,10 +1228,12 @@ void macctrl_key(WindowPtr window, EventRecord *event) TEHandle te; if (mcs->focus != NULL) { - switch (mcs->focus->generic.type) { + mc = mcs->focus; + switch (mc->generic.type) { case MACCTRL_EDITBOX: - te = (TEHandle)(*mcs->focus->editbox.tbctrl)->contrlData; + te = (TEHandle)(*mc->editbox.tbctrl)->contrlData; TEKey(event->message & charCodeMask, te); + ctrlevent(mcs, mc, EVENT_VALCHANGE); break; } } @@ -1092,7 +1368,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) @@ -1148,7 +1427,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], @@ -1185,7 +1464,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); @@ -1211,7 +1490,7 @@ 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))); @@ -1259,7 +1538,6 @@ void dlg_editbox_get(union control *ctrl, void *dlg, char *buffer, int length) } #endif buffer[olen] = '\0'; - fprintf(stderr, "dlg_editbox_get: %s\n", buffer); } @@ -1274,7 +1552,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); @@ -1284,11 +1562,30 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg) 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); + + 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; + } } static void dlg_macpopup_del(union control *ctrl, void *dlg, int index) @@ -1297,7 +1594,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, @@ -1305,11 +1602,30 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index) 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); + + 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; + } } static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text) @@ -1319,7 +1635,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"); @@ -1327,11 +1643,37 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text) 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); + 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; + } } static void dlg_macpopup_addwithid(union control *ctrl, void *dlg, @@ -1342,7 +1684,7 @@ 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) { @@ -1352,12 +1694,41 @@ static void dlg_macpopup_addwithid(union control *ctrl, void *dlg, mc->popup.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; + } } int dlg_listbox_getid(union control *ctrl, void *dlg, int index) @@ -1365,41 +1736,73 @@ 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]; + } } - 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; + } + } + 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); + } + } + 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; + } +} /* @@ -1411,7 +1814,7 @@ void dlg_text_set(union control *ctrl, void *dlg, char const *text) struct macctrls *mcs = dlg; union macctrl *mc = findbyctrl(mcs, ctrl); - assert(mc != NULL); + if (mc == NULL) return; if (mac_gestalts.apprvers >= 0x100) SetControlData(mc->text.tbctrl, kControlEntireControl, kControlStaticTextTextTag, strlen(text), text); @@ -1483,14 +1886,34 @@ 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; } /*