X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/93ba25f871b6495d1049e920448a056c8424fee7..a460b361fe6734325bead016ef2dd39e4da302f4:/mac/macctrls.c diff --git a/mac/macctrls.c b/mac/macctrls.c index 7015c678..8eebe97c 100644 --- a/mac/macctrls.c +++ b/mac/macctrls.c @@ -1,4 +1,4 @@ -/* $Id: macctrls.c,v 1.7 2003/03/20 23:15:25 ben Exp $ */ +/* $Id: macctrls.c,v 1.18 2003/03/29 18:32:36 ben Exp $ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -29,12 +29,17 @@ #include #include #include +#include #include +#include #include +#include #include +#include #include #include +#include #include "putty.h" #include "mac.h" @@ -42,16 +47,27 @@ #include "dialog.h" #include "tree234.h" +/* Range of menu IDs for popup menus */ +#define MENU_MIN 1024 +#define MENU_MAX 2048 + + union macctrl { struct macctrl_generic { enum { MACCTRL_TEXT, + MACCTRL_EDITBOX, MACCTRL_RADIO, MACCTRL_CHECKBOX, - MACCTRL_BUTTON + MACCTRL_BUTTON, + MACCTRL_POPUP } type; /* Template from which this was generated */ union control *ctrl; + /* Next control in this panel */ + union macctrl *next; + void *privdata; + int freeprivdata; } generic; struct { struct macctrl_generic generic; @@ -59,6 +75,10 @@ union macctrl { } text; struct { struct macctrl_generic generic; + ControlRef tbctrl; + } editbox; + struct { + struct macctrl_generic generic; ControlRef *tbctrls; } radio; struct { @@ -69,11 +89,20 @@ union macctrl { struct macctrl_generic generic; ControlRef tbctrl; } button; + struct { + struct macctrl_generic generic; + ControlRef tbctrl; + MenuRef menu; + int menuid; + unsigned int nids; + int *ids; + } popup; }; struct mac_layoutstate { Point pos; unsigned int width; + unsigned int panelnum; }; #define ctrlevent(mcs, mc, event) do { \ @@ -87,17 +116,25 @@ 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, + struct mac_layoutstate *, union control *); static void macctrl_radio(struct macctrls *, WindowPtr, struct mac_layoutstate *, union control *); 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_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 @@ -126,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; @@ -174,13 +213,31 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, rect = window->portRect; #endif curstate.pos.h = rect.left + 13; - curstate.pos.v = rect.top + 13; + curstate.pos.v = rect.bottom - 59; curstate.width = rect.right - rect.left - (13 * 2); if (mac_gestalts.apprvers >= 0x100) CreateRootControl(window, &root); + mcs->window = window; mcs->byctrl = newtree234(macctrl_cmp_byctrl); - for (i = 0; i < cb->nctrlsets; i++) + mcs->focus = 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); + memset(mcs->panels, 0, sizeof(*mcs->panels) * mcs->npanels); + curstate.panelnum = 0; + 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); + } macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs); + } + macctrl_switchtopanel(mcs, 1); } static void macctrl_layoutset(struct mac_layoutstate *curstate, @@ -219,6 +276,9 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, case CTRL_TEXT: macctrl_text(mcs, window, curstate, ctrl); break; + case CTRL_EDITBOX: + macctrl_editbox(mcs, window, curstate, ctrl); + break; case CTRL_RADIO: macctrl_radio(mcs, window, curstate, ctrl); break; @@ -228,11 +288,92 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, case CTRL_BUTTON: macctrl_button(mcs, window, curstate, ctrl); break; + case CTRL_LISTBOX: + if (ctrl->listbox.height == 0) + macctrl_popup(mcs, window, curstate, ctrl); + break; + } + } +} + +static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which) +{ + unsigned int i, j; + union macctrl *mc; +#define hideshow(c) do { \ + if (i == which) ShowControl(c); else HideControl(c); \ +} while (0) + + 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) { +#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); + break; + case MACCTRL_RADIO: + for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++) + hideshow(mc->radio.tbctrls[j]); + break; + case MACCTRL_CHECKBOX: + hideshow(mc->checkbox.tbctrl); + break; + case MACCTRL_BUTTON: + hideshow(mc->button.tbctrl); + break; + case MACCTRL_POPUP: + hideshow(mc->popup.tbctrl); + break; + } } +} + +#if !TARGET_API_MAC_CARBON +/* + * System 7 focus manipulation + */ +static void macctrl_defocus(union macctrl *mc) +{ + + assert(mac_gestalts.apprvers < 0x100); + switch (mc->generic.type) { + case MACCTRL_EDITBOX: + TEDeactivate((TEHandle)(*mc->editbox.tbctrl)->contrlData); + break; + } +} + +static void macctrl_enfocus(union macctrl *mc) +{ + + assert(mac_gestalts.apprvers < 0x100); + switch (mc->generic.type) { + case MACCTRL_EDITBOX: + TEActivate((TEHandle)(*mc->editbox.tbctrl)->contrlData); + break; } } +static void macctrl_setfocus(struct macctrls *mcs, union macctrl *mc) +{ + + if (mcs->focus != 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) @@ -243,6 +384,7 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window, fprintf(stderr, " label = %s\n", ctrl->text.label); mc->generic.type = MACCTRL_TEXT; mc->generic.ctrl = ctrl; + mc->generic.privdata = NULL; bounds.left = curstate->pos.h; bounds.right = bounds.left + curstate->width; bounds.top = curstate->pos.v; @@ -270,6 +412,8 @@ static void macctrl_text(struct macctrls *mcs, WindowPtr window, SYS7_TEXT_PROC, (long)mc); } add234(mcs->byctrl, mc); + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; } #if !TARGET_API_MAC_CARBON @@ -305,6 +449,102 @@ 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; + 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); + } else { + 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) @@ -317,25 +557,29 @@ static void macctrl_radio(struct macctrls *mcs, WindowPtr window, 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); colwidth = (curstate->width + 13) / ctrl->radio.ncolumns; for (i = 0; i < ctrl->radio.nbuttons; i++) { fprintf(stderr, " button = %s\n", ctrl->radio.buttons[i]); - bounds.top = curstate->pos.v; - bounds.bottom = bounds.top + 16; + bounds.top = curstate->pos.v - 2; + bounds.bottom = bounds.top + 18; bounds.left = curstate->pos.h + colwidth * (i % ctrl->radio.ncolumns); if (i == ctrl->radio.nbuttons - 1 || i % ctrl->radio.ncolumns == ctrl->radio.ncolumns - 1) { bounds.right = curstate->pos.h + curstate->width; - curstate->pos.v += 22; + curstate->pos.v += 18; } else bounds.right = bounds.left + colwidth - 13; c2pstrcpy(title, ctrl->radio.buttons[i]); mc->radio.tbctrls[i] = NewControl(window, &bounds, title, TRUE, 0, 0, 1, radioButProc, (long)mc); } + curstate->pos.v += 4; add234(mcs->byctrl, mc); + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; ctrlevent(mcs, mc, EVENT_REFRESH); } @@ -350,6 +594,7 @@ static void macctrl_checkbox(struct macctrls *mcs, WindowPtr window, fprintf(stderr, " label = %s\n", ctrl->checkbox.label); mc->generic.type = MACCTRL_CHECKBOX; mc->generic.ctrl = ctrl; + mc->generic.privdata = NULL; bounds.left = curstate->pos.h; bounds.right = bounds.left + curstate->width; bounds.top = curstate->pos.v; @@ -359,6 +604,8 @@ static void macctrl_checkbox(struct macctrls *mcs, WindowPtr window, checkBoxProc, (long)mc); add234(mcs->byctrl, mc); curstate->pos.v += 22; + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; ctrlevent(mcs, mc, EVENT_REFRESH); } @@ -375,6 +622,7 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window, fprintf(stderr, " is default\n"); mc->generic.type = MACCTRL_BUTTON; mc->generic.ctrl = ctrl; + mc->generic.privdata = NULL; bounds.left = curstate->pos.h; bounds.right = bounds.left + 100; /* XXX measure string */ bounds.top = curstate->pos.v; @@ -401,6 +649,8 @@ static void macctrl_button(struct macctrls *mcs, WindowPtr window, sizeof(iscancel), &iscancel); } add234(mcs->byctrl, mc); + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; curstate->pos.v += 26; } @@ -445,28 +695,105 @@ static pascal SInt32 macctrl_sys7_default_cdef(SInt16 variant, } #endif +static void macctrl_popup(struct macctrls *mcs, WindowPtr window, + struct mac_layoutstate *curstate, + union control *ctrl) +{ + union macctrl *mc = smalloc(sizeof *mc); + Rect bounds; + Str255 title; + unsigned int labelwidth; + static int nextmenuid = MENU_MIN; + int menuid; + MenuRef menu; + + /* + * explains how to + * create a popup menu with dynamic content. + */ + assert(ctrl->listbox.height == 0); + 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); + + /* Find a spare menu ID and create the menu */ + while (GetMenuHandle(nextmenuid) != NULL) + if (++nextmenuid >= MENU_MAX) nextmenuid = MENU_MIN; + menuid = nextmenuid++; + menu = NewMenu(menuid, "\pdummy"); + if (menu == NULL) return; + mc->popup.menu = menu; + mc->popup.menuid = menuid; + InsertMenu(menu, kInsertHierarchicalMenu); + + /* The menu starts off empty */ + mc->popup.nids = 0; + mc->popup.ids = NULL; + + bounds.left = curstate->pos.h; + bounds.right = bounds.left + curstate->width; + bounds.top = curstate->pos.v; + bounds.bottom = bounds.top + 20; + /* XXX handle percentwidth == 100 */ + labelwidth = curstate->width * (100 - ctrl->listbox.percentwidth) / 100; + mc->popup.tbctrl = NewControl(window, &bounds, title, TRUE, + popupTitleLeftJust, menuid, labelwidth, + popupMenuProc + popupFixedWidth, (long)mc); + add234(mcs->byctrl, mc); + curstate->pos.v += 26; + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; + ctrlevent(mcs, mc, EVENT_REFRESH); +} + void macctrl_activate(WindowPtr window, EventRecord *event) { + struct macctrls *mcs = mac_winctrls(window); Boolean active = (event->modifiers & activeFlag) != 0; GrafPtr saveport; - ControlRef root; + int i, j; + ControlPartCode state; + union macctrl *mc; GetPort(&saveport); SetPort((GrafPtr)GetWindowPort(window)); - if (mac_gestalts.apprvers >= 0x100) { + if (mac_gestalts.apprvers >= 0x100) SetThemeWindowBackground(window, active ? kThemeBrushModelessDialogBackgroundActive : kThemeBrushModelessDialogBackgroundInactive, TRUE); - GetRootControl(window, &root); - if (active) - ActivateControl(root); - else - DeactivateControl(root); - } else { - /* (De)activate controls one at a time */ - } + state = active ? kControlNoPart : kControlInactivePart; + for (i = 0; i <= mcs->curpanel; i += mcs->curpanel) + 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); + break; + case MACCTRL_RADIO: + for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++) + HiliteControl(mc->radio.tbctrls[j], state); + break; + case MACCTRL_CHECKBOX: + HiliteControl(mc->checkbox.tbctrl, state); + break; + case MACCTRL_BUTTON: + HiliteControl(mc->button.tbctrl, state); + break; + case MACCTRL_POPUP: + HiliteControl(mc->popup.tbctrl, state); + break; + } SetPort(saveport); } @@ -474,44 +801,87 @@ void macctrl_click(WindowPtr window, EventRecord *event) { Point mouse; ControlHandle control; - int part; + int part, trackresult; GrafPtr saveport; union macctrl *mc; struct macctrls *mcs = mac_winctrls(window); int i; + UInt32 features; GetPort(&saveport); SetPort((GrafPtr)GetWindowPort(window)); mouse = event->where; GlobalToLocal(&mouse); part = FindControl(mouse, window, &control); - if (control != NULL) - if (TrackControl(control, mouse, NULL) != 0) { - mc = (union macctrl *)GetControlReference(control); - switch (mc->generic.type) { - case MACCTRL_RADIO: - for (i = 0; i < mc->generic.ctrl->radio.nbuttons; i++) { + if (control != NULL) { + mc = (union macctrl *)GetControlReference(control); + if (mac_gestalts.apprvers >= 0x100) { + if (GetControlFeatures(control, &features) == noErr && + (features & kControlSupportsFocus) && + (features & kControlGetsFocusOnClick)) + SetKeyboardFocus(window, control, part); + trackresult = HandleControlClick(control, mouse, event->modifiers, + (ControlActionUPP)-1); + } 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); + } + switch (mc->generic.type) { + case MACCTRL_RADIO: + if (trackresult != 0) { + for (i = 0; i < mc->generic.ctrl->radio.nbuttons; i++) if (mc->radio.tbctrls[i] == control) SetControlValue(mc->radio.tbctrls[i], kControlRadioButtonCheckedValue); else SetControlValue(mc->radio.tbctrls[i], kControlRadioButtonUncheckedValue); - } ctrlevent(mcs, mc, EVENT_VALCHANGE); - break; - case MACCTRL_CHECKBOX: + } + break; + case MACCTRL_CHECKBOX: + if (trackresult != 0) { SetControlValue(control, !GetControlValue(control)); ctrlevent(mcs, mc, EVENT_VALCHANGE); - break; - case MACCTRL_BUTTON: - ctrlevent(mcs, mc, EVENT_ACTION); - break; } + break; + case MACCTRL_BUTTON: + if (trackresult != 0) + ctrlevent(mcs, mc, EVENT_ACTION); + break; + case MACCTRL_POPUP: + ctrlevent(mcs, mc, EVENT_SELCHANGE); + break; } + } + done: SetPort(saveport); } +void macctrl_key(WindowPtr window, EventRecord *event) +{ + ControlRef control; + struct macctrls *mcs = mac_winctrls(window); + union macctrl *mc; + + 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); + } +} + void macctrl_update(WindowPtr window) { #if TARGET_API_MAC_CARBON @@ -567,19 +937,31 @@ void macctrl_close(WindowPtr window) struct macctrls *mcs = mac_winctrls(window); union macctrl *mc; + /* + * Mostly, we don't bother disposing of the Toolbox controls, + * since that will happen automatically when the window is + * disposed of. Popup menus are an exception, because we have to + * dispose of the menu ourselves, and doing that while the control + * still holds a reference to it seems rude. + */ while ((mc = index234(mcs->byctrl, 0)) != NULL) { + if (mc->generic.privdata != NULL && mc->generic.freeprivdata) + sfree(mc->generic.privdata); + switch (mc->generic.type) { + case MACCTRL_POPUP: + DisposeControl(mc->popup.tbctrl); + DeleteMenu(mc->popup.menuid); + DisposeMenu(mc->popup.menu); + break; + } del234(mcs->byctrl, mc); sfree(mc); } freetree234(mcs->byctrl); mcs->byctrl = NULL; - -/* XXX - DisposeWindow(window); - if (s->window == NULL) - sfree(s); -*/ + sfree(mcs->panels); + mcs->panels = NULL; } void dlg_update_start(union control *ctrl, void *dlg) @@ -632,25 +1014,44 @@ void dlg_end(void *dlg, int value) void dlg_refresh(union control *ctrl, void *dlg) { + struct macctrls *mcs = dlg; + union macctrl *mc; + if (ctrl == NULL) + return; /* FIXME */ + mc = findbyctrl(mcs, ctrl); + assert(mc != NULL); + ctrlevent(mcs, mc, EVENT_REFRESH); }; void *dlg_get_privdata(union control *ctrl, void *dlg) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); - return NULL; + assert(mc != NULL); + return mc->generic.privdata; } void dlg_set_privdata(union control *ctrl, void *dlg, void *ptr) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); - fatalbox("dlg_set_privdata"); + assert(mc != NULL); + mc->generic.privdata = ptr; + mc->generic.freeprivdata = FALSE; } void *dlg_alloc_privdata(union control *ctrl, void *dlg, size_t size) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); - fatalbox("dlg_alloc_privdata"); + assert(mc != NULL); + mc->generic.privdata = smalloc(size); + mc->generic.freeprivdata = TRUE; + return mc->generic.privdata; } @@ -723,61 +1124,199 @@ int dlg_checkbox_get(union control *ctrl, void *dlg) void dlg_editbox_set(union control *ctrl, void *dlg, char const *text) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + GrafPtr saveport; -}; + assert(mc != NULL); + assert(mc->generic.type == MACCTRL_EDITBOX); + 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); +#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) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + Size olen; -}; + assert(mc != NULL); + assert(mc->generic.type == MACCTRL_EDITBOX); + if (mac_gestalts.apprvers >= 0x100) { + if (GetControlData(mc->editbox.tbctrl, kControlEntireControl, + ctrl->editbox.password ? + kControlEditTextPasswordTag : + kControlEditTextTextTag, + length - 1, buffer, &olen) != noErr) + olen = 0; + if (olen > length - 1) + 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); +} /* * List Box control */ +static void dlg_macpopup_clear(union control *ctrl, void *dlg) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->popup.menu; + unsigned int i, n; + + fprintf(stderr, " popup_clear\n"); + 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, CountMenuItems(menu)); +} + void dlg_listbox_clear(union control *ctrl, void *dlg) { -}; + if (ctrl->listbox.height == 0) + dlg_macpopup_clear(ctrl, dlg); +} + +static void dlg_macpopup_del(union control *ctrl, void *dlg, int index) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->popup.menu; + + 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, CountMenuItems(menu)); +} void dlg_listbox_del(union control *ctrl, void *dlg, int index) { -}; + if (ctrl->listbox.height == 0) + dlg_macpopup_del(ctrl, dlg, index); +} + +static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->popup.menu; + Str255 itemstring; + + fprintf(stderr, " popup_add %s\n", text); + assert(text[0] != '\0'); + c2pstrcpy(itemstring, text); + AppendMenu(menu, "\pdummy"); + SetMenuItemText(menu, CountMenuItems(menu), itemstring); + SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); +} void dlg_listbox_add(union control *ctrl, void *dlg, char const *text) { -}; + if (ctrl->listbox.height == 0) + dlg_macpopup_add(ctrl, dlg, text); +} -void dlg_listbox_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); + dlg_macpopup_add(ctrl, dlg, text); + index = CountMenuItems(menu) - 1; + if (mc->popup.nids <= index) { + mc->popup.nids = index + 1; + mc->popup.ids = srealloc(mc->popup.ids, + mc->popup.nids * sizeof(*mc->popup.ids)); + } + mc->popup.ids[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); +} 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]; + } return 0; -}; +} int dlg_listbox_index(union control *ctrl, void *dlg) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + if (ctrl->listbox.height == 0) + return GetControlValue(mc->popup.tbctrl) - 1; return 0; }; int dlg_listbox_issel(union control *ctrl, void *dlg, int index) { + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + if (ctrl->listbox.height == 0) + return GetControlValue(mc->popup.tbctrl) - 1 == index; return 0; }; 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); }; @@ -794,8 +1333,7 @@ void dlg_text_set(union control *ctrl, void *dlg, char const *text) assert(mc != NULL); if (mac_gestalts.apprvers >= 0x100) SetControlData(mc->text.tbctrl, kControlEntireControl, - kControlStaticTextTextTag, - strlen(ctrl->text.label), ctrl->text.label); + kControlStaticTextTextTag, strlen(text), text); else { c2pstrcpy(title, text); SetControlTitle(mc->text.tbctrl, title);