-/* $Id: macctrls.c,v 1.32 2003/04/13 13:52:44 ben Exp $ */
+/* $Id: macctrls.c,v 1.40 2003/05/10 11:26:33 ben Exp $ */
/*
* Copyright (c) 2003 Ben Harris
* All rights reserved.
#include <MacTypes.h>
#include <Appearance.h>
+#include <ColorPicker.h>
#include <Controls.h>
#include <ControlDefinitions.h>
#include <Events.h>
return 0;
}
+static union control panellist;
+
+static void panellist_handler(union control *ctrl, void *dlg, void *data,
+ int event)
+{
+ struct macctrls *mcs = dlg;
+
+ /* XXX what if there's no selection? */
+ if (event == EVENT_SELCHANGE)
+ macctrl_switchtopanel(mcs, dlg_listbox_index(ctrl, dlg) + 1);
+}
+
void macctrl_layoutbox(struct controlbox *cb, WindowPtr window,
struct macctrls *mcs)
{
Rect rect;
macctrl_init();
+ if (mac_gestalts.apprvers >= 0x100)
+ CreateRootControl(window, &root);
#if TARGET_API_MAC_CARBON
GetPortBounds(GetWindowPort(window), &rect);
#else
rect = window->portRect;
#endif
- curstate.pos.h = rect.left + 13;
- curstate.pos.v = rect.bottom - 33;
- 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);
mcs->focus = NULL;
mcs->panels = snewn(mcs->npanels, union macctrl *);
memset(mcs->panels, 0, sizeof(*mcs->panels) * mcs->npanels);
curstate.panelnum = 0;
+
+ curstate.pos.h = rect.left + 13;
+ curstate.pos.v = rect.top + 13;
+ curstate.width = 160;
+ panellist.listbox.type = CTRL_LISTBOX;
+ panellist.listbox.handler = &panellist_handler;
+ 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;
+ curstate.width = rect.right - (rect.left + 13 + 160) - (13 * 2);
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);
+ dlg_listbox_add(&panellist, mcs, cb->ctrlsets[i]->pathname);
}
macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs);
}
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->boxname && *s->boxname)
- fprintf(stderr, "boxname = %s\n", s->boxname);
- 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;
- case CTRL_RADIO: s = "radio"; break;
- case CTRL_CHECKBOX: s = "checkbox"; break;
- case CTRL_BUTTON: s = "button"; break;
- case CTRL_LISTBOX: s = "listbox"; break;
- case CTRL_COLUMNS: s = "columns"; break;
- case CTRL_FILESELECT: s = "fileselect"; break;
- case CTRL_FONTSELECT: s = "fontselect"; break;
- case CTRL_TABDELAY: s = "tabdelay"; break;
- default: s = "unknown"; 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];
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;
SInt16 height;
assert(ctrl->text.label != NULL);
- fprintf(stderr, " label = %s\n", ctrl->text.label);
mc->generic.type = MACCTRL_TEXT;
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
height = TEGetHeight(1, (*te)->nLines, te);
}
#endif
- fprintf(stderr, " height = %d\n", height);
SizeControl(mc->text.tbctrl, curstate->width, height);
curstate->pos.v += height + 6;
add234(mcs->byctrl, mc);
union macctrl *mc = snew(union macctrl);
Rect lbounds, bounds;
- 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");
mc->generic.type = MACCTRL_EDITBOX;
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
FrameRect(&rect);
InsetRect(&rect, 3, 3);
}
+ EraseRect(&rect);
(*(TEHandle)(*control)->contrlData)->viewRect = rect;
TEUpdate(&rect, (TEHandle)(*control)->contrlData);
}
Str255 title;
unsigned int i, colwidth;
- 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;
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;
bounds.bottom = bounds.top + 18;
bounds.left = curstate->pos.h + colwidth * (i % ctrl->radio.ncolumns);
Str255 title;
assert(ctrl->checkbox.label != NULL);
- fprintf(stderr, " label = %s\n", ctrl->checkbox.label);
mc->generic.type = MACCTRL_CHECKBOX;
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
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.type = MACCTRL_BUTTON;
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
Rect bounds;
Size olen;
- if (ctrl->listbox.label != NULL)
- fprintf(stderr, " label = %s\n", ctrl->listbox.label);
- fprintf(stderr, " height = %d\n", ctrl->listbox.height);
- if (ctrl->listbox.draglist)
- fprintf(stderr, " draglist\n");
- if (ctrl->listbox.multisel)
- fprintf(stderr, " multisel\n");
- fprintf(stderr, " ncols = %d\n", ctrl->listbox.ncols);
+ /* XXX Use label */
assert(ctrl->listbox.percentwidth == 100);
mc->generic.type = MACCTRL_LISTBOX;
mc->generic.ctrl = ctrl;
bounds.left = curstate->pos.h;
bounds.right = bounds.left + curstate->width;
bounds.top = curstate->pos.v;
- bounds.bottom = bounds.top + 20 * ctrl->listbox.height;
+ bounds.bottom = bounds.top + 16 * ctrl->listbox.height + 2;
if (mac_gestalts.apprvers >= 0x100) {
InsetRect(&bounds, 3, 3);
#endif
}
add234(mcs->byctrl, mc);
- curstate->pos.v += 6 + 20 * ctrl->listbox.height;
+ curstate->pos.v += 6 + 16 * ctrl->listbox.height + 2;
mc->generic.next = mcs->panels[curstate->panelnum];
mcs->panels[curstate->panelnum] = mc;
ctrlevent(mcs, mc, EVENT_REFRESH);
assert(!ctrl->listbox.draglist);
assert(!ctrl->listbox.multisel);
- 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;
else
#endif
mc = (union macctrl *)GetControlReference(control);
- fprintf(stderr, "control = %p, part = %d, mc = %p\n",
- control, part, mc);
if (mac_gestalts.apprvers >= 0x100) {
if (GetControlFeatures(control, &features) == noErr &&
(features & kControlSupportsFocus) &&
(control == mc->listbox.tbctrl ||
control == (*mc->listbox.list)->vScroll)) {
- fprintf(stderr, "list = %p\n", mc->listbox.list);
macctrl_setfocus(mcs, mc);
if (LClick(mouse, event->modifiers, mc->listbox.list))
/* double-click */
HandleControlKey(control, (event->message & keyCodeMask) >> 8,
event->message & charCodeMask, event->modifiers);
mc = (union macctrl *)GetControlReference(control);
- ctrlevent(mcs, mc, EVENT_VALCHANGE);
+ switch (mc->generic.type) {
+ case MACCTRL_LISTBOX:
+ ctrlevent(mcs, mc, EVENT_SELCHANGE);
+ break;
+ default:
+ ctrlevent(mcs, mc, EVENT_VALCHANGE);
+ break;
+ }
}
}
#if !TARGET_API_MAC_CARBON
}
#endif
buffer[olen] = '\0';
- fprintf(stderr, "dlg_editbox_get: %s\n", buffer);
}
unsigned int i, n;
if (mc == NULL) return;
- fprintf(stderr, " popup_clear\n");
n = CountMenuItems(menu);
for (i = 0; i < n; i++)
DeleteMenuItem(menu, n - i);
union macctrl *mc = findbyctrl(mcs, ctrl);
if (mc == NULL) return;
- fprintf(stderr, " maclist_clear\n");
LDelRow(0, 0, mc->listbox.list);
mc->listbox.nids = 0;
sfree(mc->listbox.ids);
MenuRef menu = mc->popup.menu;
if (mc == NULL) return;
- 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,
union macctrl *mc = findbyctrl(mcs, ctrl);
if (mc == NULL) return;
- fprintf(stderr, " maclist_del %d\n", index);
LDelRow(1, index, mc->listbox.list);
if (mc->listbox.ids != NULL)
memcpy(mc->listbox.ids + index, mc->listbox.ids + index + 1,
Str255 itemstring;
if (mc == NULL) return;
- fprintf(stderr, " popup_add %s\n", text);
assert(text[0] != '\0');
c2pstrcpy(itemstring, text);
AppendMenu(menu, "\pdummy");
Cell cell = { 0, 0 };
if (mc == NULL) return;
- fprintf(stderr, " maclist_add %s\n", text);
#if TARGET_API_MAC_CARBON
GetListDataBounds(mc->listbox.list, &bounds);
#else
unsigned int index;
if (mc == NULL) return;
- fprintf(stderr, " popup_addwthid %s, %d\n", text, id);
dlg_macpopup_add(ctrl, dlg, text);
index = CountMenuItems(menu) - 1;
if (mc->popup.nids <= index) {
int index;
if (mc == NULL) return;
- fprintf(stderr, " maclist_addwithid %s %d\n", text, id);
dlg_maclist_add(ctrl, dlg, text);
#if TARGET_API_MAC_CARBON
GetListDataBounds(mc->listbox.list, &bounds);
void dlg_coloursel_start(union control *ctrl, void *dlg,
int r, int g, int b)
{
+ struct macctrls *mcs = dlg;
+ union macctrl *mc = findbyctrl(mcs, ctrl);
+ Point where = {-1, -1}; /* Screen with greatest colour depth */
+ RGBColor incolour;
+ if (HAVE_COLOR_QD()) {
+ incolour.red = r * 0x0101;
+ incolour.green = g * 0x0101;
+ incolour.blue = b * 0x0101;
+ mcs->gotcolour = GetColor(where, "\pModify Colour:", &incolour,
+ &mcs->thecolour);
+ ctrlevent(mcs, mc, EVENT_CALLBACK);
+ } else
+ dlg_beep(dlg);
}
int dlg_coloursel_results(union control *ctrl, void *dlg,
int *r, int *g, int *b)
{
+ struct macctrls *mcs = dlg;
- return 0;
+ if (mcs->gotcolour) {
+ *r = mcs->thecolour.red >> 8;
+ *g = mcs->thecolour.green >> 8;
+ *b = mcs->thecolour.blue >> 8;
+ return 1;
+ } else
+ return 0;
}
/*
projects / u / mdw / putty / blobdiff