-/* $Id: macctrls.c,v 1.21 2003/03/29 23:07:55 ben Exp $ */
+/* $Id: macctrls.c,v 1.27 2003/04/05 15:55:22 ben Exp $ */
/*
* Copyright (c) 2003 Ben Harris
* All rights reserved.
rect = window->portRect;
#endif
curstate.pos.h = rect.left + 13;
- curstate.pos.v = rect.bottom - 59;
+ curstate.pos.v = rect.bottom - 33;
curstate.width = rect.right - rect.left - (13 * 2);
if (mac_gestalts.apprvers >= 0x100)
CreateRootControl(window, &root);
}
macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs);
}
- macctrl_switchtopanel(mcs, 2);
+ macctrl_switchtopanel(mcs, 1);
/* 14 = proxies, 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;
+ unsigned int i, j, ncols, colstart;
+ struct mac_layoutstate cols[MAXCOLS];
fprintf(stderr, "--- begin set ---\n");
fprintf(stderr, "pathname = %s\n", s->pathname);
if (s->boxtitle)
fprintf(stderr, "boxtitle = %s\n", s->boxtitle);
+ cols[0] = *curstate;
+ ncols = 1;
for (i = 0; i < s->ncontrols; i++) {
union control *ctrl = s->ctrls[i];
char const *s;
+ colstart = COLUMN_START(ctrl->generic.column);
switch (ctrl->generic.type) {
case CTRL_TEXT: s = "text"; break;
case CTRL_EDITBOX: s = "editbox"; break;
}
fprintf(stderr, " control: %s\n", s);
switch (ctrl->generic.type) {
+ case CTRL_COLUMNS:
+ if (ctrl->columns.ncols != 1) {
+ ncols = ctrl->columns.ncols;
+ fprintf(stderr, " split to %d\n", ncols);
+ assert(ncols <= MAXCOLS);
+ for (j = 0; j < ncols; j++) {
+ cols[j] = cols[0];
+ if (j > 0)
+ cols[j].pos.h = cols[j-1].pos.h + cols[j-1].width + 6;
+ if (j == ncols - 1)
+ cols[j].width = curstate->width -
+ (cols[j].pos.h - curstate->pos.h);
+ else
+ cols[j].width = (curstate->width + 6) *
+ ctrl->columns.percentages[j] / 100 - 6;
+ }
+ } else {
+ fprintf(stderr, " join\n");
+ for (j = 0; j < ncols; j++)
+ if (cols[j].pos.v > cols[0].pos.v)
+ cols[0].pos.v = cols[j].pos.v;
+ cols[0].width = curstate->width;
+ ncols = 1;
+ }
+ break;
case CTRL_TEXT:
- macctrl_text(mcs, window, curstate, ctrl);
+ macctrl_text(mcs, window, &cols[colstart], ctrl);
break;
case CTRL_EDITBOX:
- macctrl_editbox(mcs, window, curstate, ctrl);
+ macctrl_editbox(mcs, window, &cols[colstart], ctrl);
break;
case CTRL_RADIO:
- macctrl_radio(mcs, window, curstate, ctrl);
+ macctrl_radio(mcs, window, &cols[colstart], ctrl);
break;
case CTRL_CHECKBOX:
- macctrl_checkbox(mcs, window, curstate, ctrl);
+ macctrl_checkbox(mcs, window, &cols[colstart], ctrl);
break;
case CTRL_BUTTON:
- macctrl_button(mcs, window, curstate, ctrl);
+ macctrl_button(mcs, window, &cols[colstart], ctrl);
break;
case CTRL_LISTBOX:
if (ctrl->listbox.height == 0)
- macctrl_popup(mcs, window, curstate, ctrl);
+ macctrl_popup(mcs, window, &cols[colstart], ctrl);
break;
}
}
+ for (j = 0; j < ncols; j++)
+ if (cols[j].pos.v > curstate->pos.v)
+ curstate->pos.v = cols[j].pos.v;
}
static void macctrl_switchtopanel(struct macctrls *mcs, unsigned int which)
break;
case MACCTRL_EDITBOX:
hideshow(mc->editbox.tbctrl);
- hideshow(mc->editbox.tblabel);
+ 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]);
- hideshow(mc->radio.tblabel);
+ if (mc->radio.tblabel != NULL)
+ hideshow(mc->radio.tblabel);
break;
case MACCTRL_CHECKBOX:
hideshow(mc->checkbox.tbctrl);
Rect bounds;
SInt16 height;
+ assert(ctrl->text.label != NULL);
fprintf(stderr, " label = %s\n", ctrl->text.label);
mc->generic.type = MACCTRL_TEXT;
mc->generic.ctrl = ctrl;
union macctrl *mc = snew(union macctrl);
Rect lbounds, bounds;
- fprintf(stderr, " label = %s\n", ctrl->editbox.label);
+ if (ctrl->editbox.label != NULL)
+ 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");
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;
+ if (ctrl->editbox.label != NULL) {
+ lbounds.right = lbounds.left + curstate->width;
+ lbounds.bottom = lbounds.top + 16;
+ curstate->pos.v += 18;
+ }
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;
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);
+ if (ctrl->editbox.label == NULL)
+ mc->editbox.tblabel = NULL;
+ else {
+ 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, 3, 3);
mc->editbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
ctrl->editbox.password ?
kControlEditTextPasswordProc :
}
#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);
+ if (ctrl->editbox.label == NULL)
+ mc->editbox.tblabel = NULL;
+ 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);
}
Str255 title;
unsigned int i, colwidth;
- fprintf(stderr, " label = %s\n", ctrl->radio.label);
+ if (ctrl->radio.label != NULL)
+ fprintf(stderr, " label = %s\n", ctrl->radio.label);
mc->generic.type = MACCTRL_RADIO;
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
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
+ if (ctrl->radio.label == NULL)
+ mc->radio.tblabel = NULL;
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);
- }
+ 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;
+ 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;
Rect bounds;
Str255 title;
+ assert(ctrl->checkbox.label != NULL);
fprintf(stderr, " label = %s\n", ctrl->checkbox.label);
mc->generic.type = MACCTRL_CHECKBOX;
mc->generic.ctrl = ctrl;
Rect bounds;
Str255 title;
+ assert(ctrl->button.label != NULL);
fprintf(stderr, " label = %s\n", ctrl->button.label);
if (ctrl->button.isdefault)
fprintf(stderr, " is default\n");
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
bounds.left = curstate->pos.h;
- bounds.right = bounds.left + 100; /* XXX measure string */
+ bounds.right = bounds.left + curstate->width;
bounds.top = curstate->pos.v;
bounds.bottom = bounds.top + 20;
c2pstrcpy(title, ctrl->button.label);
assert(!ctrl->listbox.draglist);
assert(!ctrl->listbox.multisel);
- fprintf(stderr, " label = %s\n", ctrl->listbox.label);
+ if (ctrl->listbox.label != NULL)
+ 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);
+ c2pstrcpy(title, ctrl->button.label == NULL ? "" : ctrl->button.label);
/* Find a spare menu ID and create the menu */
while (GetMenuHandle(nextmenuid) != NULL)
break;
case MACCTRL_EDITBOX:
HiliteControl(mc->editbox.tbctrl, state);
- HiliteControl(mc->editbox.tblabel, state);
+ if (mc->editbox.tblabel != NULL)
+ 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);
+ if (mc->radio.tblabel != NULL)
+ HiliteControl(mc->radio.tblabel, state);
break;
case MACCTRL_CHECKBOX:
HiliteControl(mc->checkbox.tbctrl, state);
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);
+ if (mac_gestalts.apprvers >= 0x100) {
+ if (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);
+ }
+ }
+#if !TARGET_API_MAC_CARBON
+ else {
+ TEHandle te;
+
+ if (mcs->focus != NULL) {
+ mc = mcs->focus;
+ switch (mc->generic.type) {
+ case MACCTRL_EDITBOX:
+ te = (TEHandle)(*mc->editbox.tbctrl)->contrlData;
+ TEKey(event->message & charCodeMask, te);
+ ctrlevent(mcs, mc, EVENT_VALCHANGE);
+ break;
+ }
+ }
}
+#endif
}
void macctrl_update(WindowPtr window)
void dlg_end(void *dlg, int value)
{
+ struct macctrls *mcs = dlg;
+ if (mcs->end != NULL)
+ (*mcs->end)(mcs->window, value);
};
void dlg_refresh(union control *ctrl, void *dlg)