X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/599ede468a30006896db7a380d079a122bf6b4a1..7374c7790ee32f36855e4257eb15d2fe43e277ea:/mac/macctrls.c diff --git a/mac/macctrls.c b/mac/macctrls.c index d49d6e6e..e5e774d9 100644 --- a/mac/macctrls.c +++ b/mac/macctrls.c @@ -1,4 +1,4 @@ -/* $Id: macctrls.c,v 1.42 2003/05/10 20:51:39 ben Exp $ */ +/* $Id$ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -64,7 +64,8 @@ union macctrl { MACCTRL_CHECKBOX, MACCTRL_BUTTON, MACCTRL_LISTBOX, - MACCTRL_POPUP + MACCTRL_POPUP, + MACCTRL_GROUPBOX } type; /* Template from which this was generated */ union control *ctrl; @@ -81,6 +82,11 @@ union macctrl { struct macctrl_generic generic; ControlRef tbctrl; ControlRef tblabel; + ControlRef tbbutton; + MenuRef menu; + int menuid; + unsigned int nids; + int *ids; } editbox; struct { struct macctrl_generic generic; @@ -99,6 +105,8 @@ union macctrl { struct { struct macctrl_generic generic; ControlRef tbctrl; + ControlRef tbup; + ControlRef tbdown; ListHandle list; unsigned int nids; int *ids; @@ -111,10 +119,16 @@ union macctrl { unsigned int nids; int *ids; } popup; + struct { + struct macctrl_generic generic; + ControlRef tbctrl; + } groupbox; }; struct mac_layoutstate { Point pos; + Point boxpos; + char *boxname; unsigned int width; unsigned int panelnum; }; @@ -147,6 +161,11 @@ static void macctrl_listbox(struct macctrls *, WindowPtr, struct mac_layoutstate *, union control *); static void macctrl_popup(struct macctrls *, WindowPtr, struct mac_layoutstate *, union control *); +static void macctrl_groupbox(struct macctrls *, WindowPtr, + struct mac_layoutstate *, union control *); +static void draglist_up(union macctrl *, struct macctrls *); +static void draglist_down(union macctrl *, struct macctrls *); + #if !TARGET_API_MAC_CARBON static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16, ControlRef, ControlDefProcMessage, SInt32); @@ -154,6 +173,8 @@ static pascal SInt32 macctrl_sys7_default_cdef(SInt16, ControlRef, ControlDefProcMessage, SInt32); static pascal SInt32 macctrl_sys7_listbox_cdef(SInt16, ControlRef, ControlDefProcMessage, SInt32); +static pascal SInt32 macctrl_sys7_groupbox_cdef(SInt16, ControlRef, + ControlDefProcMessage, SInt32); #endif #if !TARGET_API_MAC_CARBON @@ -184,6 +205,8 @@ static void macctrl_init() (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_default_cdef); cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_ListBox); (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_listbox_cdef); + cdef = (PatchCDEF)GetResource(kControlDefProcResourceType, CDEF_GroupBox); + (*cdef)->theUPP = NewControlDefProc(macctrl_sys7_groupbox_cdef); inited = 1; #endif } @@ -248,6 +271,7 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, mcs->focus = NULL; mcs->defbutton = NULL; mcs->canbutton = NULL; + mcs->curpanel = 1; /* Count the number of panels */ mcs->npanels = 1; for (i = 1; i < cb->nctrlsets; i++) @@ -285,6 +309,8 @@ void macctrl_layoutbox(struct controlbox *cb, WindowPtr window, /* 14 = proxies, 19 = portfwd, 20 = SSH bugs */ } + + #define MAXCOLS 16 static void macctrl_layoutset(struct mac_layoutstate *curstate, @@ -294,6 +320,29 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, unsigned int i, j, ncols, colstart, colspan; struct mac_layoutstate cols[MAXCOLS], pos; + /* Start a containing box, if we have a boxname. */ + if (s->boxname && *s->boxname) { + curstate->boxpos = curstate->pos; + if (s->boxtitle) { + curstate->boxname = s->boxtitle; + curstate->pos.v += 10; /* XXX determine font height */ + } else { + curstate->boxname = NULL; + } + curstate->pos.v += 6; + curstate->pos.h += 12; + curstate->width -= 24; + } + + /* Draw a title, if we have one. */ + if (!s->boxname && s->boxtitle) { + union control *ctrl = snew(union control); + ctrl->generic.handler = NULL; + ctrl->text.label = dupstr(s->boxtitle); + macctrl_text(mcs, window, curstate, ctrl); + /* FIXME: should be highlighted, centred or boxed */ + } + cols[0] = *curstate; ncols = 1; @@ -363,6 +412,15 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate, for (j = 0; j < ncols; j++) if (cols[j].pos.v > curstate->pos.v) curstate->pos.v = cols[j].pos.v; + + if (s->boxname && *s->boxname) { + union control *ctrl = snew(union control); + /* We're coming out of a box, so set the width back */ + curstate->pos.h -= 12; + curstate->width += 24; + /* And draw the box to the original width */ + macctrl_groupbox(mcs, window, curstate, ctrl); + } } static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel, @@ -388,6 +446,8 @@ static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel, hideshow(mc->editbox.tbctrl); if (mc->editbox.tblabel != NULL) hideshow(mc->editbox.tblabel); + if (mc->editbox.tbbutton != NULL) + hideshow(mc->editbox.tbbutton); break; case MACCTRL_RADIO: for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++) @@ -405,6 +465,10 @@ static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel, break; case MACCTRL_LISTBOX: hideshow(mc->listbox.tbctrl); + if (mc->listbox.tbup != NULL) + hideshow(mc->listbox.tbup); + if (mc->listbox.tbdown != NULL) + hideshow(mc->listbox.tbdown); /* * At least under Mac OS 8.1, hiding a list box * doesn't hide its scroll bars. @@ -418,6 +482,9 @@ static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel, case MACCTRL_POPUP: hideshow(mc->popup.tbctrl); break; + case MACCTRL_GROUPBOX: + hideshow(mc->groupbox.tbctrl); + break; } } } @@ -520,7 +587,10 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, union control *ctrl) { union macctrl *mc = snew(union macctrl); - Rect lbounds, bounds; + Rect lbounds, bounds, butbounds; + static int nextmenuid = MENU_MIN; + int menuid; + MenuRef menu; mc->generic.type = MACCTRL_EDITBOX; mc->generic.ctrl = ctrl; @@ -544,6 +614,13 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, } bounds.top = curstate->pos.v; bounds.bottom = bounds.top + 22; + + if (ctrl->editbox.has_list) { + butbounds = bounds; + butbounds.left = butbounds.right - 20; + bounds.right -= 26; /* enough for 6 px gap and a button */ + } + if (mac_gestalts.apprvers >= 0x100) { if (ctrl->editbox.label == NULL) mc->editbox.tblabel = NULL; @@ -576,6 +653,27 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window, SYS7_EDITBOX_PROC, (long)mc); } #endif + + if (ctrl->editbox.has_list) { + while (GetMenuHandle(nextmenuid) != NULL) + if (++nextmenuid >= MENU_MAX) nextmenuid = MENU_MIN; + menuid = nextmenuid++; + menu = NewMenu(menuid, "\pdummy"); + if (menu == NULL) goto nomenu; + mc->editbox.menu = menu; + mc->editbox.menuid = menuid; + InsertMenu(menu, kInsertHierarchicalMenu); + mc->editbox.nids = 0; + mc->editbox.ids = NULL; + + mc->editbox.tbbutton = NewControl(window, &butbounds, NULL, FALSE, + popupTitleLeftJust, menuid, 0, + popupMenuProc + popupFixedWidth, + (long)mc); + } + + nomenu: + curstate->pos.v += 28; add234(mcs->byctrl, mc); mc->generic.next = mcs->panels[curstate->panelnum]; @@ -650,7 +748,7 @@ static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16 variant, return 0; } #endif - + static void macctrl_radio(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) @@ -836,7 +934,7 @@ static void macctrl_listbox(struct macctrls *mcs, WindowPtr window, union control *ctrl) { union macctrl *mc = snew(union macctrl); - Rect bounds; + Rect bounds, upbounds, downbounds; Size olen; /* XXX Use label */ @@ -852,6 +950,16 @@ static void macctrl_listbox(struct macctrls *mcs, WindowPtr window, bounds.top = curstate->pos.v; bounds.bottom = bounds.top + 16 * ctrl->listbox.height + 2; + if (ctrl->listbox.draglist) { + upbounds = downbounds = bounds; + upbounds.left = upbounds.right - 58; + upbounds.bottom = upbounds.top + 20; + downbounds.left = downbounds.right - 58; + downbounds.top = upbounds.bottom + 6; + downbounds.bottom = downbounds.top + 20; + bounds.right -= 64; /* enough for 6 px gap and a button */ + } + if (mac_gestalts.apprvers >= 0x100) { InsetRect(&bounds, 3, 3); mc->listbox.tbctrl = NewControl(window, &bounds, NULL, FALSE, @@ -883,6 +991,14 @@ static void macctrl_listbox(struct macctrls *mcs, WindowPtr window, (*mc->listbox.list)->selFlags = lOnlyOne; #endif } + + if (ctrl->listbox.draglist) { + mc->listbox.tbup = NewControl(window, &upbounds, "\pUp", FALSE, 0, 0, 1, + pushButProc, (long)mc); + mc->listbox.tbdown = NewControl(window, &downbounds, "\pDown", FALSE, 0, 0, 1, + pushButProc, (long)mc); + } + add234(mcs->byctrl, mc); curstate->pos.v += 6 + 16 * ctrl->listbox.height + 2; mc->generic.next = mcs->panels[curstate->panelnum]; @@ -988,6 +1104,48 @@ static pascal SInt32 macctrl_sys7_listbox_cdef(SInt16 variant, } #endif +#if !TARGET_API_MAC_CARBON +static pascal SInt32 macctrl_sys7_groupbox_cdef(SInt16 variant, + ControlRef control, + ControlDefProcMessage msg, + SInt32 param) +{ + RgnHandle rgn; + Rect rect; + PenState savestate; + + switch (msg) { + case drawCntl: + if ((*control)->contrlVis) { + rect = (*control)->contrlRect; + GetPenState(&savestate); + PenNormal(); + PenSize(3, 3); + PenPat(&qd.gray); + FrameRect(&rect); + SetPenState(&savestate); + } + 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_popup(struct macctrls *mcs, WindowPtr window, struct mac_layoutstate *curstate, union control *ctrl) @@ -1043,6 +1201,39 @@ static void macctrl_popup(struct macctrls *mcs, WindowPtr window, ctrlevent(mcs, mc, EVENT_REFRESH); } +static void macctrl_groupbox(struct macctrls *mcs, WindowPtr window, + struct mac_layoutstate *curstate, + union control *ctrl) +{ + union macctrl *mc = snew (union macctrl); + Str255 ptitle; + Rect r; + + r.top = curstate->boxpos.v; + r.left = curstate->boxpos.h; + r.bottom = curstate->pos.v; + r.right = curstate->boxpos.h + curstate->width; + + mc->generic.type = MACCTRL_GROUPBOX; + mc->generic.privdata = NULL; + mc->generic.ctrl = ctrl; + mc->generic.ctrl->generic.handler = NULL; + + if (curstate->boxname) + c2pstrcpy(ptitle, curstate->boxname); + else + c2pstrcpy(ptitle, ""); + if (mac_gestalts.apprvers >= 0x100) { /* Appearance Manager */ + mc->groupbox.tbctrl = NewControl(window, &r, ptitle, FALSE, 0, 0, 1, + kControlGroupBoxTextTitleProc, (long)mc); + } else { + mc->groupbox.tbctrl = NewControl(window, &r, ptitle, FALSE, 0, 0, 1, + SYS7_GROUPBOX_PROC, (long)mc); + } + add234(mcs->byctrl, mc); + mc->generic.next = mcs->panels[curstate->panelnum]; + mcs->panels[curstate->panelnum] = mc; +} void macctrl_activate(WindowPtr window, EventRecord *event) { @@ -1071,6 +1262,8 @@ void macctrl_activate(WindowPtr window, EventRecord *event) HiliteControl(mc->editbox.tbctrl, state); if (mc->editbox.tblabel != NULL) HiliteControl(mc->editbox.tblabel, state); + if (mc->editbox.tbbutton != NULL) + HiliteControl(mc->editbox.tbbutton, state); break; case MACCTRL_RADIO: for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++) @@ -1088,10 +1281,16 @@ void macctrl_activate(WindowPtr window, EventRecord *event) break; case MACCTRL_LISTBOX: HiliteControl(mc->listbox.tbctrl, state); + if (mc->listbox.tbup != NULL) + HiliteControl(mc->listbox.tbup, state); + if (mc->listbox.tbdown != NULL) + HiliteControl(mc->listbox.tbdown, state); break; case MACCTRL_POPUP: HiliteControl(mc->popup.tbctrl, state); break; + case MACCTRL_GROUPBOX: + HiliteControl(mc->popup.tbctrl, state); } #if !TARGET_API_MAC_CARBON if (mcs->focus == mc) { @@ -1154,6 +1353,12 @@ void macctrl_click(WindowPtr window, EventRecord *event) TEClick(mouse, !!(event->modifiers & shiftKey), te); goto done; } + if (mc->generic.type == MACCTRL_EDITBOX && + control == mc->editbox.tbbutton) { + dlg_editbox_set(mc->generic.ctrl, mcs, + cp_enumerate(dlg_listbox_index(mc->generic.ctrl, mcs))); + ctrlevent(mcs, mc, EVENT_VALCHANGE); + } if (mc->generic.type == MACCTRL_LISTBOX && (control == mc->listbox.tbctrl || control == (*mc->listbox.list)->vScroll)) { @@ -1166,6 +1371,12 @@ void macctrl_click(WindowPtr window, EventRecord *event) ctrlevent(mcs, mc, EVENT_SELCHANGE); goto done; } + if (mc->generic.type == MACCTRL_LISTBOX && + control == mc->listbox.tbup) + draglist_up(mc, mcs); + if (mc->generic.type == MACCTRL_LISTBOX && + control == mc->listbox.tbdown) + draglist_down(mc, mcs); #endif trackresult = TrackControl(control, mouse, (ControlActionUPP)-1); } @@ -1192,7 +1403,19 @@ void macctrl_click(WindowPtr window, EventRecord *event) if (trackresult != 0) ctrlevent(mcs, mc, EVENT_ACTION); break; + case MACCTRL_EDITBOX: + if (control == mc->editbox.tbbutton) { + dlg_editbox_set(mc->generic.ctrl, mcs, + cp_enumerate(dlg_listbox_index(mc->generic.ctrl, mcs))); + ctrlevent(mcs, mc, EVENT_VALCHANGE); + } + break; case MACCTRL_LISTBOX: + if (control == mc->listbox.tbup) + draglist_up(mc, mcs); + if (control == mc->listbox.tbdown) + draglist_down(mc, mcs); + /* FIXME spot double-click */ ctrlevent(mcs, mc, EVENT_SELCHANGE); break; @@ -1408,9 +1631,18 @@ void dlg_refresh(union control *ctrl, void *dlg) { struct macctrls *mcs = dlg; union macctrl *mc; + int i; - if (ctrl == NULL) - return; /* FIXME */ + if (ctrl == NULL) { + /* NULL means refresh every control */ + for (i = 0 ; i < mcs->npanels; i++) { + for (mc = mcs->panels[i]; mc != NULL; mc = mc->generic.next) { + ctrlevent(mcs, mc, EVENT_REFRESH); + } + } + return; + } + /* Just refresh a specific control */ mc = findbyctrl(mcs, ctrl); assert(mc != NULL); ctrlevent(mcs, mc, EVENT_REFRESH); @@ -1592,6 +1824,23 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg) SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); } +static void dlg_macedit_clear(union control *ctrl, void *dlg) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->editbox.menu; + unsigned int i, n; + + if (mc == NULL) return; + n = CountMenuItems(menu); + for (i = 0; i < n; i++) + DeleteMenuItem(menu, n - i); + mc->editbox.nids = 0; + sfree(mc->editbox.ids); + mc->editbox.ids = NULL; + SetControlMaximum(mc->editbox.tbbutton, CountMenuItems(menu)); +} + static void dlg_maclist_clear(union control *ctrl, void *dlg) { struct macctrls *mcs = dlg; @@ -1615,6 +1864,8 @@ void dlg_listbox_clear(union control *ctrl, void *dlg) else dlg_maclist_clear(ctrl, dlg); break; + case CTRL_EDITBOX: + dlg_macedit_clear(ctrl, dlg); } } @@ -1632,6 +1883,20 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index) SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); } +static void dlg_macedit_del(union control *ctrl, void *dlg, int index) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->editbox.menu; + + if (mc == NULL) return; + DeleteMenuItem(menu, index + 1); + if (mc->editbox.ids != NULL) + memcpy(mc->editbox.ids + index, mc->editbox.ids + index + 1, + (mc->editbox.nids - index - 1) * sizeof(*mc->editbox.ids)); + SetControlMaximum(mc->editbox.tbbutton, CountMenuItems(menu)); +} + static void dlg_maclist_del(union control *ctrl, void *dlg, int index) { struct macctrls *mcs = dlg; @@ -1655,6 +1920,8 @@ void dlg_listbox_del(union control *ctrl, void *dlg, int index) else dlg_maclist_del(ctrl, dlg, index); break; + case CTRL_EDITBOX: + dlg_macedit_del(ctrl, dlg, index); } } @@ -1673,6 +1940,20 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text) SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); } +static void dlg_macedit_add(union control *ctrl, void *dlg, char const *text) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->editbox.menu; + Str255 itemstring; + + if (mc == NULL) return; + assert(text[0] != '\0'); + c2pstrcpy(itemstring, text); + AppendMenu(menu, "\pdummy"); + SetMenuItemText(menu, CountMenuItems(menu), itemstring); + SetControlMaximum(mc->editbox.tbbutton, CountMenuItems(menu)); +} static void dlg_maclist_add(union control *ctrl, void *dlg, char const *text) { @@ -1703,6 +1984,9 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text) else dlg_maclist_add(ctrl, dlg, text); break; + case CTRL_EDITBOX: + dlg_macedit_add(ctrl, dlg, text); + break; } } @@ -1724,6 +2008,24 @@ static void dlg_macpopup_addwithid(union control *ctrl, void *dlg, mc->popup.ids[index] = id; } +static void dlg_macedit_addwithid(union control *ctrl, void *dlg, + char const *text, int id) +{ + struct macctrls *mcs = dlg; + union macctrl *mc = findbyctrl(mcs, ctrl); + MenuRef menu = mc->editbox.menu; + unsigned int index; + + if (mc == NULL) return; + dlg_macedit_add(ctrl, dlg, text); + index = CountMenuItems(menu) - 1; + if (mc->editbox.nids <= index) { + mc->editbox.nids = index + 1; + mc->editbox.ids = sresize(mc->editbox.ids, mc->editbox.nids, int); + } + mc->editbox.ids[index] = id; +} + static void dlg_maclist_addwithid(union control *ctrl, void *dlg, char const *text, int id) { @@ -1758,6 +2060,9 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg, else dlg_maclist_addwithid(ctrl, dlg, text, id); break; + case CTRL_EDITBOX: + dlg_macedit_addwithid(ctrl, dlg, text, id); + break; } } @@ -1776,6 +2081,9 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index) assert(mc->listbox.ids != NULL && mc->listbox.nids > index); return mc->listbox.ids[index]; } + case CTRL_EDITBOX: + assert(mc->editbox.ids != NULL && mc->editbox.nids > index); + return mc->editbox.ids[index]; } return -1; } @@ -1797,6 +2105,8 @@ int dlg_listbox_index(union control *ctrl, void *dlg) else return -1; } + case CTRL_EDITBOX: + return GetControlValue(mc->editbox.tbbutton) - 1; } return -1; } @@ -1816,6 +2126,8 @@ int dlg_listbox_issel(union control *ctrl, void *dlg, int index) cell.v = index; return LGetSelect(FALSE, &cell, mc->listbox.list); } + case CTRL_EDITBOX: + return GetControlValue(mc->editbox.tbbutton) - 1 == index; } return FALSE; } @@ -1831,9 +2143,78 @@ void dlg_listbox_select(union control *ctrl, void *dlg, int index) if (ctrl->listbox.height == 0) SetControlValue(mc->popup.tbctrl, index + 1); break; + case CTRL_EDITBOX: + SetControlValue(mc->editbox.tbbutton, index + 1); + } +} + +static void draglist_move(union macctrl *mc, struct macctrls *mcs, + int direction) +{ + ListBounds bounds; + Cell cell = {0, 0}; + char current[255]; + char new[255]; + short curlength = 255; + short newlength = 255; + int curid, newid; + + int index = dlg_listbox_index(mc->generic.ctrl, mcs); + +#if TARGET_API_MAC_CARBON + GetListDataBounds(mc->listbox.list, &bounds); +#else + bounds = (*mc->listbox.list)->dataBounds; +#endif + + if ((index < 0) || + (index == 0 && direction < 0) || + (index == bounds.bottom-1 && direction > 0)) { + SysBeep(30); + return; } + + /* Swap the contents of the selected and target list cells */ + + cell.v = index; + LGetCell(current, &curlength, cell, mc->listbox.list); + current[curlength] = '\0'; + cell.v += direction; + LGetCell(new, &newlength, cell, mc->listbox.list); + new[newlength] = '\0'; + + cell.v = index; + LSetCell(new, newlength, cell, mc->listbox.list); + cell.v += direction; + LSetCell(current, curlength, cell, mc->listbox.list); + + /* Move the selection to the target list cell */ + + cell.v = index; + LSetSelect(FALSE, cell, mc->listbox.list); + cell.v += direction; + LSetSelect(TRUE, cell, mc->listbox.list); + DrawOneControl(mc->listbox.tbctrl); + + /* Swap the ids of the list cells */ + + curid = mc->listbox.ids[index]; + newid = mc->listbox.ids[index + direction]; + mc->listbox.ids[index] = newid; + mc->listbox.ids[index + direction] = curid; + + ctrlevent(mcs, mc, EVENT_VALCHANGE); } +static void draglist_up(union macctrl *mc, struct macctrls *mcs) +{ + draglist_move(mc, mcs, -1); +} + +static void draglist_down(union macctrl *mc, struct macctrls *mcs) +{ + draglist_move(mc, mcs, +1); +} /* * Text control @@ -1946,6 +2327,17 @@ int dlg_coloursel_results(union control *ctrl, void *dlg, return 0; } +void dlg_label_change(union control *ctrl, void *dlg, char const *text) +{ + /* + * This function is currently only used by the config box to + * switch the labels on the host and port boxes between serial + * and network modes. Since the Mac port does not have a serial + * back end, this function can safely do nothing. + */ +} + + /* * Local Variables: * c-file-style: "simon"