X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fd703c0a03b425737644a3e880bb5011c231ae19..a460b361fe6734325bead016ef2dd39e4da302f4:/mac/macctrls.c diff --git a/mac/macctrls.c b/mac/macctrls.c index 0855e01e..8eebe97c 100644 --- a/mac/macctrls.c +++ b/mac/macctrls.c @@ -1,4 +1,4 @@ -/* $Id: macctrls.c,v 1.14 2003/03/25 23:23:03 ben Exp $ */ +/* $Id: macctrls.c,v 1.18 2003/03/29 18:32:36 ben Exp $ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -31,8 +31,11 @@ #include #include #include +#include #include +#include #include +#include #include #include @@ -114,6 +117,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, @@ -129,6 +133,8 @@ static void macctrl_popup(struct macctrls *, WindowPtr, #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 @@ -157,6 +163,8 @@ static void macctrl_init() 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; @@ -211,6 +219,7 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, CreateRootControl(window, &root); mcs->window = window; mcs->byctrl = newtree234(macctrl_cmp_byctrl); + mcs->focus = NULL; /* Count the number of panels */ mcs->npanels = 1; for (i = 1; i < cb->nctrlsets; i++) @@ -299,7 +308,11 @@ 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); @@ -321,8 +334,46 @@ static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which) 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) @@ -414,23 +465,86 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, 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; + bounds.top = curstate->pos.v; + bounds.bottom = bounds.top + 22; 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); - 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 */ + mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0, + SYS7_EDITBOX_PROC, (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); } +#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; + 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) { + rect = (*control)->contrlRect; + PenNormal(); + FrameRect(&rect); + InsetRect(&rect, 3, 3); + TEUpdate(&rect, (TEHandle)(*control)->contrlData); + } + return 0; + case testCntl: + mouse.h = LoWord(param); + mouse.v = HiWord(param); + return + PtInRect(mouse, &(*(TEHandle)(*control)->contrlData)->viewRect) ? + kControlEditTextPart : 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_radio(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) @@ -700,6 +814,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 +822,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) { @@ -738,6 +863,7 @@ void macctrl_click(WindowPtr window, EventRecord *event) break; } } + done: SetPort(saveport); } @@ -1004,18 +1130,22 @@ void dlg_editbox_set(union control *ctrl, void *dlg, char const *text) assert(mc != NULL); 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 +1163,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); -}; +} /* @@ -1114,8 +1251,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text) dlg_macpopup_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); @@ -1133,12 +1270,12 @@ static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg, mc->popup.ids[index] = id; } -void dlg_listbox_addwithindex(union control *ctrl, void *dlg, - char const *text, int 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); } int dlg_listbox_getid(union control *ctrl, void *dlg, int index)