static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
unsigned char *output);
-static void cfgtopalette(void);
+static void conftopalette(void);
static void systopalette(void);
static void init_palette(void);
static void init_fonts(int, int);
enum { SYSMENU, CTXMENU };
static HMENU savedsess_menu;
-Config cfg; /* exported to windlg.c */
+Conf *conf; /* exported to windlg.c */
+
+static void conf_cache_data(void);
+int cursor_type;
+int vtmode;
static struct sesslist sesslist; /* for saved-session menu */
* Select protocol. This is farmed out into a table in a
* separate file to enable an ssh-free variant.
*/
- back = backend_from_proto(cfg.protocol);
+ back = backend_from_proto(conf_get_int(conf, CONF_protocol));
if (back == NULL) {
char *str = dupprintf("%s Internal Error", appname);
MessageBox(NULL, "Unsupported protocol number found",
cleanup_exit(1);
}
- error = back->init(NULL, &backhandle, &cfg,
- cfg.host, cfg.port, &realhost, cfg.tcp_nodelay,
- cfg.tcp_keepalives);
+ error = back->init(NULL, &backhandle, conf,
+ conf_get_str(conf, CONF_host),
+ conf_get_int(conf, CONF_port),
+ &realhost,
+ conf_get_int(conf, CONF_tcp_nodelay),
+ conf_get_int(conf, CONF_tcp_keepalives));
back->provide_logctx(backhandle, logctx);
if (error) {
char *str = dupprintf("%s Error", appname);
sprintf(msg, "Unable to open connection to\n"
- "%.800s\n" "%s", cfg_dest(&cfg), error);
+ "%.800s\n" "%s", conf_dest(conf), error);
MessageBox(NULL, msg, str, MB_ICONERROR | MB_OK);
sfree(str);
exit(0);
}
window_name = icon_name = NULL;
- if (*cfg.wintitle) {
- title = cfg.wintitle;
- } else {
+ title = conf_get_str(conf, CONF_wintitle);
+ if (!*title) {
sprintf(msg, "%s - %s", realhost, appname);
title = msg;
}
/*
* Set up a line discipline.
*/
- ldisc = ldisc_create(&cfg, term, back, backhandle, NULL);
+ ldisc = ldisc_create(conf, term, back, backhandle, NULL);
/*
* Destroy the Restart Session menu item. (This will return
init_flashwindow();
+ conf = conf_new();
+
/*
* Initialize COM.
*/
if (b)
default_port = b->default_port;
}
- cfg.logtype = LGTYP_NONE;
+ conf_set_int(conf, CONF_logtype, LGTYP_NONE);
- do_defaults(NULL, &cfg);
+ do_defaults(NULL, conf);
p = cmdline;
while (i > 1 && isspace(p[i - 1]))
i--;
p[i] = '\0';
- do_defaults(p + 1, &cfg);
- if (!cfg_launchable(&cfg) && !do_config()) {
+ do_defaults(p + 1, conf);
+ if (!conf_launchable(conf) && !do_config()) {
cleanup_exit(0);
}
allow_launch = TRUE; /* allow it to be launched directly */
/*
* An initial & means we've been given a command line
* containing the hex value of a HANDLE for a file
- * mapping object, which we must then extract as a
- * config.
+ * mapping object, which we must then interpret as a
+ * serialised Conf.
*/
HANDLE filemap;
- Config *cp;
- if (sscanf(p + 1, "%p", &filemap) == 1 &&
+ void *cp;
+ unsigned cpsize;
+ if (sscanf(p + 1, "%p:%u", &filemap, &cpsize) == 1 &&
(cp = MapViewOfFile(filemap, FILE_MAP_READ,
- 0, 0, sizeof(Config))) != NULL) {
- cfg = *cp;
+ 0, 0, cpsize)) != NULL) {
+ conf_deserialise(conf, cp, cpsize);
UnmapViewOfFile(cp);
CloseHandle(filemap);
} else if (!do_config()) {
int ret;
ret = cmdline_process_param(p, i+1<argc?argv[i+1]:NULL,
- 1, &cfg);
+ 1, conf);
if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", p);
} else if (ret == 2) {
* argument, so that it will be deferred
* until it's a good moment to run it.
*/
- int ret = cmdline_process_param("-P", p, 1, &cfg);
+ int ret = cmdline_process_param("-P", p, 1, conf);
assert(ret == 2);
} else if (!strncmp(q, "telnet:", 7)) {
/*
q += 7;
if (q[0] == '/' && q[1] == '/')
q += 2;
- cfg.protocol = PROT_TELNET;
+ conf_set_int(conf, CONF_protocol, PROT_TELNET);
p = q;
while (*p && *p != ':' && *p != '/')
p++;
if (*p)
*p++ = '\0';
if (c == ':')
- cfg.port = atoi(p);
+ conf_set_int(conf, CONF_port, atoi(p));
else
- cfg.port = -1;
- strncpy(cfg.host, q, sizeof(cfg.host) - 1);
- cfg.host[sizeof(cfg.host) - 1] = '\0';
+ conf_set_int(conf, CONF_port, -1);
+ conf_set_str(conf, CONF_host, q);
got_host = 1;
} else {
/*
p++;
if (*p)
*p++ = '\0';
- strncpy(cfg.host, q, sizeof(cfg.host) - 1);
- cfg.host[sizeof(cfg.host) - 1] = '\0';
+ conf_set_str(conf, CONF_host, q);
got_host = 1;
}
} else {
}
}
- cmdline_run_saved(&cfg);
+ cmdline_run_saved(conf);
if (loaded_session || got_host)
allow_launch = TRUE;
- if ((!allow_launch || !cfg_launchable(&cfg)) && !do_config()) {
+ if ((!allow_launch || !conf_launchable(conf)) && !do_config()) {
cleanup_exit(0);
}
/*
- * Trim leading whitespace off the hostname if it's there.
+ * Muck about with the hostname in various ways.
*/
{
- int space = strspn(cfg.host, " \t");
- memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);
- }
+ char *hostbuf = dupstr(conf_get_str(conf, CONF_host));
+ char *host = hostbuf;
+ char *p, *q;
- /* See if host is of the form user@host */
- if (cfg.host[0] != '\0') {
- char *atsign = strrchr(cfg.host, '@');
- /* Make sure we're not overflowing the user field */
- if (atsign) {
- if (atsign - cfg.host < sizeof cfg.username) {
- strncpy(cfg.username, cfg.host, atsign - cfg.host);
- cfg.username[atsign - cfg.host] = '\0';
+ /*
+ * Trim leading whitespace.
+ */
+ host += strspn(host, " \t");
+
+ /*
+ * See if host is of the form user@host, and separate
+ * out the username if so.
+ */
+ if (host[0] != '\0') {
+ char *atsign = strrchr(host, '@');
+ if (atsign) {
+ *atsign = '\0';
+ conf_set_str(conf, CONF_username, host);
+ host = atsign + 1;
}
- memmove(cfg.host, atsign + 1, 1 + strlen(atsign + 1));
}
- }
- /*
- * Trim a colon suffix off the hostname if it's there. In
- * order to protect IPv6 address literals against this
- * treatment, we do not do this if there's _more_ than one
- * colon.
- */
- {
- char *c = strchr(cfg.host, ':');
+ /*
+ * Trim off a colon suffix if it's there.
+ */
+ host[strcspn(host, ":")] = '\0';
- if (c) {
- char *d = strchr(c+1, ':');
- if (!d)
- *c = '\0';
+ /*
+ * Remove any remaining whitespace.
+ */
+ p = hostbuf;
+ q = host;
+ while (*q) {
+ if (*q != ' ' && *q != '\t')
+ *p++ = *q;
+ q++;
}
- }
+ *p = '\0';
- /*
- * Remove any remaining whitespace from the hostname.
- */
- {
- int p1 = 0, p2 = 0;
- while (cfg.host[p2] != '\0') {
- if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
- cfg.host[p1] = cfg.host[p2];
- p1++;
- }
- p2++;
- }
- cfg.host[p1] = '\0';
+ conf_set_str(conf, CONF_host, hostbuf);
+ sfree(hostbuf);
}
}
memset(&ucsdata, 0, sizeof(ucsdata));
- cfgtopalette();
+ conf_cache_data();
+
+ conftopalette();
/*
* Guess some defaults for the window size. This all gets
font_height = 20;
extra_width = 25;
extra_height = 28;
- guess_width = extra_width + font_width * cfg.width;
- guess_height = extra_height + font_height * cfg.height;
+ guess_width = extra_width + font_width * conf_get_int(conf, CONF_width);
+ guess_height = extra_height + font_height*conf_get_int(conf, CONF_height);
{
RECT r;
get_fullscreen_rect(&r);
{
int winmode = WS_OVERLAPPEDWINDOW | WS_VSCROLL;
int exwinmode = 0;
- if (!cfg.scrollbar)
+ if (!conf_get_int(conf, CONF_scrollbar))
winmode &= ~(WS_VSCROLL);
- if (cfg.resize_action == RESIZE_DISABLED)
+ if (conf_get_int(conf, CONF_resize_action) == RESIZE_DISABLED)
winmode &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
- if (cfg.alwaysontop)
+ if (conf_get_int(conf, CONF_alwaysontop))
exwinmode |= WS_EX_TOPMOST;
- if (cfg.sunken_edge)
+ if (conf_get_int(conf, CONF_sunken_edge))
exwinmode |= WS_EX_CLIENTEDGE;
hwnd = CreateWindowEx(exwinmode, appname, appname,
winmode, CW_USEDEFAULT, CW_USEDEFAULT,
* which will call schedule_timer(), which will in turn call
* timer_change_notify() which will expect hwnd to exist.)
*/
- term = term_init(&cfg, &ucsdata, NULL);
- logctx = log_init(NULL, &cfg);
+ term = term_init(conf, &ucsdata, NULL);
+ logctx = log_init(NULL, conf);
term_provide_logctx(term, logctx);
- term_size(term, cfg.height, cfg.width, cfg.savelines);
+ term_size(term, conf_get_int(conf, CONF_height),
+ conf_get_int(conf, CONF_width),
+ conf_get_int(conf, CONF_savelines));
/*
* Initialise the fonts, simultaneously correcting the guesses
RECT cr, wr;
GetWindowRect(hwnd, &wr);
GetClientRect(hwnd, &cr);
- offset_width = offset_height = cfg.window_border;
+ offset_width = offset_height = conf_get_int(conf, CONF_window_border);
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
}
AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
AppendMenu(m, MF_SEPARATOR, 0, 0);
- AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ?
- MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen");
+ AppendMenu(m, (conf_get_int(conf, CONF_resize_action)
+ == RESIZE_DISABLED) ? MF_GRAYED : MF_ENABLED,
+ IDM_FULLSCREEN, "&Full Screen");
AppendMenu(m, MF_SEPARATOR, 0, 0);
if (has_help())
AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help");
DeleteObject(pal);
sk_cleanup();
- if (cfg.protocol == PROT_SSH) {
+ if (conf_get_int(conf, CONF_protocol) == PROT_SSH) {
random_save_seed();
#ifdef MSCRYPTOAPI
crypto_wrapup();
*/
void set_raw_mouse_mode(void *frontend, int activate)
{
- activate = activate && !cfg.no_mouse_rep;
+ activate = activate && !conf_get_int(conf, CONF_no_mouse_rep);
send_raw_mouse = activate;
update_mouse_pointer();
}
MessageBox(hwnd, stuff, morestuff, MB_ICONERROR | MB_OK);
sfree(stuff);
- if (cfg.close_on_exit == FORCE_ON)
+ if (conf_get_int(conf, CONF_close_on_exit) == FORCE_ON)
PostQuitMessage(1);
else {
must_close_session = TRUE;
* Copy the colour palette from the configuration data into defpal.
* This is non-trivial because the colour indices are different.
*/
-static void cfgtopalette(void)
+static void conftopalette(void)
{
int i;
static const int ww[] = {
for (i = 0; i < 22; i++) {
int w = ww[i];
- defpal[w].rgbtRed = cfg.colours[i][0];
- defpal[w].rgbtGreen = cfg.colours[i][1];
- defpal[w].rgbtBlue = cfg.colours[i][2];
+ defpal[w].rgbtRed = conf_get_int_int(conf, CONF_colours, i*3+0);
+ defpal[w].rgbtGreen = conf_get_int_int(conf, CONF_colours, i*3+1);
+ defpal[w].rgbtBlue = conf_get_int_int(conf, CONF_colours, i*3+2);
}
for (i = 0; i < NEXTCOLOURS; i++) {
if (i < 216) {
}
/* Override with system colours if appropriate */
- if (cfg.system_colour)
+ if (conf_get_int(conf, CONF_system_colour))
systopalette();
}
int i;
HDC hdc = GetDC(hwnd);
if (hdc) {
- if (cfg.try_palette && GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE) {
+ if (conf_get_int(conf, CONF_try_palette) &&
+ GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE) {
/*
* This is a genuine case where we must use smalloc
* because the snew macros can't cope.
{
TEXTMETRIC tm;
CPINFO cpinfo;
+ FontSpec *font;
int fontsize[3];
int i;
+ int quality;
HDC hdc;
int fw_dontcare, fw_bold;
for (i = 0; i < FONT_MAXNO; i++)
fonts[i] = NULL;
- bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
+ bold_mode = conf_get_int(conf, CONF_bold_colour) ?
+ BOLD_COLOURS : BOLD_FONT;
und_mode = UND_FONT;
- if (cfg.font.isbold) {
+ font = conf_get_fontspec(conf, CONF_font);
+ if (font->isbold) {
fw_dontcare = FW_BOLD;
fw_bold = FW_HEAVY;
} else {
if (pick_height)
font_height = pick_height;
else {
- font_height = cfg.font.height;
+ font_height = font->height;
if (font_height > 0) {
font_height =
-MulDiv(font_height, GetDeviceCaps(hdc, LOGPIXELSY), 72);
}
font_width = pick_width;
+ quality = conf_get_int(conf, CONF_font_quality);
#define f(i,c,w,u) \
fonts[i] = CreateFont (font_height, font_width, 0, 0, w, FALSE, u, FALSE, \
c, OUT_DEFAULT_PRECIS, \
- CLIP_DEFAULT_PRECIS, FONT_QUALITY(cfg.font_quality), \
- FIXED_PITCH | FF_DONTCARE, cfg.font.name)
+ CLIP_DEFAULT_PRECIS, quality, \
+ FIXED_PITCH | FF_DONTCARE, font->name)
- f(FONT_NORMAL, cfg.font.charset, fw_dontcare, FALSE);
+ f(FONT_NORMAL, font->charset, fw_dontcare, FALSE);
SelectObject(hdc, fonts[FONT_NORMAL]);
GetTextMetrics(hdc, &tm);
ucsdata.dbcs_screenfont = (cpinfo.MaxCharSize > 1);
}
- f(FONT_UNDERLINE, cfg.font.charset, fw_dontcare, TRUE);
+ f(FONT_UNDERLINE, font->charset, fw_dontcare, TRUE);
/*
* Some fonts, e.g. 9-pt Courier, draw their underlines
}
if (bold_mode == BOLD_FONT) {
- f(FONT_BOLD, cfg.font.charset, fw_bold, FALSE);
+ f(FONT_BOLD, font->charset, fw_bold, FALSE);
}
#undef f
}
fontflag[0] = fontflag[1] = fontflag[2] = 1;
- init_ucs(&cfg, &ucsdata);
+ init_ucs(conf, &ucsdata);
}
static void another_font(int fontno)
{
int basefont;
- int fw_dontcare, fw_bold;
+ int fw_dontcare, fw_bold, quality;
int c, u, w, x;
char *s;
+ FontSpec *font;
if (fontno < 0 || fontno >= FONT_MAXNO || fontflag[fontno])
return;
if (basefont != fontno && !fontflag[basefont])
another_font(basefont);
- if (cfg.font.isbold) {
+ font = conf_get_fontspec(conf, CONF_font);
+
+ if (font->isbold) {
fw_dontcare = FW_BOLD;
fw_bold = FW_HEAVY;
} else {
fw_bold = FW_BOLD;
}
- c = cfg.font.charset;
+ c = font->charset;
w = fw_dontcare;
u = FALSE;
- s = cfg.font.name;
+ s = font->name;
x = font_width;
if (fontno & FONT_WIDE)
if (fontno & FONT_UNDERLINE)
u = TRUE;
+ quality = conf_get_int(conf, CONF_font_quality);
+
fonts[fontno] =
CreateFont(font_height * (1 + !!(fontno & FONT_HIGH)), x, 0, 0, w,
FALSE, u, FALSE, c, OUT_DEFAULT_PRECIS,
- CLIP_DEFAULT_PRECIS, FONT_QUALITY(cfg.font_quality),
+ CLIP_DEFAULT_PRECIS, FONT_QUALITY(quality),
DEFAULT_PITCH | FF_DONTCARE, s);
fontflag[fontno] = 1;
/* If the window is maximized supress resizing attempts */
if (IsZoomed(hwnd)) {
- if (cfg.resize_action == RESIZE_TERM)
+ if (conf_get_int(conf, CONF_resize_action) == RESIZE_TERM)
return;
}
- if (cfg.resize_action == RESIZE_DISABLED) return;
+ if (conf_get_int(conf, CONF_resize_action) == RESIZE_DISABLED) return;
if (h == term->rows && w == term->cols) return;
/* Sanity checks ... */
}
}
- term_size(term, h, w, cfg.savelines);
+ term_size(term, h, w, conf_get_int(conf, CONF_savelines));
- if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) {
+ if (conf_get_int(conf, CONF_resize_action) != RESIZE_FONT &&
+ !IsZoomed(hwnd)) {
width = extra_width + font_width * w;
height = extra_height + font_height * h;
* This function doesn't like to change the terminal size but if the
* font size is locked that may be it's only soluion.
*/
- int win_width, win_height;
+ int win_width, win_height, resize_action, window_border;
RECT cr, wr;
#ifdef RDB_DEBUG_PATCH
win_width = cr.right - cr.left;
win_height = cr.bottom - cr.top;
- if (cfg.resize_action == RESIZE_DISABLED) reinit = 2;
+ resize_action = conf_get_int(conf, CONF_resize_action);
+ window_border = conf_get_int(conf, CONF_window_border);
+
+ if (resize_action == RESIZE_DISABLED)
+ reinit = 2;
/* Are we being forced to reload the fonts ? */
if (reinit>1) {
extra_width = wr.right - wr.left - cr.right + cr.left;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
- if (cfg.resize_action != RESIZE_TERM) {
- if ( font_width != win_width/term->cols ||
- font_height != win_height/term->rows) {
+ if (resize_action != RESIZE_TERM) {
+ if (font_width != win_width/term->cols ||
+ font_height != win_height/term->rows) {
deinit_fonts();
init_fonts(win_width/term->cols, win_height/term->rows);
offset_width = (win_width-font_width*term->cols)/2;
#endif
}
} else {
- if ( font_width * term->cols != win_width ||
- font_height * term->rows != win_height) {
+ if (font_width * term->cols != win_width ||
+ font_height * term->rows != win_height) {
/* Our only choice at this point is to change the
* size of the terminal; Oh well.
*/
term_size(term, win_height/font_height, win_width/font_width,
- cfg.savelines);
+ conf_get_int(conf, CONF_savelines));
offset_width = (win_width-font_width*term->cols)/2;
offset_height = (win_height-font_height*term->rows)/2;
InvalidateRect(hwnd, NULL, TRUE);
debug((27, "reset_window() -> Forced re-init"));
#endif
- offset_width = offset_height = cfg.window_border;
+ offset_width = offset_height = window_border;
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
* window. But that may be too big for the screen which forces us
* to change the terminal.
*/
- if ((cfg.resize_action == RESIZE_TERM && reinit<=0) ||
- (cfg.resize_action == RESIZE_EITHER && reinit<0) ||
+ if ((resize_action == RESIZE_TERM && reinit<=0) ||
+ (resize_action == RESIZE_EITHER && reinit<0) ||
reinit>0) {
- offset_width = offset_height = cfg.window_border;
+ offset_width = offset_height = window_border;
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
/* Grrr too big */
if ( term->rows > height || term->cols > width ) {
- if (cfg.resize_action == RESIZE_EITHER) {
+ if (resize_action == RESIZE_EITHER) {
/* Make the font the biggest we can */
if (term->cols > width)
font_width = (ss.right - ss.left - extra_width)
} else {
if ( height > term->rows ) height = term->rows;
if ( width > term->cols ) width = term->cols;
- term_size(term, height, width, cfg.savelines);
+ term_size(term, height, width,
+ conf_get_int(conf, CONF_savelines));
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> term resize to (%d,%d)",
height, width));
/* We're allowed to or must change the font but do we want to ? */
- if (font_width != (win_width-cfg.window_border*2)/term->cols ||
- font_height != (win_height-cfg.window_border*2)/term->rows) {
+ if (font_width != (win_width-window_border*2)/term->cols ||
+ font_height != (win_height-window_border*2)/term->rows) {
deinit_fonts();
- init_fonts((win_width-cfg.window_border*2)/term->cols,
- (win_height-cfg.window_border*2)/term->rows);
+ init_fonts((win_width-window_border*2)/term->cols,
+ (win_height-window_border*2)/term->rows);
offset_width = (win_width-font_width*term->cols)/2;
offset_height = (win_height-font_height*term->rows)/2;
{
int thistime = GetMessageTime();
- if (send_raw_mouse && !(cfg.mouse_override && shift)) {
+ if (send_raw_mouse &&
+ !(shift && conf_get_int(conf, CONF_mouse_override))) {
lastbtn = MBT_NOTHING;
term_mouse(term, b, translate_button(b), MA_CLICK,
x, y, shift, ctrl, alt);
if (button == MBT_LEFT)
return MBT_SELECT;
if (button == MBT_MIDDLE)
- return cfg.mouse_is_xterm == 1 ? MBT_PASTE : MBT_EXTEND;
+ return conf_get_int(conf, CONF_mouse_is_xterm) == 1 ?
+ MBT_PASTE : MBT_EXTEND;
if (button == MBT_RIGHT)
- return cfg.mouse_is_xterm == 1 ? MBT_EXTEND : MBT_PASTE;
+ return conf_get_int(conf, CONF_mouse_is_xterm) == 1 ?
+ MBT_EXTEND : MBT_PASTE;
return 0; /* shouldn't happen */
}
/* NB that the counter in ShowCursor() is also frobbed by
* update_mouse_pointer() */
static int cursor_visible = 1;
- if (!cfg.hide_mouseptr) /* override if this feature disabled */
- show = 1;
+ if (!conf_get_int(conf, CONF_hide_mouseptr))
+ show = 1; /* override if this feature disabled */
if (cursor_visible && !show)
ShowCursor(FALSE);
else if (!cursor_visible && show)
void notify_remote_exit(void *fe)
{
- int exitcode;
+ int exitcode, close_on_exit;
if (!session_closed &&
(exitcode = back->exitcode(backhandle)) >= 0) {
+ close_on_exit = conf_get_int(conf, CONF_close_on_exit);
/* Abnormal exits will already have set session_closed and taken
* appropriate action. */
- if (cfg.close_on_exit == FORCE_ON ||
- (cfg.close_on_exit == AUTO && exitcode != INT_MAX)) {
+ if (close_on_exit == FORCE_ON ||
+ (close_on_exit == AUTO && exitcode != INT_MAX)) {
PostQuitMessage(0);
} else {
must_close_session = TRUE;
timing_next_time = next;
}
+static void conf_cache_data(void)
+{
+ /* Cache some items from conf to speed lookups in very hot code */
+ cursor_type = conf_get_int(conf, CONF_cursor_type);
+ vtmode = conf_get_int(conf, CONF_vtmode);
+}
+
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
WPARAM wParam, LPARAM lParam)
{
static int fullscr_on_max = FALSE;
static int processed_resize = FALSE;
static UINT last_mousemove = 0;
+ int resize_action;
switch (message) {
case WM_TIMER:
char *str;
show_mouseptr(1);
str = dupprintf("%s Exit Confirmation", appname);
- if (!cfg.warn_on_close || session_closed ||
+ if (session_closed || !conf_get_int(conf, CONF_warn_on_close) ||
MessageBox(hwnd,
"Are you sure you want to close this session?",
str, MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON1)
* config structure.
*/
SECURITY_ATTRIBUTES sa;
- Config *p;
+ void *p;
+ int size;
+
+ size = conf_serialised_size(conf);
sa.nLength = sizeof(sa);
sa.lpSecurityDescriptor = NULL;
filemap = CreateFileMapping(INVALID_HANDLE_VALUE,
&sa,
PAGE_READWRITE,
- 0, sizeof(Config), NULL);
+ 0, size, NULL);
if (filemap && filemap != INVALID_HANDLE_VALUE) {
- p = (Config *) MapViewOfFile(filemap,
- FILE_MAP_WRITE,
- 0, 0, sizeof(Config));
+ p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, size);
if (p) {
- *p = cfg; /* structure copy */
+ conf_serialise(conf, p);
UnmapViewOfFile(p);
}
}
inherit_handles = TRUE;
- sprintf(c, "putty &%p", filemap);
+ sprintf(c, "putty &%p:%u", filemap, (unsigned)size);
cl = c;
} else if (wParam == IDM_SAVEDSESS) {
unsigned int sessno = ((lParam - IDM_SAVED_MIN)
break;
case IDM_RECONF:
{
- Config prev_cfg;
+ Conf *prev_conf;
int init_lvl = 1;
int reconfig_result;
else
reconfiguring = TRUE;
- GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
- prev_cfg = cfg;
+ /*
+ * Copy the current window title into the stored
+ * previous configuration, so that doing nothing to
+ * the window title field in the config box doesn't
+ * reset the title to its startup state.
+ */
+ conf_set_str(conf, CONF_wintitle, window_name);
+
+ prev_conf = conf_copy(conf);
reconfig_result =
do_reconfig(hwnd, back ? back->cfg_info(backhandle) : 0);
if (!reconfig_result)
break;
+ conf_cache_data();
+
+ resize_action = conf_get_int(conf, CONF_resize_action);
{
/* Disable full-screen if resizing forbidden */
int i;
for (i = 0; i < lenof(popup_menus); i++)
EnableMenuItem(popup_menus[i].menu, IDM_FULLSCREEN,
MF_BYCOMMAND |
- (cfg.resize_action == RESIZE_DISABLED)
+ (resize_action == RESIZE_DISABLED)
? MF_GRAYED : MF_ENABLED);
/* Gracefully unzoom if necessary */
- if (IsZoomed(hwnd) &&
- (cfg.resize_action == RESIZE_DISABLED)) {
+ if (IsZoomed(hwnd) && (resize_action == RESIZE_DISABLED))
ShowWindow(hwnd, SW_RESTORE);
- }
}
/* Pass new config data to the logging module */
- log_reconfig(logctx, &cfg);
+ log_reconfig(logctx, conf);
sfree(logpal);
/*
* Flush the line discipline's edit buffer in the
* case where local editing has just been disabled.
*/
+ ldisc_configure(ldisc, conf);
if (ldisc)
ldisc_send(ldisc, NULL, 0, 0);
if (pal)
DeleteObject(pal);
logpal = NULL;
pal = NULL;
- cfgtopalette();
+ conftopalette();
init_palette();
/* Pass new config data to the terminal */
- term_reconfig(term, &cfg);
+ term_reconfig(term, conf);
/* Pass new config data to the back end */
if (back)
- back->reconfig(backhandle, &cfg);
+ back->reconfig(backhandle, conf);
/* Screen size changed ? */
- if (cfg.height != prev_cfg.height ||
- cfg.width != prev_cfg.width ||
- cfg.savelines != prev_cfg.savelines ||
- cfg.resize_action == RESIZE_FONT ||
- (cfg.resize_action == RESIZE_EITHER && IsZoomed(hwnd)) ||
- cfg.resize_action == RESIZE_DISABLED)
- term_size(term, cfg.height, cfg.width, cfg.savelines);
+ if (conf_get_int(conf, CONF_height) !=
+ conf_get_int(prev_conf, CONF_height) ||
+ conf_get_int(conf, CONF_width) !=
+ conf_get_int(prev_conf, CONF_width) ||
+ conf_get_int(conf, CONF_savelines) !=
+ conf_get_int(prev_conf, CONF_savelines) ||
+ resize_action == RESIZE_FONT ||
+ (resize_action == RESIZE_EITHER && IsZoomed(hwnd)) ||
+ resize_action == RESIZE_DISABLED)
+ term_size(term, conf_get_int(conf, CONF_height),
+ conf_get_int(conf, CONF_width),
+ conf_get_int(conf, CONF_savelines));
/* Enable or disable the scroll bar, etc */
{
GetWindowLongPtr(hwnd, GWL_EXSTYLE);
nexflag = exflag;
- if (cfg.alwaysontop != prev_cfg.alwaysontop) {
- if (cfg.alwaysontop) {
+ if (conf_get_int(conf, CONF_alwaysontop) !=
+ conf_get_int(prev_conf, CONF_alwaysontop)) {
+ if (conf_get_int(conf, CONF_alwaysontop)) {
nexflag |= WS_EX_TOPMOST;
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE);
SWP_NOMOVE | SWP_NOSIZE);
}
}
- if (cfg.sunken_edge)
+ if (conf_get_int(conf, CONF_sunken_edge))
nexflag |= WS_EX_CLIENTEDGE;
else
nexflag &= ~(WS_EX_CLIENTEDGE);
nflg = flag;
- if (is_full_screen() ?
- cfg.scrollbar_in_fullscreen : cfg.scrollbar)
+ if (conf_get_int(conf, is_full_screen() ?
+ CONF_scrollbar_in_fullscreen :
+ CONF_scrollbar))
nflg |= WS_VSCROLL;
else
nflg &= ~WS_VSCROLL;
- if (cfg.resize_action == RESIZE_DISABLED ||
+ if (resize_action == RESIZE_DISABLED ||
is_full_screen())
nflg &= ~WS_THICKFRAME;
else
nflg |= WS_THICKFRAME;
- if (cfg.resize_action == RESIZE_DISABLED)
+ if (resize_action == RESIZE_DISABLED)
nflg &= ~WS_MAXIMIZEBOX;
else
nflg |= WS_MAXIMIZEBOX;
}
/* Oops */
- if (cfg.resize_action == RESIZE_DISABLED && IsZoomed(hwnd)) {
+ if (resize_action == RESIZE_DISABLED && IsZoomed(hwnd)) {
force_normal(hwnd);
init_lvl = 2;
}
- set_title(NULL, cfg.wintitle);
+ set_title(NULL, conf_get_str(conf, CONF_wintitle));
if (IsIconic(hwnd)) {
SetWindowText(hwnd,
- cfg.win_name_always ? window_name :
- icon_name);
+ conf_get_int(conf, CONF_win_name_always) ?
+ window_name : icon_name);
}
- if (strcmp(cfg.font.name, prev_cfg.font.name) != 0 ||
- strcmp(cfg.line_codepage, prev_cfg.line_codepage) != 0 ||
- cfg.font.isbold != prev_cfg.font.isbold ||
- cfg.font.height != prev_cfg.font.height ||
- cfg.font.charset != prev_cfg.font.charset ||
- cfg.font_quality != prev_cfg.font_quality ||
- cfg.vtmode != prev_cfg.vtmode ||
- cfg.bold_colour != prev_cfg.bold_colour ||
- cfg.resize_action == RESIZE_DISABLED ||
- cfg.resize_action == RESIZE_EITHER ||
- (cfg.resize_action != prev_cfg.resize_action))
- init_lvl = 2;
+ {
+ FontSpec *font = conf_get_fontspec(conf, CONF_font);
+ FontSpec *prev_font = conf_get_fontspec(prev_conf,
+ CONF_font);
+
+ if (!strcmp(font->name, prev_font->name) ||
+ !strcmp(conf_get_str(conf, CONF_line_codepage),
+ conf_get_str(prev_conf, CONF_line_codepage)) ||
+ font->isbold != prev_font->isbold ||
+ font->height != prev_font->height ||
+ font->charset != prev_font->charset ||
+ conf_get_int(conf, CONF_font_quality) !=
+ conf_get_int(prev_conf, CONF_font_quality) ||
+ conf_get_int(conf, CONF_vtmode) !=
+ conf_get_int(prev_conf, CONF_vtmode) ||
+ conf_get_int(conf, CONF_bold_colour) !=
+ conf_get_int(prev_conf, CONF_bold_colour) ||
+ resize_action == RESIZE_DISABLED ||
+ resize_action == RESIZE_EITHER ||
+ resize_action != conf_get_int(prev_conf,
+ CONF_resize_action))
+ init_lvl = 2;
+ }
InvalidateRect(hwnd, NULL, TRUE);
reset_window(init_lvl);
net_pending_errors();
+
+ conf_free(prev_conf);
}
break;
case IDM_COPYALL:
case WM_MBUTTONUP:
case WM_RBUTTONUP:
if (message == WM_RBUTTONDOWN &&
- ((wParam & MK_CONTROL) || (cfg.mouse_is_xterm == 2))) {
+ ((wParam & MK_CONTROL) ||
+ (conf_get_int(conf, CONF_mouse_is_xterm) == 2))) {
POINT cursorpos;
show_mouseptr(1); /* make sure pointer is visible */
debug((27, "WM_EXITSIZEMOVE"));
#endif
if (need_backend_resize) {
- term_size(term, cfg.height, cfg.width, cfg.savelines);
+ term_size(term, conf_get_int(conf, CONF_height),
+ conf_get_int(conf, CONF_width),
+ conf_get_int(conf, CONF_savelines));
InvalidateRect(hwnd, NULL, TRUE);
}
break;
* 1) Keep the sizetip uptodate
* 2) Make sure the window size is _stepped_ in units of the font size.
*/
- if (cfg.resize_action == RESIZE_TERM ||
- (cfg.resize_action == RESIZE_EITHER && !is_alt_pressed())) {
+ resize_action = conf_get_int(conf, CONF_resize_action);
+ if (resize_action == RESIZE_TERM ||
+ (resize_action == RESIZE_EITHER && !is_alt_pressed())) {
int width, height, w, h, ew, eh;
LPRECT r = (LPRECT) lParam;
- if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER &&
- (cfg.height != term->rows || cfg.width != term->cols )) {
+ if (!need_backend_resize && resize_action == RESIZE_EITHER &&
+ (conf_get_int(conf, CONF_height) != term->rows ||
+ conf_get_int(conf, CONF_width) != term->cols)) {
/*
* Great! It seems that both the terminal size and the
* font size have been changed and the user is now dragging.
* font size!
*
* This would be easier but it seems to be too confusing.
-
- term_size(term, cfg.height, cfg.width, cfg.savelines);
- reset_window(2);
*/
- cfg.height=term->rows; cfg.width=term->cols;
+ conf_set_int(conf, CONF_height, term->rows);
+ conf_set_int(conf, CONF_width, term->cols);
InvalidateRect(hwnd, NULL, TRUE);
need_backend_resize = TRUE;
return 0;
} else {
int width, height, w, h, rv = 0;
- int ex_width = extra_width + (cfg.window_border - offset_width) * 2;
- int ex_height = extra_height + (cfg.window_border - offset_height) * 2;
+ int window_border = conf_get_int(conf, CONF_window_border);
+ int ex_width = extra_width + (window_border - offset_width) * 2;
+ int ex_height = extra_height + (window_border - offset_height) * 2;
LPRECT r = (LPRECT) lParam;
width = r->right - r->left - ex_width;
sys_cursor_update();
break;
case WM_SIZE:
+ resize_action = conf_get_int(conf, CONF_resize_action);
#ifdef RDB_DEBUG_PATCH
debug((27, "WM_SIZE %s (%d,%d)",
(wParam == SIZE_MINIMIZED) ? "SIZE_MINIMIZED":
#endif
if (wParam == SIZE_MINIMIZED)
SetWindowText(hwnd,
- cfg.win_name_always ? window_name : icon_name);
+ conf_get_int(conf, CONF_win_name_always) ?
+ window_name : icon_name);
if (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED)
SetWindowText(hwnd, window_name);
if (wParam == SIZE_RESTORED) {
processed_resize = TRUE;
- if (cfg.resize_action == RESIZE_DISABLED) {
+ if (resize_action == RESIZE_DISABLED) {
/* A resize, well it better be a minimize. */
reset_window(-1);
} else {
int width, height, w, h;
+ int window_border = conf_get_int(conf, CONF_window_border);
width = LOWORD(lParam);
height = HIWORD(lParam);
was_zoomed = 1;
prev_rows = term->rows;
prev_cols = term->cols;
- if (cfg.resize_action == RESIZE_TERM) {
+ if (resize_action == RESIZE_TERM) {
w = width / font_width;
if (w < 1) w = 1;
h = height / font_height;
if (h < 1) h = 1;
- term_size(term, h, w, cfg.savelines);
+ term_size(term, h, w, conf_get_int(conf, CONF_savelines));
}
reset_window(0);
} else if (wParam == SIZE_RESTORED && was_zoomed) {
was_zoomed = 0;
- if (cfg.resize_action == RESIZE_TERM) {
- w = (width-cfg.window_border*2) / font_width;
+ if (resize_action == RESIZE_TERM) {
+ w = (width-window_border*2) / font_width;
if (w < 1) w = 1;
- h = (height-cfg.window_border*2) / font_height;
+ h = (height-window_border*2) / font_height;
if (h < 1) h = 1;
- term_size(term, h, w, cfg.savelines);
+ term_size(term, h, w, conf_get_int(conf, CONF_savelines));
reset_window(2);
- } else if (cfg.resize_action != RESIZE_FONT)
+ } else if (resize_action != RESIZE_FONT)
reset_window(2);
else
reset_window(0);
} else if (wParam == SIZE_MINIMIZED) {
/* do nothing */
- } else if (cfg.resize_action == RESIZE_TERM ||
- (cfg.resize_action == RESIZE_EITHER &&
+ } else if (resize_action == RESIZE_TERM ||
+ (resize_action == RESIZE_EITHER &&
!is_alt_pressed())) {
- w = (width-cfg.window_border*2) / font_width;
+ w = (width-window_border*2) / font_width;
if (w < 1) w = 1;
- h = (height-cfg.window_border*2) / font_height;
+ h = (height-window_border*2) / font_height;
if (h < 1) h = 1;
if (resizing) {
* opaque drag.)
*/
need_backend_resize = TRUE;
- cfg.height = h;
- cfg.width = w;
+ conf_set_int(conf, CONF_height, h);
+ conf_set_int(conf, CONF_height, w);
} else {
- term_size(term, h, w, cfg.savelines);
+ term_size(term, h, w, conf_get_int(conf, CONF_savelines));
}
} else {
reset_window(0);
}
return 0;
case WM_SYSCOLORCHANGE:
- if (cfg.system_colour) {
+ if (conf_get_int(conf, CONF_system_colour)) {
/* Refresh palette from system colours. */
/* XXX actually this zaps the entire palette. */
systopalette();
} else
break;
- if (send_raw_mouse &&
- !(cfg.mouse_override && shift_pressed)) {
+ if (send_raw_mouse && shift_pressed &&
+ !(conf_get_int(conf, CONF_mouse_override))) {
/* Mouse wheel position is in screen coordinates for
* some reason */
POINT p;
x += offset_width;
y += offset_height;
- if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || term->big_cursor)) {
+ if ((attr & TATTR_ACTCURS) && (cursor_type == 0 || term->big_cursor)) {
attr &= ~(ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS);
if (bold_mode == BOLD_COLOURS)
attr &= ~ATTR_BOLD;
}
nfont = 0;
- if (cfg.vtmode == VT_POORMAN && lattr != LATTR_NORM) {
+ if (vtmode == VT_POORMAN && lattr != LATTR_NORM) {
/* Assume a poorman font is borken in other ways too. */
lattr = LATTR_WIDE;
} else
int fnt_width;
int char_width;
HDC hdc = ctx;
- int ctype = cfg.cursor_type;
+ int ctype = cursor_type;
lattr &= LATTR_MODE;
int r, i, code;
unsigned char *p = output;
static int alt_sum = 0;
+ int funky_type = conf_get_int(conf, CONF_funky_type);
+ int no_applic_k = conf_get_int(conf, CONF_no_applic_k);
+ int ctrlaltkeys = conf_get_int(conf, CONF_ctrlaltkeys);
+ int nethack_keypad = conf_get_int(conf, CONF_nethack_keypad);
HKL kbd_layout = GetKeyboardLayout(0);
/* keys is for ToAsciiEx. There's some ick here, see below. */
static WORD keys[3];
static int compose_char = 0;
- static WPARAM compose_key = 0;
+ static WPARAM compose_keycode = 0;
r = GetKeyboardState(keystate);
if (!r)
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
- if ((cfg.funky_type == FUNKY_VT400 ||
- (cfg.funky_type <= FUNKY_LINUX && term->app_keypad_keys &&
- !cfg.no_applic_k))
+ if ((funky_type == FUNKY_VT400 ||
+ (funky_type <= FUNKY_LINUX && term->app_keypad_keys &&
+ !no_applic_k))
&& wParam == VK_NUMLOCK && !(keystate[VK_SHIFT] & 0x80)) {
wParam = VK_EXECUTE;
/* Make sure Ctrl-ALT is not the same as AltGr for ToAscii unless told. */
if (left_alt && (keystate[VK_CONTROL] & 0x80)) {
- if (cfg.ctrlaltkeys)
+ if (ctrlaltkeys)
keystate[VK_MENU] = 0;
else {
keystate[VK_RMENU] = 0x80;
/* Note if AltGr was pressed and if it was used as a compose key */
if (!compose_state) {
- compose_key = 0x100;
- if (cfg.compose_key) {
+ compose_keycode = 0x100;
+ if (conf_get_int(conf, CONF_compose_key)) {
if (wParam == VK_MENU && (HIWORD(lParam) & KF_EXTENDED))
- compose_key = wParam;
+ compose_keycode = wParam;
}
if (wParam == VK_APPS)
- compose_key = wParam;
+ compose_keycode = wParam;
}
- if (wParam == compose_key) {
+ if (wParam == compose_keycode) {
if (compose_state == 0
&& (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == 0) compose_state =
1;
compose_state = 0;
/* Sanitize the number pad if not using a PC NumPad */
- if (left_alt || (term->app_keypad_keys && !cfg.no_applic_k
- && cfg.funky_type != FUNKY_XTERM)
- || cfg.funky_type == FUNKY_VT400 || cfg.nethack_keypad || compose_state) {
+ if (left_alt || (term->app_keypad_keys && !no_applic_k
+ && funky_type != FUNKY_XTERM)
+ || funky_type == FUNKY_VT400 || nethack_keypad || compose_state) {
if ((HIWORD(lParam) & KF_EXTENDED) == 0) {
int nParam = 0;
switch (wParam) {
request_paste(NULL);
return 0;
}
- if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
+ if (left_alt && wParam == VK_F4 && conf_get_int(conf, CONF_alt_f4)) {
return -1;
}
- if (left_alt && wParam == VK_SPACE && cfg.alt_space) {
+ if (left_alt && wParam == VK_SPACE && conf_get_int(conf,
+ CONF_alt_space)) {
SendMessage(hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
return -1;
}
- if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter &&
- (cfg.resize_action != RESIZE_DISABLED)) {
+ if (left_alt && wParam == VK_RETURN &&
+ conf_get_int(conf, CONF_fullscreenonaltenter) &&
+ (conf_get_int(conf, CONF_resize_action) != RESIZE_DISABLED)) {
if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT)
flip_full_screen();
return -1;
}
/* Nethack keypad */
- if (cfg.nethack_keypad && !left_alt) {
+ if (nethack_keypad && !left_alt) {
switch (wParam) {
case VK_NUMPAD1:
*p++ = "bB\002\002"[shift_state & 3];
if (!left_alt) {
int xkey = 0;
- if (cfg.funky_type == FUNKY_VT400 ||
- (cfg.funky_type <= FUNKY_LINUX &&
- term->app_keypad_keys && !cfg.no_applic_k)) switch (wParam) {
+ if (funky_type == FUNKY_VT400 ||
+ (funky_type <= FUNKY_LINUX &&
+ term->app_keypad_keys && !no_applic_k)) switch (wParam) {
case VK_EXECUTE:
xkey = 'P';
break;
xkey = 'S';
break;
}
- if (term->app_keypad_keys && !cfg.no_applic_k)
+ if (term->app_keypad_keys && !no_applic_k)
switch (wParam) {
case VK_NUMPAD0:
xkey = 'p';
xkey = 'n';
break;
case VK_ADD:
- if (cfg.funky_type == FUNKY_XTERM) {
+ if (funky_type == FUNKY_XTERM) {
if (shift_state)
xkey = 'l';
else
break;
case VK_DIVIDE:
- if (cfg.funky_type == FUNKY_XTERM)
+ if (funky_type == FUNKY_XTERM)
xkey = 'o';
break;
case VK_MULTIPLY:
- if (cfg.funky_type == FUNKY_XTERM)
+ if (funky_type == FUNKY_XTERM)
xkey = 'j';
break;
case VK_SUBTRACT:
- if (cfg.funky_type == FUNKY_XTERM)
+ if (funky_type == FUNKY_XTERM)
xkey = 'm';
break;
}
if (wParam == VK_BACK && shift_state == 0) { /* Backspace */
- *p++ = (cfg.bksp_is_delete ? 0x7F : 0x08);
+ *p++ = (conf_get_int(conf, CONF_bksp_is_delete) ? 0x7F : 0x08);
*p++ = 0;
return -2;
}
if (wParam == VK_BACK && shift_state == 1) { /* Shift Backspace */
/* We do the opposite of what is configured */
- *p++ = (cfg.bksp_is_delete ? 0x08 : 0x7F);
+ *p++ = (conf_get_int(conf, CONF_bksp_is_delete) ? 0x08 : 0x7F);
*p++ = 0;
return -2;
}
break;
}
/* Reorder edit keys to physical order */
- if (cfg.funky_type == FUNKY_VT400 && code <= 6)
+ if (funky_type == FUNKY_VT400 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
if (term->vt52_mode && code > 0 && code <= 6) {
return p - output;
}
- if (cfg.funky_type == FUNKY_SCO && /* SCO function keys */
- code >= 11 && code <= 34) {
+ if (funky_type == FUNKY_SCO && code >= 11 && code <= 34) {
+ /* SCO function keys */
char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
int index = 0;
switch (wParam) {
p += sprintf((char *) p, "\x1B[%c", codes[index]);
return p - output;
}
- if (cfg.funky_type == FUNKY_SCO && /* SCO small keypad */
+ if (funky_type == FUNKY_SCO && /* SCO small keypad */
code >= 1 && code <= 6) {
char codes[] = "HL.FIG";
if (code == 3) {
}
return p - output;
}
- if ((term->vt52_mode || cfg.funky_type == FUNKY_VT100P) && code >= 11 && code <= 24) {
+ if ((term->vt52_mode || funky_type == FUNKY_VT100P) && code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
offt++;
sprintf((char *) p, "\x1BO%c", code + 'P' - 11 - offt);
return p - output;
}
- if (cfg.funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
+ if (funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
p += sprintf((char *) p, "\x1B[[%c", code + 'A' - 11);
return p - output;
}
- if (cfg.funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
+ if (funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
if (term->vt52_mode)
p += sprintf((char *) p, "\x1B%c", code + 'P' - 11);
else
p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11);
return p - output;
}
- if (cfg.rxvt_homeend && (code == 1 || code == 4)) {
+ if ((code == 1 || code == 4) &&
+ conf_get_int(conf, CONF_rxvt_homeend)) {
p += sprintf((char *) p, code == 1 ? "\x1B[H" : "\x1BOw");
return p - output;
}
BOOL capsOn=0;
/* helg: clear CAPS LOCK state if caps lock switches to cyrillic */
- if(cfg.xlat_capslockcyr && keystate[VK_CAPITAL] != 0) {
+ if(keystate[VK_CAPITAL] != 0 &&
+ conf_get_int(conf, CONF_xlat_capslockcyr)) {
capsOn= !left_alt;
keystate[VK_CAPITAL] = 0;
}
* we return -1, which means Windows will give the keystroke
* its default handling (i.e. bring up the System menu).
*/
- if (wParam == VK_MENU && !cfg.alt_only)
+ if (wParam == VK_MENU && !conf_get_int(conf, CONF_alt_only))
return 0;
return -1;
sfree(window_name);
window_name = snewn(1 + strlen(title), char);
strcpy(window_name, title);
- if (cfg.win_name_always || !IsIconic(hwnd))
+ if (conf_get_int(conf, CONF_win_name_always) || !IsIconic(hwnd))
SetWindowText(hwnd, title);
}
sfree(icon_name);
icon_name = snewn(1 + strlen(title), char);
strcpy(icon_name, title);
- if (!cfg.win_name_always && IsIconic(hwnd))
+ if (!conf_get_int(conf, CONF_win_name_always) && IsIconic(hwnd))
SetWindowText(hwnd, title);
}
{
SCROLLINFO si;
- if (is_full_screen() ? !cfg.scrollbar_in_fullscreen : !cfg.scrollbar)
+ if (!conf_get_int(conf, is_full_screen() ?
+ CONF_scrollbar_in_fullscreen : CONF_scrollbar))
return;
si.cbSize = sizeof(si);
memcpy(lock, data, len * sizeof(wchar_t));
WideCharToMultiByte(CP_ACP, 0, data, len, lock2, len2, NULL, NULL);
- if (cfg.rtf_paste) {
+ if (conf_get_int(conf, CONF_rtf_paste)) {
wchar_t unitab[256];
char *rtf = NULL;
unsigned char *tdata = (unsigned char *)lock2;
int attrUnder, lastAttrUnder = 0;
int palette[NALLCOLOURS];
int numcolours;
+ FontSpec *font = conf_get_fontspec(conf, CONF_font);
get_unitab(CP_ACP, unitab, 0);
- rtfsize = 100 + strlen(cfg.font.name);
+ rtfsize = 100 + strlen(font->name);
rtf = snewn(rtfsize, char);
rtflen = sprintf(rtf, "{\\rtf1\\ansi\\deff0{\\fonttbl\\f0\\fmodern %s;}\\f0\\fs%d",
- cfg.font.name, cfg.font.height*2);
+ font->name, font->height*2);
/*
* Add colour palette
*/
static void flash_window(int mode)
{
- if ((mode == 0) || (cfg.beep_ind == B_IND_DISABLED)) {
+ int beep_ind = conf_get_int(conf, CONF_beep_ind);
+ if ((mode == 0) || (beep_ind == B_IND_DISABLED)) {
/* stop */
if (flashing) {
flashing = 0;
* "flashing" mode, although I haven't seen this
* documented. */
flash_window_ex(FLASHW_ALL | FLASHW_TIMER,
- (cfg.beep_ind == B_IND_FLASH ? 0 : 2),
+ (beep_ind == B_IND_FLASH ? 0 : 2),
0 /* system cursor blink rate */);
/* No need to schedule timer */
} else {
}
}
- } else if ((mode == 1) && (cfg.beep_ind == B_IND_FLASH)) {
+ } else if ((mode == 1) && (beep_ind == B_IND_FLASH)) {
/* maintain */
if (flashing && !p_FlashWindowEx) {
FlashWindow(hwnd, TRUE); /* toggle */
*/
lastbeep = GetTickCount();
} else if (mode == BELL_WAVEFILE) {
- if (!PlaySound(cfg.bell_wavefile.path, NULL,
+ Filename *bell_wavefile = conf_get_filename(conf, CONF_bell_wavefile);
+ if (!PlaySound(bell_wavefile->path, NULL,
SND_ASYNC | SND_FILENAME)) {
- char buf[sizeof(cfg.bell_wavefile.path) + 80];
+ char buf[sizeof(bell_wavefile->path) + 80];
char otherbuf[100];
sprintf(buf, "Unable to play sound file\n%s\n"
- "Using default sound instead", cfg.bell_wavefile.path);
+ "Using default sound instead", bell_wavefile->path);
sprintf(otherbuf, "%.70s Sound Error", appname);
MessageBox(hwnd, buf, otherbuf,
MB_OK | MB_ICONEXCLAMATION);
- cfg.beep = BELL_DEFAULT;
+ conf_set_int(conf, CONF_beep, BELL_DEFAULT);
}
} else if (mode == BELL_PCSPEAKER) {
static long lastbeep = 0;
*/
void move_window(void *frontend, int x, int y)
{
- if (cfg.resize_action == RESIZE_DISABLED ||
- cfg.resize_action == RESIZE_FONT ||
+ int resize_action = conf_get_int(conf, CONF_resize_action);
+ if (resize_action == RESIZE_DISABLED ||
+ resize_action == RESIZE_FONT ||
IsZoomed(hwnd))
return;
*/
void set_zorder(void *frontend, int top)
{
- if (cfg.alwaysontop)
+ if (conf_get_int(conf, CONF_alwaysontop))
return; /* ignore */
SetWindowPos(hwnd, top ? HWND_TOP : HWND_BOTTOM, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE);
/* Remove the window furniture. */
style = GetWindowLongPtr(hwnd, GWL_STYLE);
style &= ~(WS_CAPTION | WS_BORDER | WS_THICKFRAME);
- if (cfg.scrollbar_in_fullscreen)
+ if (conf_get_int(conf, CONF_scrollbar_in_fullscreen))
style |= WS_VSCROLL;
else
style &= ~WS_VSCROLL;
/* Reinstate the window furniture. */
style = oldstyle = GetWindowLongPtr(hwnd, GWL_STYLE);
style |= WS_CAPTION | WS_BORDER;
- if (cfg.resize_action == RESIZE_DISABLED)
+ if (conf_get_int(conf, CONF_resize_action) == RESIZE_DISABLED)
style &= ~WS_THICKFRAME;
else
style |= WS_THICKFRAME;
- if (cfg.scrollbar)
+ if (conf_get_int(conf, CONF_scrollbar))
style |= WS_VSCROLL;
else
style &= ~WS_VSCROLL;
projects / u / mdw / putty / blobdiff