#include "win_res.h"
#include "storage.h"
#include "dialog.h"
+#include "licence.h"
#include <commctrl.h>
#include <commdlg.h>
static char **events = NULL;
static int nevents = 0, negsize = 0;
-extern Config cfg; /* defined in window.c */
+extern Conf *conf; /* defined in window.c */
#define PRINTER_DISABLED_STRING "None (printing disabled)"
recurse = 0;
}
-static int CALLBACK LogProc(HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK LogProc(HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam)
{
int i;
return 0;
}
-static int CALLBACK LicenceProc(HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK LicenceProc(HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam)
{
switch (msg) {
case WM_INITDIALOG:
char *str = dupprintf("%s Licence", appname);
SetWindowText(hwnd, str);
sfree(str);
+ SetDlgItemText(hwnd, IDA_TEXT, LICENCE_TEXT("\r\n\r\n"));
}
return 1;
case WM_COMMAND:
return 0;
}
-static int CALLBACK AboutProc(HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam)
{
char *str;
str = dupprintf("About %s", appname);
SetWindowText(hwnd, str);
sfree(str);
- SetDlgItemText(hwnd, IDA_TEXT1, appname);
- SetDlgItemText(hwnd, IDA_VERSION, ver);
+ {
+ char *text = dupprintf
+ ("%s\r\n\r\n%s\r\n\r\n%s",
+ appname, ver,
+ "\251 " SHORT_COPYRIGHT_DETAILS ". All rights reserved.");
+ SetDlgItemText(hwnd, IDA_TEXT, text);
+ sfree(text);
+ }
return 1;
case WM_COMMAND:
switch (LOWORD(wParam)) {
/*
* Null dialog procedure.
*/
-static int CALLBACK NullDlgProc(HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK NullDlgProc(HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam)
{
return 0;
}
newitem = TreeView_InsertItem(faff->treeview, &ins);
if (level > 0)
TreeView_Expand(faff->treeview, faff->lastat[level - 1],
- TVE_EXPAND);
+ (level > 1 ? TVE_COLLAPSE : TVE_EXPAND));
faff->lastat[level] = newitem;
for (i = level + 1; i < 4; i++)
faff->lastat[i] = NULL;
* (Being a dialog procedure, in general it returns 0 if the default
* dialog processing should be performed, and 1 if it should not.)
*/
-static int CALLBACK GenericMainDlgProc(HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK GenericMainDlgProc(HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam)
{
HWND hw, treeview;
struct treeview_faff tvfaff;
create_controls(hwnd, ""); /* Open and Cancel buttons etc */
SetWindowText(hwnd, dp.wintitle);
SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
- if (help_path)
+ if (has_help())
SetWindowLongPtr(hwnd, GWL_EXSTYLE,
GetWindowLongPtr(hwnd, GWL_EXSTYLE) |
WS_EX_CONTEXTHELP);
if (item)
DestroyWindow(item);
}
- requested_help = FALSE;
SendMessage(hwnd, WM_SETICON, (WPARAM) ICON_BIG,
(LPARAM) LoadIcon(hinst, MAKEINTRESOURCE(IDI_CFGICON)));
/*
HTREEITEM hfirst = NULL;
int i;
char *path = NULL;
+ char *firstpath = NULL;
for (i = 0; i < ctrlbox->nctrlsets; i++) {
struct controlset *s = ctrlbox->ctrlsets[i];
c++;
item = treeview_insert(&tvfaff, j, c, s->pathname);
- if (!hfirst)
+ if (!hfirst) {
hfirst = item;
+ firstpath = s->pathname;
+ }
path = s->pathname;
}
/*
- * Put the treeview selection on to the Session panel.
- * This should also cause creation of the relevant
- * controls.
+ * Put the treeview selection on to the first panel in the
+ * ctrlbox.
*/
TreeView_SelectItem(treeview, hfirst);
+
+ /*
+ * And create the actual control set for that panel, to
+ * match the initial treeview selection.
+ */
+ assert(firstpath); /* config.c must have given us _something_ */
+ create_controls(hwnd, firstpath);
+ dlg_refresh(NULL, &dp); /* and set up control values */
}
/*
}
}
+ /*
+ * Now we've finished creating our initial set of controls,
+ * it's safe to actually show the window without risking setup
+ * flicker.
+ */
+ ShowWindow(hwnd, SW_SHOWNORMAL);
+
+ /*
+ * Set the flag that activates a couple of the other message
+ * handlers below, which were disabled until now to avoid
+ * spurious firing during the above setup procedure.
+ */
SetWindowLongPtr(hwnd, GWLP_USERDATA, 1);
return 0;
case WM_LBUTTONUP:
case WM_NOTIFY:
if (LOWORD(wParam) == IDCX_TREEVIEW &&
((LPNMHDR) lParam)->code == TVN_SELCHANGED) {
- HTREEITEM i =
- TreeView_GetSelection(((LPNMHDR) lParam)->hwndFrom);
+ /*
+ * Selection-change events on the treeview cause us to do
+ * a flurry of control deletion and creation - but only
+ * after WM_INITDIALOG has finished. The initial
+ * selection-change event(s) during treeview setup are
+ * ignored.
+ */
+ HTREEITEM i;
TVITEM item;
char buffer[64];
+
+ if (GetWindowLongPtr(hwnd, GWLP_USERDATA) != 1)
+ return 0;
+
+ i = TreeView_GetSelection(((LPNMHDR) lParam)->hwndFrom);
SendMessage (hwnd, WM_SETREDRAW, FALSE, 0);
ret = 0;
return ret;
case WM_HELP:
- if (help_path) {
- if (winctrl_context_help(&dp, hwnd,
- ((LPHELPINFO)lParam)->iCtrlId))
- requested_help = TRUE;
- else
- MessageBeep(0);
- }
+ if (!winctrl_context_help(&dp, hwnd,
+ ((LPHELPINFO)lParam)->iCtrlId))
+ MessageBeep(0);
break;
case WM_CLOSE:
- if (requested_help) {
- WinHelp(hwnd, help_path, HELP_QUIT, 0);
- requested_help = FALSE;
- }
+ quit_help(hwnd);
SaneEndDialog(hwnd, 0);
return 0;
void show_help(HWND hwnd)
{
- if (help_path) {
- WinHelp(hwnd, help_path,
- help_has_contents ? HELP_FINDER : HELP_CONTENTS,
- 0);
- requested_help = TRUE;
- }
+ launch_help(hwnd, NULL);
}
void defuse_showwindow(void)
ctrlbox = ctrl_new_box();
setup_config_box(ctrlbox, FALSE, 0, 0);
- win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), FALSE);
+ win_setup_config_box(ctrlbox, &dp.hwnd, has_help(), FALSE, 0);
dp_init(&dp);
winctrl_init(&ctrls_base);
winctrl_init(&ctrls_panel);
dp_add_tree(&dp, &ctrls_panel);
dp.wintitle = dupprintf("%s Configuration", appname);
dp.errtitle = dupprintf("%s Error", appname);
- dp.data = &cfg;
+ dp.data = conf;
+ dlg_auto_set_fixed_pitch_flag(&dp);
dp.shortcuts['g'] = TRUE; /* the treeview: `Cate&gory' */
ret =
int do_reconfig(HWND hwnd, int protcfginfo)
{
- Config backup_cfg;
- int ret;
+ Conf *backup_conf;
+ int ret, protocol;
- backup_cfg = cfg; /* structure copy */
+ backup_conf = conf_copy(conf);
ctrlbox = ctrl_new_box();
- setup_config_box(ctrlbox, TRUE, cfg.protocol, protcfginfo);
- win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), TRUE);
+ protocol = conf_get_int(conf, CONF_protocol);
+ setup_config_box(ctrlbox, TRUE, protocol, protcfginfo);
+ win_setup_config_box(ctrlbox, &dp.hwnd, has_help(), TRUE, protocol);
dp_init(&dp);
winctrl_init(&ctrls_base);
winctrl_init(&ctrls_panel);
dp_add_tree(&dp, &ctrls_panel);
dp.wintitle = dupprintf("%s Reconfiguration", appname);
dp.errtitle = dupprintf("%s Error", appname);
- dp.data = &cfg;
+ dp.data = conf;
+ dlg_auto_set_fixed_pitch_flag(&dp);
dp.shortcuts['g'] = TRUE; /* the treeview: `Cate&gory' */
ret = SaneDialogBox(hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL,
dp_cleanup(&dp);
if (!ret)
- cfg = backup_cfg; /* structure copy */
+ conf_copy_into(conf, backup_conf);
+
+ conf_free(backup_conf);
return ret;
}
DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX), hwnd, AboutProc);
}
-int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
- char *keystr, char *fingerprint,
+int verify_ssh_host_key(void *frontend, char *host, int port,
+ const char *keytype, char *keystr, char *fingerprint,
void (*callback)(void *ctx, int result), void *ctx)
{
int ret;
if (ret == 0) /* success - key matched OK */
return 1;
- if (ret == 2) { /* key was different */
+ else if (ret == 2) { /* key was different */
int mbret;
char *text = dupprintf(wrongmsg, appname, keytype, fingerprint,
appname);
return 1;
} else if (mbret == IDNO)
return 1;
- return 0;
- }
- if (ret == 1) { /* key was absent */
+ } else if (ret == 1) { /* key was absent */
int mbret;
char *text = dupprintf(absentmsg, keytype, fingerprint, appname);
char *caption = dupprintf(mbtitle, appname);
return 1;
} else if (mbret == IDNO)
return 1;
- return 0;
}
+ return 0; /* abandon the connection */
}
/*
title = dupprintf(mbtitle, appname);
mbret = MessageBox(NULL, message, title,
MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2);
+ socket_reselect_all();
+ sfree(message);
+ sfree(title);
+ if (mbret == IDYES)
+ return 1;
+ else
+ return 0;
+}
+
+int askhk(void *frontend, const char *algname, const char *betteralgs,
+ void (*callback)(void *ctx, int result), void *ctx)
+{
+ static const char mbtitle[] = "%s Security Alert";
+ static const char msg[] =
+ "The first host key type we have stored for this server\n"
+ "is %s, which is below the configured warning threshold.\n"
+ "The server also provides the following types of host key\n"
+ "above the threshold, which we do not have stored:\n"
+ "%s\n"
+ "Do you want to continue with this connection?\n";
+ char *message, *title;
+ int mbret;
+
+ message = dupprintf(msg, algname, betteralgs);
+ title = dupprintf(mbtitle, appname);
+ mbret = MessageBox(NULL, message, title,
+ MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2);
+ socket_reselect_all();
sfree(message);
sfree(title);
if (mbret == IDYES)
* Ask whether to wipe a session log file before writing to it.
* Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
*/
-int askappend(void *frontend, Filename filename,
+int askappend(void *frontend, Filename *filename,
void (*callback)(void *ctx, int result), void *ctx)
{
static const char msgtemplate[] =
char *mbtitle;
int mbret;
- message = dupprintf(msgtemplate, FILENAME_MAX, filename.path);
+ message = dupprintf(msgtemplate, FILENAME_MAX, filename->path);
mbtitle = dupprintf("%s Log to File", appname);
mbret = MessageBox(NULL, message, mbtitle,
MB_ICONQUESTION | MB_YESNOCANCEL | MB_DEFBUTTON3);
+ socket_reselect_all();
+
sfree(message);
sfree(mbtitle);
MessageBox(NULL, msg, title, MB_OK);
+ socket_reselect_all();
+
sfree(msg);
sfree(title);
}