nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 12:03:03 -05:00
Code Issues Projects Releases Wiki Activity

Support the drop-down menu part of the editbox control (combobox). This

Browse Source 
cuts and pastes a lot of code from macctrl_popup, which perhaps should be
consolidated.  Also change the effective line codepage when it is changed
with Change Settings.

[originally from svn r5363]
This commit is contained in:
Owen Dunn 2005-02-20 12:54:10 +00:00
parent 97154e55da
commit 8f5075e182
2 changed files with 140 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
mac/macctrls.c
View File

@ -82,6 +82,11 @@ union macctrl {
struct macctrl_generic generic; struct macctrl_generic generic;
ControlRef tbctrl; ControlRef tbctrl;
ControlRef tblabel; ControlRef tblabel;
ControlRef tbbutton;
MenuRef menu;
int menuid;
unsigned int nids;
int *ids;
} editbox; } editbox;
struct { struct {
struct macctrl_generic generic; struct macctrl_generic generic;
@ -436,6 +441,8 @@ static void macctrl_hideshowpanel(struct macctrls *mcs, unsigned int panel,
hideshow(mc->editbox.tbctrl); hideshow(mc->editbox.tbctrl);
if (mc->editbox.tblabel != NULL) if (mc->editbox.tblabel != NULL)
hideshow(mc->editbox.tblabel); hideshow(mc->editbox.tblabel);
if (mc->editbox.tbbutton != NULL)
hideshow(mc->editbox.tbbutton);
break; break;
case MACCTRL_RADIO: case MACCTRL_RADIO:
for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++) for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++)
@ -571,7 +578,10 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
union control *ctrl) union control *ctrl)
{ {
union macctrl *mc = snew(union macctrl); 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.type = MACCTRL_EDITBOX;
mc->generic.ctrl = ctrl; mc->generic.ctrl = ctrl;
@ -595,6 +605,13 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
} }
bounds.top = curstate->pos.v; bounds.top = curstate->pos.v;
bounds.bottom = bounds.top + 22; 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 (mac_gestalts.apprvers >= 0x100) {
if (ctrl->editbox.label == NULL) if (ctrl->editbox.label == NULL)
mc->editbox.tblabel = NULL; mc->editbox.tblabel = NULL;
@ -627,6 +644,27 @@ static void macctrl_editbox(struct macctrls *mcs, WindowPtr window,
SYS7_EDITBOX_PROC, (long)mc); SYS7_EDITBOX_PROC, (long)mc);
} }
#endif #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; curstate->pos.v += 28;
add234(mcs->byctrl, mc); add234(mcs->byctrl, mc);
mc->generic.next = mcs->panels[curstate->panelnum]; mc->generic.next = mcs->panels[curstate->panelnum];
@ -1197,6 +1235,8 @@ void macctrl_activate(WindowPtr window, EventRecord *event)
HiliteControl(mc->editbox.tbctrl, state); HiliteControl(mc->editbox.tbctrl, state);
if (mc->editbox.tblabel != NULL) if (mc->editbox.tblabel != NULL)
HiliteControl(mc->editbox.tblabel, state); HiliteControl(mc->editbox.tblabel, state);
if (mc->editbox.tbbutton != NULL)
HiliteControl(mc->editbox.tbbutton, state);
break; break;
case MACCTRL_RADIO: case MACCTRL_RADIO:
for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++) for (j = 0; j < mc->generic.ctrl->radio.nbuttons; j++)
@ -1282,6 +1322,12 @@ void macctrl_click(WindowPtr window, EventRecord *event)
TEClick(mouse, !!(event->modifiers & shiftKey), te); TEClick(mouse, !!(event->modifiers & shiftKey), te);
goto done; 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 && if (mc->generic.type == MACCTRL_LISTBOX &&
(control == mc->listbox.tbctrl || (control == mc->listbox.tbctrl ||
control == (*mc->listbox.list)->vScroll)) { control == (*mc->listbox.list)->vScroll)) {
@ -1320,6 +1366,13 @@ void macctrl_click(WindowPtr window, EventRecord *event)
if (trackresult != 0) if (trackresult != 0)
ctrlevent(mcs, mc, EVENT_ACTION); ctrlevent(mcs, mc, EVENT_ACTION);
break; 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: case MACCTRL_LISTBOX:
/* FIXME spot double-click */ /* FIXME spot double-click */
ctrlevent(mcs, mc, EVENT_SELCHANGE); ctrlevent(mcs, mc, EVENT_SELCHANGE);
@ -1729,6 +1782,23 @@ static void dlg_macpopup_clear(union control *ctrl, void *dlg)
SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); 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) static void dlg_maclist_clear(union control *ctrl, void *dlg)
{ {
struct macctrls *mcs = dlg; struct macctrls *mcs = dlg;
@ -1752,6 +1822,8 @@ void dlg_listbox_clear(union control *ctrl, void *dlg)
else else
dlg_maclist_clear(ctrl, dlg); dlg_maclist_clear(ctrl, dlg);
break; break;
case CTRL_EDITBOX:
dlg_macedit_clear(ctrl, dlg);
} }
} }
@ -1769,6 +1841,20 @@ static void dlg_macpopup_del(union control *ctrl, void *dlg, int index)
SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); 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) static void dlg_maclist_del(union control *ctrl, void *dlg, int index)
{ {
struct macctrls *mcs = dlg; struct macctrls *mcs = dlg;
@ -1792,6 +1878,8 @@ void dlg_listbox_del(union control *ctrl, void *dlg, int index)
else else
dlg_maclist_del(ctrl, dlg, index); dlg_maclist_del(ctrl, dlg, index);
break; break;
case CTRL_EDITBOX:
dlg_macedit_del(ctrl, dlg, index);
} }
} }
@ -1810,6 +1898,20 @@ static void dlg_macpopup_add(union control *ctrl, void *dlg, char const *text)
SetControlMaximum(mc->popup.tbctrl, CountMenuItems(menu)); 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) static void dlg_maclist_add(union control *ctrl, void *dlg, char const *text)
{ {
@ -1840,6 +1942,9 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
else else
dlg_maclist_add(ctrl, dlg, text); dlg_maclist_add(ctrl, dlg, text);
break; break;
case CTRL_EDITBOX:
dlg_macedit_add(ctrl, dlg, text);
break;
} }
} }
@ -1861,6 +1966,24 @@ static void dlg_macpopup_addwithid(union control *ctrl, void *dlg,
mc->popup.ids[index] = id; 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, static void dlg_maclist_addwithid(union control *ctrl, void *dlg,
char const *text, int id) char const *text, int id)
{ {
@ -1895,6 +2018,9 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg,
else else
dlg_maclist_addwithid(ctrl, dlg, text, id); dlg_maclist_addwithid(ctrl, dlg, text, id);
break; break;
case CTRL_EDITBOX:
dlg_macedit_addwithid(ctrl, dlg, text, id);
break;
} }
} }
@ -1913,6 +2039,9 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
assert(mc->listbox.ids != NULL && mc->listbox.nids > index); assert(mc->listbox.ids != NULL && mc->listbox.nids > index);
return mc->listbox.ids[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; return -1;
} }
@ -1934,6 +2063,8 @@ int dlg_listbox_index(union control *ctrl, void *dlg)
else else
return -1; return -1;
} }
case CTRL_EDITBOX:
return GetControlValue(mc->editbox.tbbutton) - 1;
} }
return -1; return -1;
} }
@ -1953,6 +2084,8 @@ int dlg_listbox_issel(union control *ctrl, void *dlg, int index)
cell.v = index; cell.v = index;
return LGetSelect(FALSE, &cell, mc->listbox.list); return LGetSelect(FALSE, &cell, mc->listbox.list);
} }
case CTRL_EDITBOX:
return GetControlValue(mc->editbox.tbbutton) - 1 == index;
} }
return FALSE; return FALSE;
} }
@ -1968,6 +2101,8 @@ void dlg_listbox_select(union control *ctrl, void *dlg, int index)
if (ctrl->listbox.height == 0) if (ctrl->listbox.height == 0)
SetControlValue(mc->popup.tbctrl, index + 1); SetControlValue(mc->popup.tbctrl, index + 1);
break; break;
case CTRL_EDITBOX:
SetControlValue(mc->editbox.tbbutton, index + 1);
} }
} }

3
mac/macdlg.c
View File

@ -170,6 +170,9 @@ static void mac_enddlg_reconfig(WindowPtr window, int value)
/* Change the palette */ /* Change the palette */
palette_reset(s); palette_reset(s);
/* Reinitialise line codepage */
init_ucs(s);
/* Pass new config data to the terminal */ /* Pass new config data to the terminal */
term_reconfig(s->term, &s->cfg); term_reconfig(s->term, &s->cfg);