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

Miscellaneous cleanups and reorgs in preparation for building

Browse Source 
PuTTYgen. In particular, moved self-managing controls stuff out of
windlg.c into the new and reusable winctrls.c.

[originally from svn r714]
This commit is contained in:
Simon Tatham 2000-10-18 15:36:32 +00:00
parent f543b08ca5
commit 8e7a270f7f
11 changed files with 718 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -51,7 +51,7 @@ OBJ=obj
RES=res RES=res
##-- objects putty puttytel ##-- objects putty puttytel
GOBJS1 = window.$(OBJ) windlg.$(OBJ) terminal.$(OBJ) GOBJS1 = window.$(OBJ) windlg.$(OBJ) winctrls.$(OBJ) terminal.$(OBJ)
GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ) GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
##-- objects putty puttytel plink ##-- objects putty puttytel plink
LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ) LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ)
@ -177,12 +177,13 @@ plink.rsp: makefile
echo $(SOCK2) >> plink.rsp echo $(SOCK2) >> plink.rsp
##-- dependencies ##-- dependencies
window.$(OBJ): window.c putty.h win_res.h storage.h window.$(OBJ): window.c putty.h win_res.h storage.h winstuff.h
windlg.$(OBJ): windlg.c putty.h ssh.h win_res.h windlg.$(OBJ): windlg.c putty.h ssh.h win_res.h winstuff.h
winctrls.$(OBJ): winctrls.c winstuff.h winstuff.h
settings.$(OBJ): settings.c putty.h storage.h settings.$(OBJ): settings.c putty.h storage.h
winstore.$(OBJ): winstore.c putty.h storage.h winstore.$(OBJ): winstore.c putty.h storage.h
terminal.$(OBJ): terminal.c putty.h terminal.$(OBJ): terminal.c putty.h
sizetip.$(OBJ): sizetip.c putty.h sizetip.$(OBJ): sizetip.c putty.h winstuff.h
telnet.$(OBJ): telnet.c putty.h telnet.$(OBJ): telnet.c putty.h
raw.$(OBJ): raw.c putty.h raw.$(OBJ): raw.c putty.h
xlat.$(OBJ): xlat.c putty.h xlat.$(OBJ): xlat.c putty.h
@ -201,12 +202,12 @@ sshdh.$(OBJ): sshdh.c ssh.h
sshdss.$(OBJ): sshdss.c ssh.h sshdss.$(OBJ): sshdss.c ssh.h
sshbn.$(OBJ): sshbn.c ssh.h sshbn.$(OBJ): sshbn.c ssh.h
sshpubk.$(OBJ): sshpubk.c ssh.h sshpubk.$(OBJ): sshpubk.c ssh.h
scp.$(OBJ): scp.c putty.h scp.$(OBJ): scp.c putty.h winstuff.h
version.$(OBJ): version.c version.$(OBJ): version.c
be_all.$(OBJ): be_all.c be_all.$(OBJ): be_all.c
be_nossh.$(OBJ): be_nossh.c be_nossh.$(OBJ): be_nossh.c
be_none.$(OBJ): be_none.c be_none.$(OBJ): be_none.c
plink.$(OBJ): plink.c putty.h plink.$(OBJ): plink.c putty.h winstuff.h
pageant.$(OBJ): pageant.c ssh.h tree234.h pageant.$(OBJ): pageant.c ssh.h tree234.h
tree234.$(OBJ): tree234.c tree234.h tree234.$(OBJ): tree234.c tree234.h
##-- ##--

1
plink.c
View File

@ -11,6 +11,7 @@
#define PUTTY_DO_GLOBALS /* actually _define_ globals */ #define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h" #include "putty.h"
#include "winstuff.h"
#include "storage.h" #include "storage.h"
void fatalbox (char *p, ...) { void fatalbox (char *p, ...) {

4
putty.h
View File

@ -18,8 +18,6 @@
#define GLOBAL extern #define GLOBAL extern
#endif #endif
GLOBAL HINSTANCE putty_inst;
#define ATTR_ACTCURS 0x80000000UL /* active cursor (block) */ #define ATTR_ACTCURS 0x80000000UL /* active cursor (block) */
#define ATTR_PASCURS 0x40000000UL /* passive cursor (box) */ #define ATTR_PASCURS 0x40000000UL /* passive cursor (box) */
#define ATTR_INVALID 0x20000000UL #define ATTR_INVALID 0x20000000UL
@ -269,7 +267,7 @@ void random_destroy_seed(void);
/* /*
* Exports from windlg.c. * Exports from windlg.c.
*/ */
int defuse_showwindow(void); void defuse_showwindow(void);
int do_config (void); int do_config (void);
int do_reconfig (HWND); int do_reconfig (HWND);
void do_defaults (char *, Config *); void do_defaults (char *, Config *);

1
scp.c
View File

@ -26,6 +26,7 @@
#define PUTTY_DO_GLOBALS #define PUTTY_DO_GLOBALS
#include "putty.h" #include "putty.h"
#include "winstuff.h"
#include "storage.h" #include "storage.h"
#define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \ #define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \

5
sizetip.c
View File

@ -12,6 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "putty.h" #include "putty.h"
#include "winstuff.h"
static ATOM tip_class = 0; static ATOM tip_class = 0;
@ -114,7 +115,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
wc.lpfnWndProc = SizeTipWndProc; wc.lpfnWndProc = SizeTipWndProc;
wc.cbClsExtra = 0; wc.cbClsExtra = 0;
wc.cbWndExtra = 0; wc.cbWndExtra = 0;
wc.hInstance = putty_inst; wc.hInstance = hinst;
wc.hIcon = NULL; wc.hIcon = NULL;
wc.hCursor = NULL; wc.hCursor = NULL;
wc.hbrBackground = NULL; wc.hbrBackground = NULL;
@ -171,7 +172,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
tip_wnd = CreateWindowEx(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, MAKEINTRESOURCE(tip_class), str, WS_POPUP, tip_wnd = CreateWindowEx(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, MAKEINTRESOURCE(tip_class), str, WS_POPUP,
ix, iy, sz.cx, sz.cy, ix, iy, sz.cx, sz.cy,
NULL, NULL, putty_inst, NULL); NULL, NULL, hinst, NULL);
ShowWindow(tip_wnd, SW_SHOWNOACTIVATE); ShowWindow(tip_wnd, SW_SHOWNOACTIVATE);

1
ssh.h
View File

@ -169,6 +169,7 @@ Bignum bignum_add_long(Bignum number, unsigned long addend);
Bignum bigmul(Bignum a, Bignum b); Bignum bigmul(Bignum a, Bignum b);
Bignum modinv(Bignum number, Bignum modulus); Bignum modinv(Bignum number, Bignum modulus);
Bignum bignum_rshift(Bignum number, int shift); Bignum bignum_rshift(Bignum number, int shift);
int bignum_cmp(Bignum a, Bignum b);
Bignum dh_create_e(void); Bignum dh_create_e(void);
Bignum dh_find_K(Bignum f); Bignum dh_find_K(Bignum f);

10
sshrsag.c
View File

@ -6,6 +6,7 @@
#define RSA_EXPONENT 37 /* we like this prime */ #define RSA_EXPONENT 37 /* we like this prime */
#if 0 /* bignum diagnostic function */
static void diagbn(char *prefix, Bignum md) { static void diagbn(char *prefix, Bignum md) {
int i, nibbles, morenibbles; int i, nibbles, morenibbles;
static const char hex[] = "0123456789ABCDEF"; static const char hex[] = "0123456789ABCDEF";
@ -20,6 +21,7 @@ static void diagbn(char *prefix, Bignum md) {
if (prefix) putchar('\n'); if (prefix) putchar('\n');
} }
#endif
int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits, int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
progfn_t pfn, void *pfnparam) { progfn_t pfn, void *pfnparam) {
@ -61,7 +63,6 @@ int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
* We don't generate e; we just use a standard one always. * We don't generate e; we just use a standard one always.
*/ */
key->exponent = bignum_from_short(RSA_EXPONENT); key->exponent = bignum_from_short(RSA_EXPONENT);
diagbn("e = ",key->exponent);
/* /*
* Generate p and q: primes with combined length `bits', not * Generate p and q: primes with combined length `bits', not
@ -98,17 +99,10 @@ int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
pfn(pfnparam, 3, 3); pfn(pfnparam, 3, 3);
freebn(pm1); freebn(pm1);
freebn(qm1); freebn(qm1);
diagbn("p = ", aux->p);
diagbn("q = ", aux->q);
diagbn("e = ", key->exponent);
diagbn("n = ", key->modulus);
diagbn("phi(n) = ", phi_n);
key->private_exponent = modinv(key->exponent, phi_n); key->private_exponent = modinv(key->exponent, phi_n);
pfn(pfnparam, 3, 4); pfn(pfnparam, 3, 4);
diagbn("d = ", key->private_exponent);
aux->iqmp = modinv(aux->q, aux->p); aux->iqmp = modinv(aux->q, aux->p);
pfn(pfnparam, 3, 5); pfn(pfnparam, 3, 5);
diagbn("iqmp = ", aux->iqmp);
/* /*
* Clean up temporary numbers. * Clean up temporary numbers.

635
winctrls.c Normal file
View File

@ -0,0 +1,635 @@
/*
* winctrls.c: routines to self-manage the controls in a dialog
* box.
*/
#include <windows.h>
#include "winstuff.h"
#define GAPBETWEEN 3
#define GAPWITHIN 1
#define GAPXBOX 7
#define GAPYBOX 4
#define DLGWIDTH 168
#define STATICHEIGHT 8
#define CHECKBOXHEIGHT 8
#define RADIOHEIGHT 8
#define EDITHEIGHT 12
#define COMBOHEIGHT 12
#define PUSHBTNHEIGHT 14
void ctlposinit(struct ctlpos *cp, HWND hwnd,
int leftborder, int rightborder, int topborder) {
RECT r, r2;
cp->hwnd = hwnd;
cp->font = SendMessage(hwnd, WM_GETFONT, 0, 0);
cp->ypos = topborder;
GetClientRect(hwnd, &r);
r2.left = r2.top = 0;
r2.right = 4;
r2.bottom = 8;
MapDialogRect(hwnd, &r2);
cp->dlu4inpix = r2.right;
cp->width = (r.right * 4) / (r2.right) - 2*GAPBETWEEN;
cp->xoff = leftborder;
cp->width -= leftborder + rightborder;
}
void doctl(struct ctlpos *cp, RECT r,
char *wclass, int wstyle, int exstyle,
char *wtext, int wid) {
HWND ctl;
/*
* Note nonstandard use of RECT. This is deliberate: by
* transforming the width and height directly we arrange to
* have all supposedly same-sized controls really same-sized.
*/
r.left += cp->xoff;
MapDialogRect(cp->hwnd, &r);
ctl = CreateWindowEx(exstyle, wclass, wtext, wstyle,
r.left, r.top, r.right, r.bottom,
cp->hwnd, (HMENU)wid, hinst, NULL);
SendMessage(ctl, WM_SETFONT, cp->font, MAKELPARAM(TRUE, 0));
}
/*
* A title bar across the top of a sub-dialog.
*/
void bartitle(struct ctlpos *cp, char *name, int id) {
RECT r;
r.left = GAPBETWEEN; r.right = cp->width;
r.top = cp->ypos; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, name, id);
}
/*
* Begin a grouping box, with or without a group title.
*/
void beginbox(struct ctlpos *cp, char *name, int idbox, int idtext) {
if (name)
cp->ypos += STATICHEIGHT/2;
cp->boxystart = cp->ypos;
if (name)
cp->ypos += STATICHEIGHT - (STATICHEIGHT/2);
cp->ypos += GAPYBOX;
cp->width -= 2*GAPXBOX;
cp->xoff += GAPXBOX;
cp->boxid = idbox;
cp->boxtextid = idtext;
cp->boxtext = name;
}
/*
* End a grouping box.
*/
void endbox(struct ctlpos *cp) {
RECT r;
cp->xoff -= GAPXBOX;
cp->width += 2*GAPXBOX;
cp->ypos += GAPYBOX - GAPBETWEEN;
r.left = GAPBETWEEN; r.right = cp->width;
r.top = cp->boxystart; r.bottom = cp->ypos - cp->boxystart;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDFRAME, 0,
"", cp->boxid);
if (cp->boxtext) {
SIZE s;
HDC hdc;
HFONT oldfont, dlgfont;
hdc = GetDC(cp->hwnd);
dlgfont = (HFONT)cp->font;
oldfont = SelectObject(hdc, dlgfont);
GetTextExtentPoint32(hdc, cp->boxtext, strlen(cp->boxtext), &s);
SelectObject(hdc, oldfont);
DeleteDC(hdc);
r.left = GAPXBOX + GAPBETWEEN;
r.right = (s.cx * 4 + cp->dlu4inpix-1) / cp->dlu4inpix;
r.top = cp->boxystart - STATICHEIGHT/2; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
cp->boxtext, cp->boxtextid);
}
cp->ypos += GAPYBOX;
}
/*
* Some edit boxes. Each one has a static above it. The percentages
* of the horizontal space are provided.
*/
void multiedit(struct ctlpos *cp, ...) {
RECT r;
va_list ap;
int percent, xpos;
percent = xpos = 0;
va_start(ap, cp);
while (1) {
char *text;
int staticid, editid, pcwidth;
text = va_arg(ap, char *);
if (!text)
break;
staticid = va_arg(ap, int);
editid = va_arg(ap, int);
pcwidth = va_arg(ap, int);
r.left = xpos + GAPBETWEEN;
percent += pcwidth;
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.right = xpos - r.left;
r.top = cp->ypos; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
text, staticid);
r.top = cp->ypos + 8 + GAPWITHIN; r.bottom = EDITHEIGHT;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", editid);
}
va_end(ap);
cp->ypos += 8+GAPWITHIN+12+GAPBETWEEN;
}
/*
* A set of radio buttons on the same line, with a static above
* them. `nacross' dictates how many parts the line is divided into
* (you might want this not to equal the number of buttons if you
* needed to line up some 2s and some 3s to look good in the same
* panel).
*/
void radioline(struct ctlpos *cp,
char *text, int id, int nacross, ...) {
RECT r;
va_list ap;
int group;
int i;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
va_start(ap, nacross);
group = WS_GROUP;
i = 0;
while (1) {
char *btext;
int bid;
btext = va_arg(ap, char *);
if (!btext)
break;
bid = va_arg(ap, int);
r.left = GAPBETWEEN + i * (cp->width+GAPBETWEEN)/nacross;
r.right = (i+1) * (cp->width+GAPBETWEEN)/nacross - r.left;
r.top = cp->ypos; r.bottom = RADIOHEIGHT;
doctl(cp, r, "BUTTON",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
0,
btext, bid);
group = 0;
i++;
}
va_end(ap);
cp->ypos += r.bottom + GAPBETWEEN;
}
/*
* A set of radio buttons on multiple lines, with a static above
* them.
*/
void radiobig(struct ctlpos *cp, char *text, int id, ...) {
RECT r;
va_list ap;
int group;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
va_start(ap, id);
group = WS_GROUP;
while (1) {
char *btext;
int bid;
btext = va_arg(ap, char *);
if (!btext)
break;
bid = va_arg(ap, int);
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "BUTTON",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
0,
btext, bid);
group = 0;
}
va_end(ap);
cp->ypos += GAPBETWEEN - GAPWITHIN;
}
/*
* A single standalone checkbox.
*/
void checkbox(struct ctlpos *cp, char *text, int id) {
RECT r;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = CHECKBOXHEIGHT;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "BUTTON",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0,
text, id);
}
/*
* A button on the right hand side, with a static to its left.
*/
void staticbtn(struct ctlpos *cp, char *stext, int sid,
char *btext, int bid) {
const int height = (PUSHBTNHEIGHT > STATICHEIGHT ?
PUSHBTNHEIGHT : STATICHEIGHT);
RECT r;
int lwid, rwid, rpos;
rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
r.right = lwid; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
r.right = rwid; r.bottom = PUSHBTNHEIGHT;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
btext, bid);
cp->ypos += height + GAPBETWEEN;
}
/*
* An edit control on the right hand side, with a static to its left.
*/
void staticedit(struct ctlpos *cp, char *stext,
int sid, int eid, int percentedit) {
const int height = (EDITHEIGHT > STATICHEIGHT ?
EDITHEIGHT : STATICHEIGHT);
RECT r;
int lwid, rwid, rpos;
rpos = GAPBETWEEN + (100-percentedit) * (cp->width + GAPBETWEEN) / 100;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
r.right = lwid; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
r.left = rpos; r.top = cp->ypos + (height-EDITHEIGHT)/2;
r.right = rwid; r.bottom = EDITHEIGHT;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", eid);
cp->ypos += height + GAPBETWEEN;
}
/*
* A tab-control substitute when a real tab control is unavailable.
*/
void ersatztab(struct ctlpos *cp, char *stext, int sid,
int lid, int s2id) {
const int height = (COMBOHEIGHT > STATICHEIGHT ?
COMBOHEIGHT : STATICHEIGHT);
RECT r;
int bigwid, lwid, rwid, rpos;
static const int BIGGAP = 15;
static const int MEDGAP = 3;
bigwid = cp->width + 2*GAPBETWEEN - 2*BIGGAP;
cp->ypos += MEDGAP;
rpos = BIGGAP + (bigwid + BIGGAP) / 2;
lwid = rpos - 2*BIGGAP;
rwid = bigwid + BIGGAP - rpos;
r.left = BIGGAP; r.top = cp->ypos + (height-STATICHEIGHT)/2;
r.right = lwid; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
r.left = rpos; r.top = cp->ypos + (height-COMBOHEIGHT)/2;
r.right = rwid; r.bottom = COMBOHEIGHT*10;
doctl(cp, r, "COMBOBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST | CBS_HASSTRINGS,
WS_EX_CLIENTEDGE,
"", lid);
cp->ypos += height + MEDGAP + GAPBETWEEN;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = 2;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ,
0, "", s2id);
}
/*
* A static line, followed by an edit control on the left hand side
* and a button on the right.
*/
void editbutton(struct ctlpos *cp, char *stext, int sid,
int eid, char *btext, int bid) {
const int height = (EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT);
RECT r;
int lwid, rwid, rpos;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
r.left = GAPBETWEEN; r.top = cp->ypos + (height-EDITHEIGHT)/2;
r.right = lwid; r.bottom = EDITHEIGHT;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", eid);
r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
r.right = rwid; r.bottom = PUSHBTNHEIGHT;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
btext, bid);
cp->ypos += height + GAPBETWEEN;
}
/*
* Special control which was hard to describe generically: the
* session-saver assembly. A static; below that an edit box; below
* that a list box. To the right of the list box, a column of
* buttons.
*/
void sesssaver(struct ctlpos *cp, char *text,
int staticid, int editid, int listid, ...) {
RECT r;
va_list ap;
int lwid, rwid, rpos;
int y;
const int LISTDEFHEIGHT = 66;
rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, staticid);
/* The edit control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = EDITHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", editid);
/*
* The buttons (we should hold off on the list box until we
* know how big the buttons are).
*/
va_start(ap, listid);
y = cp->ypos;
while (1) {
char *btext = va_arg(ap, char *);
int bid;
if (!btext) break;
bid = va_arg(ap, int);
r.left = rpos; r.top = y;
r.right = rwid; r.bottom = PUSHBTNHEIGHT;
y += r.bottom + GAPWITHIN;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
btext, bid);
}
/* Compute list box height. LISTDEFHEIGHT, or height of buttons. */
y -= cp->ypos;
y -= GAPWITHIN;
if (y < LISTDEFHEIGHT) y = LISTDEFHEIGHT;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = y;
cp->ypos += y + GAPBETWEEN;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
LBS_NOTIFY | LBS_HASSTRINGS,
WS_EX_CLIENTEDGE,
"", listid);
}
/*
* Another special control: the environment-variable setter. A
* static line first; then a pair of edit boxes with associated
* statics, and two buttons; then a list box.
*/
void envsetter(struct ctlpos *cp, char *stext, int sid,
char *e1stext, int e1sid, int e1id,
char *e2stext, int e2sid, int e2id,
int listid,
char *b1text, int b1id, char *b2text, int b2id) {
RECT r;
const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
STATICHEIGHT :
EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT);
const static int percents[] = { 20, 35, 10, 25 };
int i, j, xpos, percent;
const int LISTHEIGHT = 42;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
/* The statics+edits+buttons. */
for (j = 0; j < 2; j++) {
percent = 10;
for (i = 0; i < 4; i++) {
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.left = xpos + GAPBETWEEN;
percent += percents[i];
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.right = xpos - r.left;
r.top = cp->ypos;
r.bottom = (i==0 ? STATICHEIGHT :
i==1 ? EDITHEIGHT :
PUSHBTNHEIGHT);
r.top += (height-r.bottom)/2;
if (i==0) {
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
j==0 ? e1stext : e2stext, j==0 ? e1sid : e2sid);
} else if (i==1) {
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", j==0 ? e1id : e2id);
} else if (i==3) {
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
j==0 ? b1text : b2text, j==0 ? b1id : b2id);
}
}
cp->ypos += height + GAPWITHIN;
}
/* The list box. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = LISTHEIGHT;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
LBS_USETABSTOPS,
WS_EX_CLIENTEDGE,
"", listid);
}
/*
* Yet another special control: the character-class setter. A
* static, then a list, then a line containing a
* button-and-static-and-edit.
*/
void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
char *btext, int bid, int eid, char *s2text, int s2id) {
RECT r;
const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
STATICHEIGHT :
EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT);
const static int percents[] = { 30, 40, 30 };
int i, xpos, percent;
const int LISTHEIGHT = 66;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
/* The list box. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = LISTHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
LBS_USETABSTOPS,
WS_EX_CLIENTEDGE,
"", listid);
/* The button+static+edit. */
percent = xpos = 0;
for (i = 0; i < 3; i++) {
r.left = xpos + GAPBETWEEN;
percent += percents[i];
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.right = xpos - r.left;
r.top = cp->ypos;
r.bottom = (i==0 ? PUSHBTNHEIGHT :
i==1 ? STATICHEIGHT :
EDITHEIGHT);
r.top += (height-r.bottom)/2;
if (i==0) {
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0, btext, bid);
} else if (i==1) {
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_CENTER,
0, s2text, s2id);
} else if (i==2) {
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE, "", eid);
}
}
cp->ypos += height + GAPBETWEEN;
}
/*
* A special control (horrors!). The colour editor. A static line;
* then on the left, a list box, and on the right, a sequence of
* two-part statics followed by a button.
*/
void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
char *btext, int bid, ...) {
RECT r;
int y;
va_list ap;
int lwid, rwid, rpos;
const int LISTHEIGHT = 66;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
rpos = GAPBETWEEN + 2 * (cp->width + GAPBETWEEN) / 3;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
/* The list box. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = LISTHEIGHT;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
LBS_USETABSTOPS,
WS_EX_CLIENTEDGE,
"", listid);
/* The statics. */
y = cp->ypos;
va_start(ap, bid);
while (1) {
char *ltext;
int lid, rid;
ltext = va_arg(ap, char *);
if (!ltext) break;
lid = va_arg(ap, int);
rid = va_arg(ap, int);
r.top = y; r.bottom = STATICHEIGHT;
y += r.bottom + GAPWITHIN;
r.left = rpos; r.right = rwid/2;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, ltext, lid);
r.left = rpos + r.right; r.right = rwid - r.right;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_RIGHT, 0, "", rid);
}
va_end(ap);
/* The button. */
r.top = y + 2*GAPWITHIN; r.bottom = PUSHBTNHEIGHT;
r.left = rpos; r.right = rwid;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0, btext, bid);
cp->ypos += LISTHEIGHT + GAPBETWEEN;
}

645
windlg.c
View File

@ -13,6 +13,7 @@
#include "ssh.h" #include "ssh.h"
#include "putty.h" #include "putty.h"
#include "winstuff.h"
#include "win_res.h" #include "win_res.h"
#include "storage.h" #include "storage.h"
@ -21,8 +22,6 @@ static int nevents = 0, negsize = 0;
static HWND logbox = NULL, abtbox = NULL; static HWND logbox = NULL, abtbox = NULL;
static HINSTANCE hinst;
static int readytogo; static int readytogo;
static void force_normal(HWND hwnd) static void force_normal(HWND hwnd)
@ -181,646 +180,6 @@ static int CALLBACK NullDlgProc (HWND hwnd, UINT msg,
return 0; return 0;
} }
/* ----------------------------------------------------------------------
* Routines to self-manage the controls in a dialog box.
*/
#define GAPBETWEEN 3
#define GAPWITHIN 1
#define GAPXBOX 7
#define GAPYBOX 4
#define DLGWIDTH 168
#define STATICHEIGHT 8
#define CHECKBOXHEIGHT 8
#define RADIOHEIGHT 8
#define EDITHEIGHT 12
#define COMBOHEIGHT 12
#define PUSHBTNHEIGHT 14
struct ctlpos {
HWND hwnd;
WPARAM font;
int dlu4inpix;
int ypos, width;
int xoff;
int boxystart, boxid, boxtextid;
char *boxtext;
};
static void ctlposinit(struct ctlpos *cp, HWND hwnd,
int leftborder, int rightborder, int topborder) {
RECT r, r2;
cp->hwnd = hwnd;
cp->font = SendMessage(hwnd, WM_GETFONT, 0, 0);
cp->ypos = topborder;
GetClientRect(hwnd, &r);
r2.left = r2.top = 0;
r2.right = 4;
r2.bottom = 8;
MapDialogRect(hwnd, &r2);
cp->dlu4inpix = r2.right;
cp->width = (r.right * 4) / (r2.right) - 2*GAPBETWEEN;
cp->xoff = leftborder;
cp->width -= leftborder + rightborder;
}
static void doctl(struct ctlpos *cp, RECT r,
char *wclass, int wstyle, int exstyle,
char *wtext, int wid) {
HWND ctl;
/*
* Note nonstandard use of RECT. This is deliberate: by
* transforming the width and height directly we arrange to
* have all supposedly same-sized controls really same-sized.
*/
r.left += cp->xoff;
MapDialogRect(cp->hwnd, &r);
ctl = CreateWindowEx(exstyle, wclass, wtext, wstyle,
r.left, r.top, r.right, r.bottom,
cp->hwnd, (HMENU)wid, hinst, NULL);
SendMessage(ctl, WM_SETFONT, cp->font, MAKELPARAM(TRUE, 0));
}
/*
* A title bar across the top of a sub-dialog.
*/
static void bartitle(struct ctlpos *cp, char *name, int id) {
RECT r;
r.left = GAPBETWEEN; r.right = cp->width;
r.top = cp->ypos; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, name, id);
}
/*
* Begin a grouping box, with or without a group title.
*/
static void beginbox(struct ctlpos *cp, char *name, int idbox, int idtext) {
if (name)
cp->ypos += STATICHEIGHT/2;
cp->boxystart = cp->ypos;
if (name)
cp->ypos += STATICHEIGHT - (STATICHEIGHT/2);
cp->ypos += GAPYBOX;
cp->width -= 2*GAPXBOX;
cp->xoff += GAPXBOX;
cp->boxid = idbox;
cp->boxtextid = idtext;
cp->boxtext = name;
}
/*
* End a grouping box.
*/
static void endbox(struct ctlpos *cp) {
RECT r;
cp->xoff -= GAPXBOX;
cp->width += 2*GAPXBOX;
cp->ypos += GAPYBOX - GAPBETWEEN;
r.left = GAPBETWEEN; r.right = cp->width;
r.top = cp->boxystart; r.bottom = cp->ypos - cp->boxystart;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDFRAME, 0,
"", cp->boxid);
if (cp->boxtext) {
SIZE s;
HDC hdc;
HFONT oldfont, dlgfont;
hdc = GetDC(cp->hwnd);
dlgfont = (HFONT)cp->font;
oldfont = SelectObject(hdc, dlgfont);
GetTextExtentPoint32(hdc, cp->boxtext, strlen(cp->boxtext), &s);
SelectObject(hdc, oldfont);
DeleteDC(hdc);
r.left = GAPXBOX + GAPBETWEEN;
r.right = (s.cx * 4 + cp->dlu4inpix-1) / cp->dlu4inpix;
r.top = cp->boxystart - STATICHEIGHT/2; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
cp->boxtext, cp->boxtextid);
}
cp->ypos += GAPYBOX;
}
/*
* Some edit boxes. Each one has a static above it. The percentages
* of the horizontal space are provided.
*/
static void multiedit(struct ctlpos *cp, ...) {
RECT r;
va_list ap;
int percent, xpos;
percent = xpos = 0;
va_start(ap, cp);
while (1) {
char *text;
int staticid, editid, pcwidth;
text = va_arg(ap, char *);
if (!text)
break;
staticid = va_arg(ap, int);
editid = va_arg(ap, int);
pcwidth = va_arg(ap, int);
r.left = xpos + GAPBETWEEN;
percent += pcwidth;
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.right = xpos - r.left;
r.top = cp->ypos; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
text, staticid);
r.top = cp->ypos + 8 + GAPWITHIN; r.bottom = EDITHEIGHT;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", editid);
}
va_end(ap);
cp->ypos += 8+GAPWITHIN+12+GAPBETWEEN;
}
/*
* A set of radio buttons on the same line, with a static above
* them. `nacross' dictates how many parts the line is divided into
* (you might want this not to equal the number of buttons if you
* needed to line up some 2s and some 3s to look good in the same
* panel).
*/
static void radioline(struct ctlpos *cp,
char *text, int id, int nacross, ...) {
RECT r;
va_list ap;
int group;
int i;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
va_start(ap, nacross);
group = WS_GROUP;
i = 0;
while (1) {
char *btext;
int bid;
btext = va_arg(ap, char *);
if (!btext)
break;
bid = va_arg(ap, int);
r.left = GAPBETWEEN + i * (cp->width+GAPBETWEEN)/nacross;
r.right = (i+1) * (cp->width+GAPBETWEEN)/nacross - r.left;
r.top = cp->ypos; r.bottom = RADIOHEIGHT;
doctl(cp, r, "BUTTON",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
0,
btext, bid);
group = 0;
i++;
}
va_end(ap);
cp->ypos += r.bottom + GAPBETWEEN;
}
/*
* A set of radio buttons on multiple lines, with a static above
* them.
*/
static void radiobig(struct ctlpos *cp, char *text, int id, ...) {
RECT r;
va_list ap;
int group;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
va_start(ap, id);
group = WS_GROUP;
while (1) {
char *btext;
int bid;
btext = va_arg(ap, char *);
if (!btext)
break;
bid = va_arg(ap, int);
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "BUTTON",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
0,
btext, bid);
group = 0;
}
va_end(ap);
cp->ypos += GAPBETWEEN - GAPWITHIN;
}
/*
* A single standalone checkbox.
*/
static void checkbox(struct ctlpos *cp, char *text, int id) {
RECT r;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = CHECKBOXHEIGHT;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "BUTTON",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0,
text, id);
}
/*
* A button on the right hand side, with a static to its left.
*/
static void staticbtn(struct ctlpos *cp, char *stext, int sid,
char *btext, int bid) {
const int height = (PUSHBTNHEIGHT > STATICHEIGHT ?
PUSHBTNHEIGHT : STATICHEIGHT);
RECT r;
int lwid, rwid, rpos;
rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
r.right = lwid; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
r.right = rwid; r.bottom = PUSHBTNHEIGHT;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
btext, bid);
cp->ypos += height + GAPBETWEEN;
}
/*
* An edit control on the right hand side, with a static to its left.
*/
static void staticedit(struct ctlpos *cp, char *stext,
int sid, int eid, int percentedit) {
const int height = (EDITHEIGHT > STATICHEIGHT ?
EDITHEIGHT : STATICHEIGHT);
RECT r;
int lwid, rwid, rpos;
rpos = GAPBETWEEN + (100-percentedit) * (cp->width + GAPBETWEEN) / 100;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
r.right = lwid; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
r.left = rpos; r.top = cp->ypos + (height-EDITHEIGHT)/2;
r.right = rwid; r.bottom = EDITHEIGHT;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", eid);
cp->ypos += height + GAPBETWEEN;
}
/*
* A tab-control substitute when a real tab control is unavailable.
*/
static void ersatztab(struct ctlpos *cp, char *stext, int sid,
int lid, int s2id) {
const int height = (COMBOHEIGHT > STATICHEIGHT ?
COMBOHEIGHT : STATICHEIGHT);
RECT r;
int bigwid, lwid, rwid, rpos;
static const int BIGGAP = 15;
static const int MEDGAP = 3;
bigwid = cp->width + 2*GAPBETWEEN - 2*BIGGAP;
cp->ypos += MEDGAP;
rpos = BIGGAP + (bigwid + BIGGAP) / 2;
lwid = rpos - 2*BIGGAP;
rwid = bigwid + BIGGAP - rpos;
r.left = BIGGAP; r.top = cp->ypos + (height-STATICHEIGHT)/2;
r.right = lwid; r.bottom = STATICHEIGHT;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
r.left = rpos; r.top = cp->ypos + (height-COMBOHEIGHT)/2;
r.right = rwid; r.bottom = COMBOHEIGHT*10;
doctl(cp, r, "COMBOBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST | CBS_HASSTRINGS,
WS_EX_CLIENTEDGE,
"", lid);
cp->ypos += height + MEDGAP + GAPBETWEEN;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = 2;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ,
0, "", s2id);
}
/*
* A static line, followed by an edit control on the left hand side
* and a button on the right.
*/
static void editbutton(struct ctlpos *cp, char *stext, int sid,
int eid, char *btext, int bid) {
const int height = (EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT);
RECT r;
int lwid, rwid, rpos;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
r.left = GAPBETWEEN; r.top = cp->ypos + (height-EDITHEIGHT)/2;
r.right = lwid; r.bottom = EDITHEIGHT;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", eid);
r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
r.right = rwid; r.bottom = PUSHBTNHEIGHT;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
btext, bid);
cp->ypos += height + GAPBETWEEN;
}
/*
* Special control which was hard to describe generically: the
* session-saver assembly. A static; below that an edit box; below
* that a list box. To the right of the list box, a column of
* buttons.
*/
static void sesssaver(struct ctlpos *cp, char *text,
int staticid, int editid, int listid, ...) {
RECT r;
va_list ap;
int lwid, rwid, rpos;
int y;
const int LISTDEFHEIGHT = 66;
rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, staticid);
/* The edit control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = EDITHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", editid);
/*
* The buttons (we should hold off on the list box until we
* know how big the buttons are).
*/
va_start(ap, listid);
y = cp->ypos;
while (1) {
char *btext = va_arg(ap, char *);
int bid;
if (!btext) break;
bid = va_arg(ap, int);
r.left = rpos; r.top = y;
r.right = rwid; r.bottom = PUSHBTNHEIGHT;
y += r.bottom + GAPWITHIN;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
btext, bid);
}
/* Compute list box height. LISTDEFHEIGHT, or height of buttons. */
y -= cp->ypos;
y -= GAPWITHIN;
if (y < LISTDEFHEIGHT) y = LISTDEFHEIGHT;
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = y;
cp->ypos += y + GAPBETWEEN;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
LBS_NOTIFY | LBS_HASSTRINGS,
WS_EX_CLIENTEDGE,
"", listid);
}
/*
* Another special control: the environment-variable setter. A
* static line first; then a pair of edit boxes with associated
* statics, and two buttons; then a list box.
*/
static void envsetter(struct ctlpos *cp, char *stext, int sid,
char *e1stext, int e1sid, int e1id,
char *e2stext, int e2sid, int e2id,
int listid,
char *b1text, int b1id, char *b2text, int b2id) {
RECT r;
const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
STATICHEIGHT :
EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT);
const static int percents[] = { 20, 35, 10, 25 };
int i, j, xpos, percent;
const int LISTHEIGHT = 42;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
/* The statics+edits+buttons. */
for (j = 0; j < 2; j++) {
percent = 10;
for (i = 0; i < 4; i++) {
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.left = xpos + GAPBETWEEN;
percent += percents[i];
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.right = xpos - r.left;
r.top = cp->ypos;
r.bottom = (i==0 ? STATICHEIGHT :
i==1 ? EDITHEIGHT :
PUSHBTNHEIGHT);
r.top += (height-r.bottom)/2;
if (i==0) {
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
j==0 ? e1stext : e2stext, j==0 ? e1sid : e2sid);
} else if (i==1) {
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE,
"", j==0 ? e1id : e2id);
} else if (i==3) {
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0,
j==0 ? b1text : b2text, j==0 ? b1id : b2id);
}
}
cp->ypos += height + GAPWITHIN;
}
/* The list box. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = LISTHEIGHT;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
LBS_USETABSTOPS,
WS_EX_CLIENTEDGE,
"", listid);
}
/*
* Yet another special control: the character-class setter. A
* static, then a list, then a line containing a
* button-and-static-and-edit.
*/
static void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
char *btext, int bid, int eid, char *s2text, int s2id) {
RECT r;
const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
STATICHEIGHT :
EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT);
const static int percents[] = { 30, 40, 30 };
int i, xpos, percent;
const int LISTHEIGHT = 66;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
/* The list box. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = LISTHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
LBS_USETABSTOPS,
WS_EX_CLIENTEDGE,
"", listid);
/* The button+static+edit. */
percent = xpos = 0;
for (i = 0; i < 3; i++) {
r.left = xpos + GAPBETWEEN;
percent += percents[i];
xpos = (cp->width + GAPBETWEEN) * percent / 100;
r.right = xpos - r.left;
r.top = cp->ypos;
r.bottom = (i==0 ? PUSHBTNHEIGHT :
i==1 ? STATICHEIGHT :
EDITHEIGHT);
r.top += (height-r.bottom)/2;
if (i==0) {
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0, btext, bid);
} else if (i==1) {
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_CENTER,
0, s2text, s2id);
} else if (i==2) {
doctl(cp, r, "EDIT",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
WS_EX_CLIENTEDGE, "", eid);
}
}
cp->ypos += height + GAPBETWEEN;
}
/*
* A special control (horrors!). The colour editor. A static line;
* then on the left, a list box, and on the right, a sequence of
* two-part statics followed by a button.
*/
static void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
char *btext, int bid, ...) {
RECT r;
int y;
va_list ap;
int lwid, rwid, rpos;
const int LISTHEIGHT = 66;
/* The static control. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = cp->width; r.bottom = STATICHEIGHT;
cp->ypos += r.bottom + GAPWITHIN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
rpos = GAPBETWEEN + 2 * (cp->width + GAPBETWEEN) / 3;
lwid = rpos - 2*GAPBETWEEN;
rwid = cp->width + GAPBETWEEN - rpos;
/* The list box. */
r.left = GAPBETWEEN; r.top = cp->ypos;
r.right = lwid; r.bottom = LISTHEIGHT;
doctl(cp, r, "LISTBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
LBS_USETABSTOPS,
WS_EX_CLIENTEDGE,
"", listid);
/* The statics. */
y = cp->ypos;
va_start(ap, bid);
while (1) {
char *ltext;
int lid, rid;
ltext = va_arg(ap, char *);
if (!ltext) break;
lid = va_arg(ap, int);
rid = va_arg(ap, int);
r.top = y; r.bottom = STATICHEIGHT;
y += r.bottom + GAPWITHIN;
r.left = rpos; r.right = rwid/2;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, ltext, lid);
r.left = rpos + r.right; r.right = rwid - r.right;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_RIGHT, 0, "", rid);
}
va_end(ap);
/* The button. */
r.top = y + 2*GAPWITHIN; r.bottom = PUSHBTNHEIGHT;
r.left = rpos; r.right = rwid;
doctl(cp, r, "BUTTON",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
0, btext, bid);
cp->ypos += LISTHEIGHT + GAPBETWEEN;
}
static char savedsession[2048]; static char savedsession[2048];
enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue, enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
@ -2305,7 +1664,7 @@ static int CALLBACK ReconfDlgProc (HWND hwnd, UINT msg,
return GenericMainDlgProc (hwnd, msg, wParam, lParam, 1); return GenericMainDlgProc (hwnd, msg, wParam, lParam, 1);
} }
int defuse_showwindow(void) { void defuse_showwindow(void) {
/* /*
* Work around the fact that the app's first call to ShowWindow * Work around the fact that the app's first call to ShowWindow
* will ignore the default in favour of the shell-provided * will ignore the default in favour of the shell-provided

3
window.c
View File

@ -14,6 +14,7 @@
#define PUTTY_DO_GLOBALS /* actually _define_ globals */ #define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h" #include "putty.h"
#include "winstuff.h"
#include "storage.h" #include "storage.h"
#include "win_res.h" #include "win_res.h"
@ -107,7 +108,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
MSG msg; MSG msg;
int guess_width, guess_height; int guess_width, guess_height;
putty_inst = inst; hinst = inst;
flags = FLAG_VERBOSE | FLAG_INTERACTIVE; flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
winsock_ver = MAKEWORD(1, 1); winsock_ver = MAKEWORD(1, 1);

63
winstuff.h Normal file
View File

@ -0,0 +1,63 @@
/*
* winstuff.h: Windows-specific inter-module stuff.
*/
/*
* Global variables. Most modules declare these `extern', but
* window.c will do `#define PUTTY_DO_GLOBALS' before including this
* module, and so will get them properly defined.
*/
#ifdef PUTTY_DO_GLOBALS
#define GLOBAL
#else
#define GLOBAL extern
#endif
GLOBAL HINSTANCE hinst;
/*
* Exports from winctrls.c.
*/
struct ctlpos {
HWND hwnd;
WPARAM font;
int dlu4inpix;
int ypos, width;
int xoff;
int boxystart, boxid, boxtextid;
char *boxtext;
};
void ctlposinit(struct ctlpos *cp, HWND hwnd,
int leftborder, int rightborder, int topborder);
void doctl(struct ctlpos *cp, RECT r,
char *wclass, int wstyle, int exstyle,
char *wtext, int wid);
void bartitle(struct ctlpos *cp, char *name, int id);
void beginbox(struct ctlpos *cp, char *name, int idbox, int idtext);
void endbox(struct ctlpos *cp);
void multiedit(struct ctlpos *cp, ...);
void radioline(struct ctlpos *cp,
char *text, int id, int nacross, ...);
void radiobig(struct ctlpos *cp, char *text, int id, ...);
void checkbox(struct ctlpos *cp, char *text, int id);
void staticbtn(struct ctlpos *cp, char *stext, int sid,
char *btext, int bid);
void staticedit(struct ctlpos *cp, char *stext,
int sid, int eid, int percentedit);
void ersatztab(struct ctlpos *cp, char *stext, int sid,
int lid, int s2id);
void editbutton(struct ctlpos *cp, char *stext, int sid,
int eid, char *btext, int bid);
void sesssaver(struct ctlpos *cp, char *text,
int staticid, int editid, int listid, ...);
void envsetter(struct ctlpos *cp, char *stext, int sid,
char *e1stext, int e1sid, int e1id,
char *e2stext, int e2sid, int e2id,
int listid,
char *b1text, int b1id, char *b2text, int b2id);
void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
char *btext, int bid, int eid, char *s2text, int s2id);
void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
char *btext, int bid, ...);