-/* $Id: macctrls.c,v 1.14 2003/03/25 23:23:03 ben Exp $ */
+/* $Id: macctrls.c,v 1.21 2003/03/29 23:07:55 ben Exp $ */
/*
* Copyright (c) 2003 Ben Harris
* All rights reserved.
#include <ControlDefinitions.h>
#include <Menus.h>
#include <Resources.h>
+#include <Script.h>
#include <Sound.h>
+#include <TextEdit.h>
#include <TextUtils.h>
+#include <ToolUtils.h>
#include <Windows.h>
#include <assert.h>
struct {
struct macctrl_generic generic;
ControlRef tbctrl;
+ ControlRef tblabel;
} editbox;
struct {
struct macctrl_generic generic;
ControlRef *tbctrls;
+ ControlRef tblabel;
} radio;
struct {
struct macctrl_generic generic;
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,
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
PatchCDEF cdef;
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;
CreateRootControl(window, &root);
mcs->window = window;
mcs->byctrl = newtree234(macctrl_cmp_byctrl);
+ 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);
+ mcs->panels = snewn(mcs->npanels, union macctrl *);
memset(mcs->panels, 0, sizeof(*mcs->panels) * mcs->npanels);
curstate.panelnum = 0;
for (i = 0; i < cb->nctrlsets; i++) {
}
macctrl_layoutset(&curstate, cb->ctrlsets[i], window, mcs);
}
- macctrl_switchtopanel(mcs, 1);
+ macctrl_switchtopanel(mcs, 2);
+ /* 14 = proxies, 20 = SSH bugs */
}
static void macctrl_layoutset(struct mac_layoutstate *curstate,
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[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);
+ 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);
break;
case MACCTRL_CHECKBOX:
hideshow(mc->checkbox.tbctrl);
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)
{
- union macctrl *mc = smalloc(sizeof *mc);
+ union macctrl *mc = snew(union macctrl);
Rect bounds;
+ SInt16 height;
fprintf(stderr, " label = %s\n", ctrl->text.label);
mc->generic.type = MACCTRL_TEXT;
bounds.top = curstate->pos.v;
bounds.bottom = bounds.top + 16;
if (mac_gestalts.apprvers >= 0x100) {
- SInt16 height;
Size olen;
mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
GetControlData(mc->text.tbctrl, kControlEntireControl,
kControlStaticTextTextHeightTag,
sizeof(height), &height, &olen);
- fprintf(stderr, " height = %d\n", height);
- SizeControl(mc->text.tbctrl, curstate->width, height);
- curstate->pos.v += height + 6;
- } else {
- Str255 title;
+ }
+#if !TARGET_API_MAC_CARBON
+ else {
+ TEHandle te;
- c2pstrcpy(title, ctrl->text.label);
- mc->text.tbctrl = NewControl(window, &bounds, title, TRUE, 0, 0, 0,
+ mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
SYS7_TEXT_PROC, (long)mc);
+ te = (TEHandle)(*mc->text.tbctrl)->contrlData;
+ TESetText(ctrl->text.label, strlen(ctrl->text.label), te);
+ 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);
+ mc->generic.next = mcs->panels[curstate->panelnum];
+ mcs->panels[curstate->panelnum] = mc;
+}
+
+static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
+ struct mac_layoutstate *curstate,
+ union control *ctrl)
+{
+ union macctrl *mc = snew(union macctrl);
+ Rect lbounds, 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;
+ 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;
+ 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;
+ lbounds.bottom = lbounds.top + 22;
+ bounds.left = lbounds.right;
+ bounds.right = lbounds.left + curstate->width;
+ }
+ 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);
+ mc->editbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
+ ctrl->editbox.password ?
+ kControlEditTextPasswordProc :
+ kControlEditTextProc, (long)mc);
}
+#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);
+ mc->editbox.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
+ SYS7_EDITBOX_PROC, (long)mc);
+ }
+#endif
+ 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_text_cdef(SInt16 variant, ControlRef control,
- ControlDefProcMessage msg, SInt32 param)
+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;
+ if (variant == SYS7_EDITBOX_VARIANT)
+ 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)
- TETextBox((*control)->contrlTitle + 1, (*control)->contrlTitle[0],
- &(*control)->contrlRect, teFlushDefault);
+ if ((*control)->contrlVis) {
+ rect = (*control)->contrlRect;
+ if (variant == SYS7_EDITBOX_VARIANT) {
+ PenNormal();
+ FrameRect(&rect);
+ InsetRect(&rect, 3, 3);
+ }
+ (*(TEHandle)(*control)->contrlData)->viewRect = rect;
+ TEUpdate(&rect, (TEHandle)(*control)->contrlData);
+ }
return 0;
+ case testCntl:
+ if (variant == SYS7_TEXT_VARIANT)
+ return kControlNoPart;
+ mouse.h = LoWord(param);
+ mouse.v = HiWord(param);
+ rect = (*control)->contrlRect;
+ InsetRect(&rect, 3, 3);
+ return PtInRect(mouse, &rect) ? kControlEditTextPart : kControlNoPart;
case calcCRgns:
if (param & (1 << 31)) {
param &= ~(1 << 31);
}
#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 + 2;
- bounds.bottom = bounds.top + 18;
- if (mac_gestalts.apprvers >= 0x100) {
- mc->text.tbctrl = NewControl(window, &bounds, NULL, TRUE, 0, 0, 0,
- ctrl->editbox.password ?
- kControlEditTextPasswordProc :
- kControlEditTextProc, (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);
- } else {
- /* Do a System 7 version */
- }
-}
-
static void macctrl_radio(struct macctrls *mcs, WindowPtr window,
struct mac_layoutstate *curstate,
union control *ctrl)
{
- union macctrl *mc = smalloc(sizeof *mc);
+ union macctrl *mc = snew(union macctrl);
Rect bounds;
Str255 title;
unsigned int i, colwidth;
mc->generic.type = MACCTRL_RADIO;
mc->generic.ctrl = ctrl;
mc->generic.privdata = NULL;
- mc->radio.tbctrls =
- smalloc(sizeof(*mc->radio.tbctrls) * ctrl->radio.nbuttons);
+ mc->radio.tbctrls = snewn(ctrl->radio.nbuttons, ControlRef);
colwidth = (curstate->width + 13) / ctrl->radio.ncolumns;
+ bounds.top = curstate->pos.v;
+ 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
+ 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;
for (i = 0; i < ctrl->radio.nbuttons; i++) {
fprintf(stderr, " button = %s\n", ctrl->radio.buttons[i]);
bounds.top = curstate->pos.v - 2;
struct mac_layoutstate *curstate,
union control *ctrl)
{
- union macctrl *mc = smalloc(sizeof *mc);
+ union macctrl *mc = snew(union macctrl);
Rect bounds;
Str255 title;
struct mac_layoutstate *curstate,
union control *ctrl)
{
- union macctrl *mc = smalloc(sizeof *mc);
+ union macctrl *mc = snew(union macctrl);
Rect bounds;
Str255 title;
struct mac_layoutstate *curstate,
union control *ctrl)
{
- union macctrl *mc = smalloc(sizeof *mc);
+ union macctrl *mc = snew(union macctrl);
Rect bounds;
Str255 title;
unsigned int labelwidth;
TRUE);
state = active ? kControlNoPart : kControlInactivePart;
for (i = 0; i <= mcs->curpanel; i += mcs->curpanel)
- for (mc = mcs->panels[i]; mc != NULL; mc = mc->generic.next)
+ 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);
+ 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);
break;
case MACCTRL_CHECKBOX:
HiliteControl(mc->checkbox.tbctrl, state);
HiliteControl(mc->popup.tbctrl, state);
break;
}
+#if !TARGET_API_MAC_CARBON
+ if (mcs->focus == mc) {
+ if (active)
+ macctrl_enfocus(mc);
+ else
+ macctrl_defocus(mc);
+ }
+#endif
+ }
SetPort(saveport);
}
GlobalToLocal(&mouse);
part = FindControl(mouse, window, &control);
if (control != NULL) {
+ mc = (union macctrl *)GetControlReference(control);
if (mac_gestalts.apprvers >= 0x100) {
if (GetControlFeatures(control, &features) == noErr &&
(features & kControlSupportsFocus) &&
SetKeyboardFocus(window, control, part);
trackresult = HandleControlClick(control, mouse, event->modifiers,
(ControlActionUPP)-1);
- } else
+ } 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);
- mc = (union macctrl *)GetControlReference(control);
+ }
switch (mc->generic.type) {
case MACCTRL_RADIO:
if (trackresult != 0) {
break;
}
}
+ done:
SetPort(saveport);
}
assert(mc != NULL);
assert(mc->generic.type == MACCTRL_EDITBOX);
- if (mac_gestalts.apprvers >= 0x100) {
+ 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);
- GetPort(&saveport);
- SetPort((GrafPtr)(GetWindowPort(mcs->window)));
- DrawOneControl(mc->editbox.tbctrl);
- SetPort(saveport);
- }
-};
+#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)
{
length - 1, buffer, &olen) != noErr)
olen = 0;
if (olen > length - 1)
- buffer[length - 1] = '\0';
- else
- buffer[olen] = '\0';
- buffer[olen] = '\0';
- } else
- buffer[0] = '\0';
+ 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);
-};
+}
/*
dlg_macpopup_add(ctrl, dlg, text);
}
-static void dlg_macpopup_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);
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 = sresize(mc->popup.ids, mc->popup.nids, int);
}
mc->popup.ids[index] = id;
}
-void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
- char const *text, int id)
+void dlg_listbox_addwithid(union control *ctrl, void *dlg,
+ char const *text, int id)
{
if (ctrl->listbox.height == 0)
- dlg_macpopup_addwithindex(ctrl, dlg, text, id);
+ 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);
- Str255 title;
assert(mc != NULL);
if (mac_gestalts.apprvers >= 0x100)
SetControlData(mc->text.tbctrl, kControlEntireControl,
kControlStaticTextTextTag, strlen(text), text);
- else {
- c2pstrcpy(title, text);
- SetControlTitle(mc->text.tbctrl, title);
- }
+#if !TARGET_API_MAC_CARBON
+ else
+ TESetText(text, strlen(text),
+ (TEHandle)(*mc->text.tbctrl)->contrlData);
+#endif
}
projects / u / mdw / putty / blobdiff