-/* $Id: macctrls.c,v 1.39 2003/04/14 23:47:07 ben Exp $ */
+/* $Id$ */
/*
* Copyright (c) 2003 Ben Harris
* All rights reserved.
MACCTRL_CHECKBOX,
MACCTRL_BUTTON,
MACCTRL_LISTBOX,
- MACCTRL_POPUP
+ MACCTRL_POPUP,
+ MACCTRL_GROUPBOX
} type;
/* Template from which this was generated */
union control *ctrl;
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;
};
static void macctrl_layoutset(struct mac_layoutstate *, struct controlset *,
WindowPtr, struct macctrls *);
+static void macctrl_hideshowpanel(struct macctrls *, unsigned int, int);
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_popup(struct macctrls *, WindowPtr,
struct mac_layoutstate *, union control *);
+static void macctrl_groupbox(struct macctrls *, WindowPtr,
+ struct mac_layoutstate *, union control *);
#if !TARGET_API_MAC_CARBON
static pascal SInt32 macctrl_sys7_editbox_cdef(SInt16, ControlRef,
ControlDefProcMessage, SInt32);
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
(*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
}
{
struct macctrls *mcs = dlg;
+ /* XXX what if there's no selection? */
if (event == EVENT_SELCHANGE)
macctrl_switchtopanel(mcs, dlg_listbox_index(ctrl, dlg) + 1);
}
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++)
panellist.listbox.height = 20;
panellist.listbox.percentwidth = 100;
macctrl_listbox(mcs, window, &curstate, &panellist);
+ /* XXX Start with panel 1 active */
curstate.pos.h = rect.left + 13 + 160 + 13;
curstate.pos.v = rect.bottom - 33;
macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs);
}
macctrl_switchtopanel(mcs, 1);
+ macctrl_hideshowpanel(mcs, 0, TRUE);
/* 14 = proxies, 19 = portfwd, 20 = SSH bugs */
}
+
+
#define MAXCOLS 16
static void macctrl_layoutset(struct mac_layoutstate *curstate,
struct controlset *s,
WindowPtr window, struct macctrls *mcs)
{
- unsigned int i, j, ncols, colstart;
- struct mac_layoutstate cols[MAXCOLS];
+ 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;
union control *ctrl = s->ctrls[i];
colstart = COLUMN_START(ctrl->generic.column);
- switch (ctrl->generic.type) {
- case CTRL_COLUMNS:
+ colspan = COLUMN_SPAN(ctrl->generic.column);
+ if (ctrl->generic.type == CTRL_COLUMNS) {
if (ctrl->columns.ncols != 1) {
ncols = ctrl->columns.ncols;
assert(ncols <= MAXCOLS);
cols[0].width = curstate->width;
ncols = 1;
}
- break;
- case CTRL_TEXT:
- macctrl_text(mcs, window, &cols[colstart], ctrl);
- break;
- case CTRL_EDITBOX:
- macctrl_editbox(mcs, window, &cols[colstart], ctrl);
- break;
- case CTRL_RADIO:
- macctrl_radio(mcs, window, &cols[colstart], ctrl);
- break;
- case CTRL_CHECKBOX:
- macctrl_checkbox(mcs, window, &cols[colstart], ctrl);
- break;
- case CTRL_BUTTON:
- macctrl_button(mcs, window, &cols[colstart], ctrl);
- break;
- case CTRL_LISTBOX:
- if (ctrl->listbox.height == 0)
- macctrl_popup(mcs, window, &cols[colstart], ctrl);
- else
- macctrl_listbox(mcs, window, &cols[colstart], ctrl);
- break;
+ } else {
+ pos = cols[colstart];
+ pos.width = cols[colstart + colspan - 1].width +
+ (cols[colstart + colspan - 1].pos.h - cols[colstart].pos.h);
+
+ for (j = colstart; j < colstart + colspan; j++)
+ if (pos.pos.v < cols[j].pos.v)
+ pos.pos.v = cols[j].pos.v;
+
+ switch (ctrl->generic.type) {
+ case CTRL_TEXT:
+ macctrl_text(mcs, window, &pos, ctrl);
+ break;
+ case CTRL_EDITBOX:
+ macctrl_editbox(mcs, window, &pos, ctrl);
+ break;
+ case CTRL_RADIO:
+ macctrl_radio(mcs, window, &pos, ctrl);
+ break;
+ case CTRL_CHECKBOX:
+ macctrl_checkbox(mcs, window, &pos, ctrl);
+ break;
+ case CTRL_BUTTON:
+ macctrl_button(mcs, window, &pos, ctrl);
+ break;
+ case CTRL_LISTBOX:
+ if (ctrl->listbox.height == 0)
+ macctrl_popup(mcs, window, &pos, ctrl);
+ else
+ macctrl_listbox(mcs, window, &pos, ctrl);
+ break;
+ }
+ for (j = colstart; j < colstart + colspan; j++)
+ cols[j].pos.v = pos.pos.v;
}
}
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_switchtopanel(struct macctrls *mcs, unsigned int which)
+static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel,
+ int showit)
{
- unsigned int i, j;
union macctrl *mc;
+ int j;
#define hideshow(c) do { \
- if (i == which) ShowControl(c); else HideControl(c); \
+ if (showit) 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) {
+ for (mc = mcs->panels[panel]; mc != NULL; mc = mc->generic.next) {
#if !TARGET_API_MAC_CARBON
- if (mcs->focus == mc)
- macctrl_setfocus(mcs, NULL);
+ 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);
- 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]);
- if (mc->radio.tblabel != NULL)
- hideshow(mc->radio.tblabel);
- break;
- case MACCTRL_CHECKBOX:
- hideshow(mc->checkbox.tbctrl);
- break;
- 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.
- */
+ switch (mc->generic.type) {
+ case MACCTRL_TEXT:
+ hideshow(mc->text.tbctrl);
+ break;
+ case MACCTRL_EDITBOX:
+ hideshow(mc->editbox.tbctrl);
+ 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]);
+ if (mc->radio.tblabel != NULL)
+ hideshow(mc->radio.tblabel);
+ break;
+ case MACCTRL_CHECKBOX:
+ hideshow(mc->checkbox.tbctrl);
+ break;
+ case MACCTRL_BUTTON:
+ hideshow(mc->button.tbctrl);
+ if (mc->button.tbring != NULL)
+ hideshow(mc->button.tbring);
+ 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));
+ hideshow(GetListVerticalScrollBar(mc->listbox.list));
#else
- hideshow((*mc->listbox.list)->vScroll);
+ hideshow((*mc->listbox.list)->vScroll);
#endif
- break;
- case MACCTRL_POPUP:
- hideshow(mc->popup.tbctrl);
- break;
- }
+ break;
+ case MACCTRL_POPUP:
+ hideshow(mc->popup.tbctrl);
+ break;
+ case MACCTRL_GROUPBOX:
+ hideshow(mc->groupbox.tbctrl);
+ break;
}
+ }
+}
+
+static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which)
+{
+
+ macctrl_hideshowpanel(mcs, mcs->curpanel, FALSE);
+ macctrl_hideshowpanel(mcs, which, TRUE);
+ mcs->curpanel = which;
}
#if !TARGET_API_MAC_CARBON
if (mac_gestalts.apprvers >= 0x100) {
Size olen;
- mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
+ mc->text.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
kControlStaticTextProc, (long)mc);
SetControlData(mc->text.tbctrl, kControlEntireControl,
kControlStaticTextTextTag,
else {
TEHandle te;
- mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
+ mc->text.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
SYS7_TEXT_PROC, (long)mc);
te = (TEHandle)(*mc->text.tbctrl)->contrlData;
TESetText(ctrl->text.label, strlen(ctrl->text.label), te);
if (ctrl->editbox.label == NULL)
mc->editbox.tblabel = NULL;
else {
- mc->editbox.tblabel = NewControl(window, &lbounds, NULL, TRUE,
+ mc->editbox.tblabel = NewControl(window, &lbounds, NULL, FALSE,
0, 0, 0, kControlStaticTextProc,
(long)mc);
SetControlData(mc->editbox.tblabel, kControlEntireControl,
strlen(ctrl->editbox.label), ctrl->editbox.label);
}
InsetRect(&bounds, 3, 3);
- mc->editbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
+ mc->editbox.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
ctrl->editbox.password ?
kControlEditTextPasswordProc :
kControlEditTextProc, (long)mc);
if (ctrl->editbox.label == NULL)
mc->editbox.tblabel = NULL;
else {
- mc->editbox.tblabel = NewControl(window, &lbounds, NULL, TRUE,
+ mc->editbox.tblabel = NewControl(window, &lbounds, NULL, FALSE,
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,
+ mc->editbox.tbctrl = NewControl(window, &bounds, NULL, FALSE, 0, 0, 0,
SYS7_EDITBOX_PROC, (long)mc);
}
#endif
mc->radio.tblabel = NULL;
else {
if (mac_gestalts.apprvers >= 0x100) {
- mc->radio.tblabel = NewControl(window, &bounds, NULL, TRUE,
+ mc->radio.tblabel = NewControl(window, &bounds, NULL, FALSE,
0, 0, 0, kControlStaticTextProc,
(long)mc);
SetControlData(mc->radio.tblabel, kControlEntireControl,
}
#if !TARGET_API_MAC_CARBON
else {
- mc->radio.tblabel = NewControl(window, &bounds, NULL, TRUE,
+ mc->radio.tblabel = NewControl(window, &bounds, NULL, FALSE,
0, 0, 0, SYS7_TEXT_PROC, (long)mc);
TESetText(ctrl->radio.label, strlen(ctrl->radio.label),
(TEHandle)(*mc->radio.tblabel)->contrlData);
} else
bounds.right = bounds.left + colwidth - 13;
c2pstrcpy(title, ctrl->radio.buttons[i]);
- mc->radio.tbctrls[i] = NewControl(window, &bounds, title, TRUE,
+ mc->radio.tbctrls[i] = NewControl(window, &bounds, title, FALSE,
0, 0, 1, radioButProc, (long)mc);
}
curstate->pos.v += 4;
bounds.top = curstate->pos.v;
bounds.bottom = bounds.top + 16;
c2pstrcpy(title, ctrl->checkbox.label);
- mc->checkbox.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 1,
+ mc->checkbox.tbctrl = NewControl(window, &bounds, title, FALSE, 0, 0, 1,
checkBoxProc, (long)mc);
add234(mcs->byctrl, mc);
curstate->pos.v += 22;
bounds.top = curstate->pos.v;
bounds.bottom = bounds.top + 20;
c2pstrcpy(title, ctrl->button.label);
- mc->button.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 1,
+ mc->button.tbctrl = NewControl(window, &bounds, title, FALSE, 0, 0, 1,
pushButProc, (long)mc);
mc->button.tbring = NULL;
if (mac_gestalts.apprvers >= 0x100) {
sizeof(isdefault), &isdefault);
} else if (ctrl->button.isdefault) {
InsetRect(&bounds, -4, -4);
- mc->button.tbring = NewControl(window, &bounds, title, TRUE, 0, 0, 1,
+ mc->button.tbring = NewControl(window, &bounds, title, FALSE, 0, 0, 1,
SYS7_DEFAULT_PROC, (long)mc);
}
if (mac_gestalts.apprvers >= 0x110) {
Rect bounds;
Size olen;
+ /* XXX Use label */
assert(ctrl->listbox.percentwidth == 100);
mc->generic.type = MACCTRL_LISTBOX;
mc->generic.ctrl = ctrl;
if (mac_gestalts.apprvers >= 0x100) {
InsetRect(&bounds, 3, 3);
- mc->listbox.tbctrl = NewControl(window, &bounds, NULL, TRUE,
+ mc->listbox.tbctrl = NewControl(window, &bounds, NULL, FALSE,
ldes_Default, 0, 0,
kControlListBoxProc, (long)mc);
if (GetControlData(mc->listbox.tbctrl, kControlEntireControl,
#if !TARGET_API_MAC_CARBON
else {
InsetRect(&bounds, -3, -3);
- mc->listbox.tbctrl = NewControl(window, &bounds, NULL, TRUE,
+ mc->listbox.tbctrl = NewControl(window, &bounds, NULL, FALSE,
0, 0, 0,
SYS7_LISTBOX_PROC, (long)mc);
mc->listbox.list = (ListHandle)(*mc->listbox.tbctrl)->contrlData;
mc->generic.next = mcs->panels[curstate->panelnum];
mcs->panels[curstate->panelnum] = mc;
ctrlevent(mcs, mc, EVENT_REFRESH);
+#if TARGET_API_MAC_CARBON
+ HideControl(GetListVerticalScrollBar(mc->listbox.list));
+#else
+ HideControl((*mc->listbox.list)->vScroll);
+#endif
}
#if !TARGET_API_MAC_CARBON
}
#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)
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,
+ mc->popup.tbctrl = NewControl(window, &bounds, title, FALSE,
popupTitleLeftJust, menuid, labelwidth,
popupMenuProc + popupFixedWidth, (long)mc);
add234(mcs->byctrl, mc);
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)
{
{
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);
projects / u / mdw / putty / blobdiff