X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a460b361fe6734325bead016ef2dd39e4da302f4..2d3f7d3831ef932d70baf8613a741d970f7539b8:/mac/macctrls.c diff --git a/mac/macctrls.c b/mac/macctrls.c index 8eebe97c..5390c8ac 100644 --- a/mac/macctrls.c +++ b/mac/macctrls.c @@ -1,4 +1,4 @@ -/* $Id: macctrls.c,v 1.18 2003/03/29 18:32:36 ben Exp $ */ +/* $Id: macctrls.c,v 1.21 2003/03/29 23:07:55 ben Exp $ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -76,10 +76,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; @@ -131,8 +133,6 @@ static void macctrl_button(struct macctrls *, WindowPtr, 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, @@ -161,8 +161,6 @@ 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); @@ -225,7 +223,7 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, for (i = 1; i < cb->nctrlsets; i++) if (strcmp(cb->ctrlsets[i]->pathname, cb->ctrlsets[i-1]->pathname)) mcs->npanels++; - mcs->panels = smalloc(sizeof(*mcs->panels) * mcs->npanels); + mcs->panels = snewn(mcs->npanels, union macctrl *); memset(mcs->panels, 0, sizeof(*mcs->panels) * mcs->npanels); curstate.panelnum = 0; for (i = 0; i < cb->nctrlsets; i++) { @@ -237,7 +235,8 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, } macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs); } - macctrl_switchtopanel(mcs, 1); + macctrl_switchtopanel(mcs, 2); + /* 14 = proxies, 20 = SSH bugs */ } static void macctrl_layoutset(struct mac_layoutstate *curstate, @@ -319,10 +318,12 @@ static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which) break; case MACCTRL_EDITBOX: hideshow(mc->editbox.tbctrl); + 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); break; case MACCTRL_CHECKBOX: hideshow(mc->checkbox.tbctrl); @@ -378,8 +379,9 @@ 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); mc->generic.type = MACCTRL_TEXT; @@ -390,7 +392,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, @@ -401,60 +402,32 @@ 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; } -#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; fprintf(stderr, " label = %s\n", ctrl->editbox.label); fprintf(stderr, " percentwidth = %d\n", ctrl->editbox.percentwidth); @@ -463,20 +436,45 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, 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) { + lbounds.right = lbounds.left + curstate->width; + lbounds.bottom = lbounds.top + 16; + 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; + 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) { + 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, 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); + mc->editbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0, + ctrl->editbox.password ? + kControlEditTextPasswordProc : + kControlEditTextProc, (long)mc); + } +#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); + 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]; @@ -499,7 +497,8 @@ static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant, 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); @@ -512,18 +511,23 @@ 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); + } + (*(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); - return - PtInRect(mouse, &(*(TEHandle)(*control)->contrlData)->viewRect) ? - kControlEditTextPart : kControlNoPart; + rect = (*control)->contrlRect; + InsetRect(&rect, 3, 3); + return PtInRect(mouse, &rect) ? kControlEditTextPart : kControlNoPart; case calcCRgns: if (param & (1 << 31)) { param &= ~(1 << 31); @@ -549,7 +553,7 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) { - union macctrl *mc = smalloc(sizeof *mc); + union macctrl *mc = snew(union macctrl); Rect bounds; Str255 title; unsigned int i, colwidth; @@ -558,9 +562,28 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window, mc->generic.type = MACCTRL_RADIO; mc->generic.ctrl = ctrl; mc->generic.privdata = NULL; - mc->radio.tbctrls = - smalloc(sizeof(*mc->radio.tbctrls) * ctrl->radio.nbuttons); + mc->radio.tbctrls = snewn(ctrl->radio.nbuttons, ControlRef); colwidth = (curstate->width + 13) / ctrl->radio.ncolumns; + bounds.top = curstate->pos.v; + bounds.bottom = bounds.top + 16; + 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 + 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; @@ -587,7 +610,7 @@ static void macctrl_checkbox(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) { - union macctrl *mc = smalloc(sizeof *mc); + union macctrl *mc = snew(union macctrl); Rect bounds; Str255 title; @@ -613,7 +636,7 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) { - union macctrl *mc = smalloc(sizeof *mc); + union macctrl *mc = snew(union macctrl); Rect bounds; Str255 title; @@ -699,7 +722,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; @@ -772,17 +795,19 @@ 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); + 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); break; case MACCTRL_CHECKBOX: HiliteControl(mc->checkbox.tbctrl, state); @@ -794,6 +819,15 @@ void macctrl_activate(WindowPtr window, EventRecord *event) 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); } @@ -1264,8 +1298,7 @@ static void dlg_macpopup_addwithid(union control *ctrl, void *dlg, index = CountMenuItems(menu) - 1; if (mc->popup.nids <= index) { mc->popup.nids = index + 1; - mc->popup.ids = srealloc(mc->popup.ids, - mc->popup.nids * sizeof(*mc->popup.ids)); + mc->popup.ids = sresize(mc->popup.ids, mc->popup.nids, int); } mc->popup.ids[index] = id; } @@ -1328,16 +1361,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 (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 }