-#include <windows.h>
-#include <imm.h>
-#include <commctrl.h>
-#include <richedit.h>
-#include <mmsystem.h>
-#ifndef AUTO_WINSOCK
-#ifdef WINSOCK_TWO
-#include <winsock2.h>
-#else
-#include <winsock.h>
-#endif
-#endif
-
-#ifndef NO_MULTIMON
-#if WINVER < 0x0500
-#define COMPILE_MULTIMON_STUBS
-#include <multimon.h>
-#endif
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
#include "terminal.h"
-#include "winstuff.h"
#include "storage.h"
#include "win_res.h"
+#ifndef NO_MULTIMON
+#if WINVER < 0x0500
+#define COMPILE_MULTIMON_STUBS
+#include <multimon.h>
+#endif
+#endif
+
+#include <imm.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <mmsystem.h>
+
#define IDM_SHOWLOG 0x0010
#define IDM_NEWSESS 0x0020
#define IDM_DUPSESS 0x0030
-#define IDM_RECONF 0x0040
-#define IDM_CLRSB 0x0050
-#define IDM_RESET 0x0060
-#define IDM_TEL_AYT 0x0070
-#define IDM_TEL_BRK 0x0080
-#define IDM_TEL_SYNCH 0x0090
-#define IDM_TEL_EC 0x00a0
-#define IDM_TEL_EL 0x00b0
-#define IDM_TEL_GA 0x00c0
-#define IDM_TEL_NOP 0x00d0
-#define IDM_TEL_ABORT 0x00e0
-#define IDM_TEL_AO 0x00f0
-#define IDM_TEL_IP 0x0100
-#define IDM_TEL_SUSP 0x0110
-#define IDM_TEL_EOR 0x0120
-#define IDM_TEL_EOF 0x0130
+#define IDM_RESTART 0x0040
+#define IDM_RECONF 0x0050
+#define IDM_CLRSB 0x0060
+#define IDM_RESET 0x0070
#define IDM_HELP 0x0140
#define IDM_ABOUT 0x0150
#define IDM_SAVEDSESS 0x0160
#define IDM_COPYALL 0x0170
#define IDM_FULLSCREEN 0x0180
+#define IDM_PASTE 0x0190
#define IDM_SESSLGP 0x0250 /* log type printable */
#define IDM_SESSLGA 0x0260 /* log type all chars */
#define IDM_SESSLGE 0x0270 /* log end */
+
+#define IDM_SPECIAL_MIN 0x0400
+#define IDM_SPECIAL_MAX 0x0800
+
#define IDM_SAVED_MIN 0x1000
#define IDM_SAVED_MAX 0x2000
#define WM_IGNORE_CLIP (WM_XUSER + 2)
#define WM_FULLSCR_ON_MAX (WM_XUSER + 3)
+#define WM_AGENT_CALLBACK (WM_XUSER + 4)
/* Needed for Chinese support and apparently not always defined. */
#ifndef VK_PROCESSKEY
#define WHEEL_DELTA 120
#endif
+static Mouse_Button translate_button(Mouse_Button button);
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 systopalette(void);
static void init_palette(void);
static void init_fonts(int, int);
static void another_font(int);
static void deinit_fonts(void);
static void set_input_locale(HKL);
-static int do_mouse_wheel_msg(UINT message, WPARAM wParam, LPARAM lParam);
static int is_full_screen(void);
static void make_full_screen(void);
static Backend *back;
static void *backhandle;
+static struct unicode_data ucsdata;
static int session_closed;
+static const struct telnet_special *specials;
+static int n_specials;
+
+static struct {
+ HMENU menu;
+ int specials_submenu_pos;
+} popup_menus[2];
+enum { SYSMENU, CTXMENU };
+
+Config cfg; /* exported to windlg.c */
+
extern struct sesslist sesslist; /* imported from windlg.c */
+struct agent_callback {
+ void (*callback)(void *, void *, int);
+ void *callback_ctx;
+ void *data;
+ int len;
+};
+
#define FONT_NORMAL 0
#define FONT_BOLD 1
#define FONT_UNDERLINE 2
static int compose_state = 0;
-static int wsa_started = 0;
-
-static OSVERSIONINFO osVersion;
-
static UINT wm_mousewheel = WM_MOUSEWHEEL;
/* Dummy routine, only required in plink. */
{
}
+static void start_backend(void)
+{
+ const char *error;
+ char msg[1024], *title;
+ char *realhost;
+ int i;
+
+ /*
+ * Select protocol. This is farmed out into a table in a
+ * separate file to enable an ssh-free variant.
+ */
+ back = NULL;
+ for (i = 0; backends[i].backend != NULL; i++)
+ if (backends[i].protocol == cfg.protocol) {
+ back = backends[i].backend;
+ break;
+ }
+ if (back == NULL) {
+ char *str = dupprintf("%s Internal Error", appname);
+ MessageBox(NULL, "Unsupported protocol number found",
+ str, MB_OK | MB_ICONEXCLAMATION);
+ sfree(str);
+ cleanup_exit(1);
+ }
+
+ error = back->init(NULL, &backhandle, &cfg,
+ cfg.host, cfg.port, &realhost, cfg.tcp_nodelay,
+ cfg.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.host, 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 {
+ sprintf(msg, "%s - %s", realhost, appname);
+ title = msg;
+ }
+ sfree(realhost);
+ set_title(NULL, title);
+ set_icon(NULL, title);
+
+ /*
+ * Connect the terminal to the backend for resize purposes.
+ */
+ term_provide_resize_fn(term, back->size, backhandle);
+
+ /*
+ * Set up a line discipline.
+ */
+ ldisc = ldisc_create(&cfg, term, back, backhandle, NULL);
+
+ /*
+ * Destroy the Restart Session menu item. (This will return
+ * failure if it's already absent, as it will be the very first
+ * time we call this function. We ignore that, because as long
+ * as the menu item ends up not being there, we don't care
+ * whether it was us who removed it or not!)
+ */
+ for (i = 0; i < lenof(popup_menus); i++) {
+ DeleteMenu(popup_menus[i].menu, IDM_RESTART, MF_BYCOMMAND);
+ }
+
+ session_closed = FALSE;
+}
+
+static void close_session(void)
+{
+ char morestuff[100];
+ int i;
+
+ session_closed = TRUE;
+ sprintf(morestuff, "%.70s (inactive)", appname);
+ set_icon(NULL, morestuff);
+ set_title(NULL, morestuff);
+
+ if (ldisc) {
+ ldisc_free(ldisc);
+ ldisc = NULL;
+ }
+ if (back) {
+ back->free(backhandle);
+ backhandle = NULL;
+ back = NULL;
+ update_specials_menu(NULL);
+ }
+
+ /*
+ * Show the Restart Session menu item. Do a precautionary
+ * delete first to ensure we never end up with more than one.
+ */
+ for (i = 0; i < lenof(popup_menus); i++) {
+ DeleteMenu(popup_menus[i].menu, IDM_RESTART, MF_BYCOMMAND);
+ InsertMenu(popup_menus[i].menu, IDM_DUPSESS, MF_BYCOMMAND | MF_ENABLED,
+ IDM_RESTART, "&Restart Session");
+ }
+}
+
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{
- static char appname[] = "PuTTY";
- WORD winsock_ver;
- WSADATA wsadata;
WNDCLASS wndclass;
MSG msg;
int guess_width, guess_height;
hinst = inst;
flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
- winsock_ver = MAKEWORD(1, 1);
- if (WSAStartup(winsock_ver, &wsadata)) {
- MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
- MB_OK | MB_ICONEXCLAMATION);
- return 1;
- }
- if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) {
- MessageBox(NULL, "WinSock version is incompatible with 1.1",
- "WinSock Error", MB_OK | MB_ICONEXCLAMATION);
- WSACleanup();
- return 1;
- }
- wsa_started = 1;
- /* WISHLIST: maybe allow config tweaking even if winsock not present? */
sk_init();
InitCommonControls();
* config box. */
defuse_showwindow();
+ if (!init_winver())
{
- ZeroMemory(&osVersion, sizeof(osVersion));
- osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
- if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) {
- MessageBox(NULL, "Windows refuses to report a version",
- "PuTTY Fatal Error", MB_OK | MB_ICONEXCLAMATION);
- return 1;
- }
+ char *str = dupprintf("%s Fatal Error", appname);
+ MessageBox(NULL, "Windows refuses to report a version",
+ str, MB_OK | MB_ICONEXCLAMATION);
+ sfree(str);
+ return 1;
}
/*
char *p;
int got_host = 0;
- default_protocol = DEFAULT_PROTOCOL;
- default_port = DEFAULT_PORT;
+ default_protocol = be_default_protocol;
+ /* Find the appropriate default port. */
+ {
+ int i;
+ default_port = 0; /* illegal */
+ for (i = 0; backends[i].backend != NULL; i++)
+ if (backends[i].protocol == default_protocol) {
+ default_port = backends[i].backend->default_port;
+ break;
+ }
+ }
cfg.logtype = LGTYP_NONE;
do_defaults(NULL, &cfg);
p[i] = '\0';
do_defaults(p + 1, &cfg);
if (!*cfg.host && !do_config()) {
- WSACleanup();
- return 0;
+ cleanup_exit(0);
}
} else if (*p == '&') {
/*
UnmapViewOfFile(cp);
CloseHandle(filemap);
} else if (!do_config()) {
- WSACleanup();
- return 0;
+ cleanup_exit(0);
}
} else {
/*
char *p = argv[i];
int ret;
- ret = cmdline_process_param(p, i+1<argc?argv[i+1]:NULL, 1);
+ ret = cmdline_process_param(p, i+1<argc?argv[i+1]:NULL,
+ 1, &cfg);
if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", p);
} else if (ret == 2) {
* entries associated with PuTTY, and also find
* and delete the random seed file.
*/
- if (MessageBox(NULL,
- "This procedure will remove ALL Registry\n"
- "entries associated with PuTTY, and will\n"
- "also remove the PuTTY random seed file.\n"
+ char *s1, *s2;
+ s1 = dupprintf("This procedure will remove ALL Registry\n"
+ "entries associated with %s, and will\n"
+ "also remove the random seed file.\n"
"\n"
"THIS PROCESS WILL DESTROY YOUR SAVED\n"
"SESSIONS. Are you really sure you want\n"
- "to continue?",
- "PuTTY Warning",
+ "to continue?", appname);
+ s2 = dupprintf("%s Warning", appname);
+ if (MessageBox(NULL, s1, s2,
MB_YESNO | MB_ICONWARNING) == IDYES) {
cleanup_all();
}
+ sfree(s1);
+ sfree(s2);
exit(0);
} else if (*p != '-') {
char *q = p;
* argument, so that it will be deferred
* until it's a good moment to run it.
*/
- int ret = cmdline_process_param("-P", p, 1);
+ int ret = cmdline_process_param("-P", p, 1, &cfg);
assert(ret == 2);
} else if (!strncmp(q, "telnet:", 7)) {
/*
cfg.host[sizeof(cfg.host) - 1] = '\0';
got_host = 1;
}
+ } else {
+ cmdline_error("unknown option \"%s\"", p);
}
}
}
- cmdline_run_saved();
+ cmdline_run_saved(&cfg);
if (!*cfg.host && !do_config()) {
- WSACleanup();
- return 0;
+ cleanup_exit(0);
}
/*
/* See if host is of the form user@host */
if (cfg.host[0] != '\0') {
- char *atsign = strchr(cfg.host, '@');
+ char *atsign = strrchr(cfg.host, '@');
/* Make sure we're not overflowing the user field */
if (atsign) {
if (atsign - cfg.host < sizeof cfg.username) {
}
}
- /*
- * Select protocol. This is farmed out into a table in a
- * separate file to enable an ssh-free variant.
- */
- {
- int i;
- back = NULL;
- for (i = 0; backends[i].backend != NULL; i++)
- if (backends[i].protocol == cfg.protocol) {
- back = backends[i].backend;
- break;
- }
- if (back == NULL) {
- MessageBox(NULL, "Unsupported protocol number found",
- "PuTTY Internal Error", MB_OK | MB_ICONEXCLAMATION);
- WSACleanup();
- return 1;
- }
- }
-
/* Check for invalid Port number (i.e. zero) */
if (cfg.port == 0) {
+ char *str = dupprintf("%s Internal Error", appname);
MessageBox(NULL, "Invalid Port Number",
- "PuTTY Internal Error", MB_OK | MB_ICONEXCLAMATION);
- WSACleanup();
- return 1;
+ str, MB_OK | MB_ICONEXCLAMATION);
+ sfree(str);
+ cleanup_exit(1);
}
if (!prev) {
hwnd = NULL;
- term = term_init(NULL);
- logctx = log_init(NULL);
+ memset(&ucsdata, 0, sizeof(ucsdata));
+
+ term = term_init(&cfg, &ucsdata, NULL);
+ logctx = log_init(NULL, &cfg);
term_provide_logctx(term, logctx);
cfgtopalette();
{
char *bits;
int size = (font_width + 15) / 16 * 2 * font_height;
- bits = smalloc(size);
+ bits = snewn(size, char);
memset(bits, 0, size);
caretbm = CreateBitmap(font_width, font_height, 1, 1, bits);
sfree(bits);
}
/*
- * Start up the telnet connection.
- */
- {
- char *error;
- char msg[1024], *title;
- char *realhost;
-
- error = back->init((void *)term, &backhandle,
- cfg.host, cfg.port, &realhost, cfg.tcp_nodelay);
- back->provide_logctx(backhandle, logctx);
- if (error) {
- sprintf(msg, "Unable to open connection to\n"
- "%.800s\n" "%s", cfg.host, error);
- MessageBox(NULL, msg, "PuTTY Error", MB_ICONERROR | MB_OK);
- return 0;
- }
- window_name = icon_name = NULL;
- if (*cfg.wintitle) {
- title = cfg.wintitle;
- } else {
- sprintf(msg, "%s - PuTTY", realhost);
- title = msg;
- }
- sfree(realhost);
- set_title(NULL, title);
- set_icon(NULL, title);
- }
-
- /*
- * Connect the terminal to the backend for resize purposes.
- */
- term_provide_resize_fn(term, back->size, backhandle);
-
- /*
- * Set up a line discipline.
- */
- ldisc = ldisc_create(term, back, backhandle, NULL);
-
- session_closed = FALSE;
-
- /*
* Prepare the mouse handler.
*/
lastact = MA_NOTHING;
* Set up the session-control options on the system menu.
*/
{
- HMENU m = GetSystemMenu(hwnd, FALSE);
- HMENU p, s;
- int i;
+ HMENU s, m;
+ int i, j;
+ char *str;
+
+ popup_menus[SYSMENU].menu = GetSystemMenu(hwnd, FALSE);
+ popup_menus[CTXMENU].menu = CreatePopupMenu();
+ AppendMenu(popup_menus[CTXMENU].menu, MF_ENABLED, IDM_PASTE, "&Paste");
- AppendMenu(m, MF_SEPARATOR, 0, 0);
- if (cfg.protocol == PROT_TELNET) {
- p = CreateMenu();
- AppendMenu(p, MF_ENABLED, IDM_TEL_AYT, "Are You There");
- AppendMenu(p, MF_ENABLED, IDM_TEL_BRK, "Break");
- AppendMenu(p, MF_ENABLED, IDM_TEL_SYNCH, "Synch");
- AppendMenu(p, MF_SEPARATOR, 0, 0);
- AppendMenu(p, MF_ENABLED, IDM_TEL_EC, "Erase Character");
- AppendMenu(p, MF_ENABLED, IDM_TEL_EL, "Erase Line");
- AppendMenu(p, MF_ENABLED, IDM_TEL_GA, "Go Ahead");
- AppendMenu(p, MF_ENABLED, IDM_TEL_NOP, "No Operation");
- AppendMenu(p, MF_SEPARATOR, 0, 0);
- AppendMenu(p, MF_ENABLED, IDM_TEL_ABORT, "Abort Process");
- AppendMenu(p, MF_ENABLED, IDM_TEL_AO, "Abort Output");
- AppendMenu(p, MF_ENABLED, IDM_TEL_IP, "Interrupt Process");
- AppendMenu(p, MF_ENABLED, IDM_TEL_SUSP, "Suspend Process");
- AppendMenu(p, MF_SEPARATOR, 0, 0);
- AppendMenu(p, MF_ENABLED, IDM_TEL_EOR, "End Of Record");
- AppendMenu(p, MF_ENABLED, IDM_TEL_EOF, "End Of File");
- AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) p,
- "Telnet Command");
- AppendMenu(m, MF_SEPARATOR, 0, 0);
- }
- AppendMenu(m, MF_ENABLED, IDM_SHOWLOG, "&Event Log");
- AppendMenu(m, MF_SEPARATOR, 0, 0);
- AppendMenu(m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
- AppendMenu(m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
s = CreateMenu();
get_sesslist(&sesslist, TRUE);
for (i = 1;
i++)
AppendMenu(s, MF_ENABLED, IDM_SAVED_MIN + (16 * i),
sesslist.sessions[i]);
- AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) s, "Sa&ved Sessions");
- AppendMenu(m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
- AppendMenu(m, MF_SEPARATOR, 0, 0);
- AppendMenu(m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard");
- 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, MF_SEPARATOR, 0, 0);
- if (help_path)
- AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help");
- AppendMenu(m, MF_ENABLED, IDM_ABOUT, "&About PuTTY");
+
+ for (j = 0; j < lenof(popup_menus); j++) {
+ m = popup_menus[j].menu;
+
+ AppendMenu(m, MF_SEPARATOR, 0, 0);
+ popup_menus[j].specials_submenu_pos = GetMenuItemCount(m);
+ AppendMenu(m, MF_ENABLED, IDM_SHOWLOG, "&Event Log");
+ AppendMenu(m, MF_SEPARATOR, 0, 0);
+ AppendMenu(m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
+ AppendMenu(m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
+ AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) s, "Sa&ved Sessions");
+ AppendMenu(m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
+ AppendMenu(m, MF_SEPARATOR, 0, 0);
+ AppendMenu(m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard");
+ 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, MF_SEPARATOR, 0, 0);
+ if (help_path)
+ AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help");
+ str = dupprintf("&About %s", appname);
+ AppendMenu(m, MF_ENABLED, IDM_ABOUT, str);
+ sfree(str);
+ }
}
+ start_backend();
+
/*
* Set up the initial input locale.
*/
if (pending_netevent) {
enact_pending_netevent();
- /* Force the cursor blink on */
- term_blink(term, 1);
-
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
continue;
}
if (pal)
DeleteObject(pal);
sk_cleanup();
- if (wsa_started)
- WSACleanup();
if (cfg.protocol == PROT_SSH) {
random_save_seed();
}
if (!hwnd)
return "do_select(): internal error (hwnd==NULL)";
- if (WSAAsyncSelect(skt, hwnd, msg, events) == SOCKET_ERROR) {
- switch (WSAGetLastError()) {
+ if (p_WSAAsyncSelect(skt, hwnd, msg, events) == SOCKET_ERROR) {
+ switch (p_WSAGetLastError()) {
case WSAENETDOWN:
return "Network is down";
default:
}
/*
+ * Update the Special Commands submenu.
+ */
+void update_specials_menu(void *frontend)
+{
+ HMENU p;
+ int menu_already_exists = (specials != NULL);
+ int i, j;
+
+ if (back)
+ specials = back->get_specials(backhandle);
+ else
+ specials = NULL;
+
+ if (specials) {
+ /* We can't use Windows to provide a stack for submenus, so
+ * here's a lame "stack" that will do for now. */
+ HMENU saved_menu = NULL;
+ int nesting = 1;
+ p = CreatePopupMenu();
+ for (i = 0; nesting > 0; i++) {
+ assert(IDM_SPECIAL_MIN + 0x10 * i < IDM_SPECIAL_MAX);
+ switch (specials[i].code) {
+ case TS_SEP:
+ AppendMenu(p, MF_SEPARATOR, 0, 0);
+ break;
+ case TS_SUBMENU:
+ assert(nesting < 2);
+ nesting++;
+ saved_menu = p; /* XXX lame stacking */
+ p = CreatePopupMenu();
+ AppendMenu(saved_menu, MF_POPUP | MF_ENABLED,
+ (UINT) p, specials[i].name);
+ break;
+ case TS_EXITMENU:
+ nesting--;
+ if (nesting) {
+ p = saved_menu; /* XXX lame stacking */
+ saved_menu = NULL;
+ }
+ break;
+ default:
+ AppendMenu(p, MF_ENABLED, IDM_SPECIAL_MIN + 0x10 * i,
+ specials[i].name);
+ break;
+ }
+ }
+ /* Squirrel the highest special. */
+ n_specials = i - 1;
+ } else {
+ p = NULL;
+ n_specials = 0;
+ }
+
+ for (j = 0; j < lenof(popup_menus); j++) {
+ if (menu_already_exists) {
+ /* XXX does this free up all submenus? */
+ DeleteMenu(popup_menus[j].menu,
+ popup_menus[j].specials_submenu_pos,
+ MF_BYPOSITION);
+ DeleteMenu(popup_menus[j].menu,
+ popup_menus[j].specials_submenu_pos,
+ MF_BYPOSITION);
+ }
+ if (specials) {
+ InsertMenu(popup_menus[j].menu,
+ popup_menus[j].specials_submenu_pos,
+ MF_BYPOSITION | MF_SEPARATOR, 0, 0);
+ InsertMenu(popup_menus[j].menu,
+ popup_menus[j].specials_submenu_pos,
+ MF_BYPOSITION | MF_POPUP | MF_ENABLED,
+ (UINT) p, "S&pecial Command");
+ }
+ }
+}
+
+/*
* set or clear the "raw mouse message" mode
*/
void set_raw_mouse_mode(void *frontend, int activate)
void connection_fatal(void *frontend, char *fmt, ...)
{
va_list ap;
- char stuff[200];
+ char *stuff, morestuff[100];
va_start(ap, fmt);
- vsprintf(stuff, fmt, ap);
+ stuff = dupvprintf(fmt, ap);
va_end(ap);
- MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
- if (cfg.close_on_exit == COE_ALWAYS)
+ sprintf(morestuff, "%.70s Fatal Error", appname);
+ MessageBox(hwnd, stuff, morestuff, MB_ICONERROR | MB_OK);
+ sfree(stuff);
+
+ if (cfg.close_on_exit == FORCE_ON)
PostQuitMessage(1);
else {
- session_closed = TRUE;
- SetWindowText(hwnd, "PuTTY (inactive)");
+ close_session();
}
}
void cmdline_error(char *fmt, ...)
{
va_list ap;
- char stuff[200];
+ char *stuff, morestuff[100];
va_start(ap, fmt);
- vsprintf(stuff, fmt, ap);
+ stuff = dupvprintf(fmt, ap);
va_end(ap);
- MessageBox(hwnd, stuff, "PuTTY Command Line Error", MB_ICONERROR | MB_OK);
+ sprintf(morestuff, "%.70s Command Line Error", appname);
+ MessageBox(hwnd, stuff, morestuff, MB_ICONERROR | MB_OK);
+ sfree(stuff);
exit(1);
}
if (ret == 0 && !session_closed) {
/* Abnormal exits will already have set session_closed and taken
* appropriate action. */
- if (cfg.close_on_exit == COE_ALWAYS ||
- cfg.close_on_exit == COE_NORMAL) PostQuitMessage(0);
+ if (cfg.close_on_exit == FORCE_ON ||
+ cfg.close_on_exit == AUTO) PostQuitMessage(0);
else {
+ close_session();
session_closed = TRUE;
- SetWindowText(hwnd, "PuTTY (inactive)");
MessageBox(hwnd, "Connection closed by remote host",
- "PuTTY", MB_OK | MB_ICONINFORMATION);
+ appname, MB_OK | MB_ICONINFORMATION);
}
}
}
defpal[i].rgbtGreen = cfg.colours[w][1];
defpal[i].rgbtBlue = cfg.colours[w][2];
}
+
+ /* Override with system colours if appropriate */
+ if (cfg.system_colour)
+ systopalette();
+}
+
+/*
+ * Override bit of defpal with colours from the system.
+ * (NB that this takes a copy the system colours at the time this is called,
+ * so subsequent colour scheme changes don't take effect. To fix that we'd
+ * probably want to be using GetSysColorBrush() and the like.)
+ */
+static void systopalette(void)
+{
+ int i;
+ static const struct { int nIndex; int norm; int bold; } or[] =
+ {
+ { COLOR_WINDOWTEXT, 16, 17 }, /* Default Foreground */
+ { COLOR_WINDOW, 18, 19 }, /* Default Background */
+ { COLOR_HIGHLIGHTTEXT, 20, 21 }, /* Cursor Text */
+ { COLOR_HIGHLIGHT, 22, 23 }, /* Cursor Colour */
+ };
+
+ for (i = 0; i < (sizeof(or)/sizeof(or[0])); i++) {
+ COLORREF colour = GetSysColor(or[i].nIndex);
+ defpal[or[i].norm].rgbtRed =
+ defpal[or[i].bold].rgbtRed = GetRValue(colour);
+ defpal[or[i].norm].rgbtGreen =
+ defpal[or[i].bold].rgbtGreen = GetGValue(colour);
+ defpal[or[i].norm].rgbtBlue =
+ defpal[or[i].bold].rgbtBlue = GetBValue(colour);
+ }
}
/*
HDC hdc = GetDC(hwnd);
if (hdc) {
if (cfg.try_palette && GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE) {
+ /*
+ * This is a genuine case where we must use smalloc
+ * because the snew macros can't cope.
+ */
logpal = smalloc(sizeof(*logpal)
- sizeof(logpal->palPalEntry)
+ NCOLOURS * sizeof(PALETTEENTRY));
}
/*
+ * This is a wrapper to ExtTextOut() to force Windows to display
+ * the precise glyphs we give it. Otherwise it would do its own
+ * bidi and Arabic shaping, and we would end up uncertain which
+ * characters it had put where.
+ */
+static void exact_textout(HDC hdc, int x, int y, CONST RECT *lprc,
+ unsigned short *lpString, UINT cbCount,
+ CONST INT *lpDx, int opaque)
+{
+
+ GCP_RESULTSW gcpr;
+ char *buffer = snewn(cbCount*2+2, char);
+ char *classbuffer = snewn(cbCount, char);
+ memset(&gcpr, 0, sizeof(gcpr));
+ memset(buffer, 0, cbCount*2+2);
+ memset(classbuffer, GCPCLASS_NEUTRAL, cbCount);
+
+ gcpr.lStructSize = sizeof(gcpr);
+ gcpr.lpGlyphs = (void *)buffer;
+ gcpr.lpClass = classbuffer;
+ gcpr.nGlyphs = cbCount;
+
+ GetCharacterPlacementW(hdc, lpString, cbCount, 0, &gcpr,
+ FLI_MASK | GCP_CLASSIN | GCP_DIACRITIC);
+
+ ExtTextOut(hdc, x, y,
+ ETO_GLYPH_INDEX | ETO_CLIPPED | (opaque ? ETO_OPAQUE : 0),
+ lprc, buffer, cbCount, lpDx);
+}
+
+/*
* Initialise all the fonts we will need initially. There may be as many as
* three or as few as one. The other (poentially) twentyone fonts are done
* if/when they are needed.
bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
und_mode = UND_FONT;
- if (cfg.fontisbold) {
+ if (cfg.font.isbold) {
fw_dontcare = FW_BOLD;
fw_bold = FW_HEAVY;
} else {
if (pick_height)
font_height = pick_height;
else {
- font_height = cfg.fontheight;
+ font_height = cfg.font.height;
if (font_height > 0) {
font_height =
-MulDiv(font_height, GetDeviceCaps(hdc, LOGPIXELSY), 72);
fonts[i] = CreateFont (font_height, font_width, 0, 0, w, FALSE, u, FALSE, \
c, OUT_DEFAULT_PRECIS, \
CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, \
- FIXED_PITCH | FF_DONTCARE, cfg.font)
+ FIXED_PITCH | FF_DONTCARE, cfg.font.name)
- f(FONT_NORMAL, cfg.fontcharset, fw_dontcare, FALSE);
+ f(FONT_NORMAL, cfg.font.charset, fw_dontcare, FALSE);
lfont.lfHeight = font_height;
lfont.lfWidth = font_width;
lfont.lfItalic = FALSE;
lfont.lfUnderline = FALSE;
lfont.lfStrikeOut = FALSE;
- lfont.lfCharSet = cfg.fontcharset;
+ lfont.lfCharSet = cfg.font.charset;
lfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
lfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
lfont.lfQuality = DEFAULT_QUALITY;
lfont.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
- strncpy(lfont.lfFaceName, cfg.font, LF_FACESIZE);
+ strncpy(lfont.lfFaceName, cfg.font.name, LF_FACESIZE);
SelectObject(hdc, fonts[FONT_NORMAL]);
GetTextMetrics(hdc, &tm);
/* !!! Yes the next line is right */
if (cset == OEM_CHARSET)
- font_codepage = GetOEMCP();
+ ucsdata.font_codepage = GetOEMCP();
else
- if (TranslateCharsetInfo
- ((DWORD *) cset, &info, TCI_SRCCHARSET)) font_codepage =
- info.ciACP;
+ if (TranslateCharsetInfo ((DWORD *) cset, &info, TCI_SRCCHARSET))
+ ucsdata.font_codepage = info.ciACP;
else
- font_codepage = -1;
+ ucsdata.font_codepage = -1;
- GetCPInfo(font_codepage, &cpinfo);
- dbcs_screenfont = (cpinfo.MaxCharSize > 1);
+ GetCPInfo(ucsdata.font_codepage, &cpinfo);
+ ucsdata.dbcs_screenfont = (cpinfo.MaxCharSize > 1);
}
- f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE);
+ f(FONT_UNDERLINE, cfg.font.charset, fw_dontcare, TRUE);
/*
* Some fonts, e.g. 9-pt Courier, draw their underlines
}
if (bold_mode == BOLD_FONT) {
- f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
+ f(FONT_BOLD, cfg.font.charset, fw_bold, FALSE);
}
#undef f
}
fontflag[0] = fontflag[1] = fontflag[2] = 1;
- init_ucs();
+ init_ucs(&cfg, &ucsdata);
}
static void another_font(int fontno)
if (basefont != fontno && !fontflag[basefont])
another_font(basefont);
- if (cfg.fontisbold) {
+ if (cfg.font.isbold) {
fw_dontcare = FW_BOLD;
fw_bold = FW_HEAVY;
} else {
fw_bold = FW_BOLD;
}
- c = cfg.fontcharset;
+ c = cfg.font.charset;
w = fw_dontcare;
u = FALSE;
- s = cfg.font;
+ s = cfg.font.name;
x = font_width;
if (fontno & FONT_WIDE)
if (send_raw_mouse && !(cfg.mouse_override && shift)) {
lastbtn = MBT_NOTHING;
- term_mouse(term, b, MA_CLICK, x, y, shift, ctrl, alt);
+ term_mouse(term, b, translate_button(b), MA_CLICK,
+ x, y, shift, ctrl, alt);
return;
}
lastact = MA_CLICK;
}
if (lastact != MA_NOTHING)
- term_mouse(term, b, lastact, x, y, shift, ctrl, alt);
+ term_mouse(term, b, translate_button(b), lastact,
+ x, y, shift, ctrl, alt);
lasttime = thistime;
}
* Translate a raw mouse button designation (LEFT, MIDDLE, RIGHT)
* into a cooked one (SELECT, EXTEND, PASTE).
*/
-Mouse_Button translate_button(void *frontend, Mouse_Button button)
+static Mouse_Button translate_button(Mouse_Button button)
{
if (button == MBT_LEFT)
return MBT_SELECT;
if (button == MBT_MIDDLE)
- return cfg.mouse_is_xterm ? MBT_PASTE : MBT_EXTEND;
+ return cfg.mouse_is_xterm == 1 ? MBT_PASTE : MBT_EXTEND;
if (button == MBT_RIGHT)
- return cfg.mouse_is_xterm ? MBT_EXTEND : MBT_PASTE;
+ return cfg.mouse_is_xterm == 1 ? MBT_EXTEND : MBT_PASTE;
return 0; /* shouldn't happen */
}
static int ignore_clip = FALSE;
static int need_backend_resize = FALSE;
static int fullscr_on_max = FALSE;
+ static UINT last_mousemove = 0;
switch (message) {
case WM_TIMER:
time_t now;
time(&now);
if (now - last_movement > cfg.ping_interval) {
- back->special(backhandle, TS_PING);
+ if (back)
+ back->special(backhandle, TS_PING);
last_movement = now;
}
}
case WM_CREATE:
break;
case WM_CLOSE:
- show_mouseptr(1);
- if (!cfg.warn_on_close || session_closed ||
- MessageBox(hwnd,
- "Are you sure you want to close this session?",
- "PuTTY Exit Confirmation",
- MB_ICONWARNING | MB_OKCANCEL) == IDOK)
- DestroyWindow(hwnd);
+ {
+ char *str;
+ show_mouseptr(1);
+ str = dupprintf("%s Exit Confirmation", appname);
+ if (!cfg.warn_on_close || session_closed ||
+ MessageBox(hwnd,
+ "Are you sure you want to close this session?",
+ str, MB_ICONWARNING | MB_OKCANCEL) == IDOK)
+ DestroyWindow(hwnd);
+ sfree(str);
+ }
return 0;
case WM_DESTROY:
show_mouseptr(1);
PostQuitMessage(0);
return 0;
+ case WM_COMMAND:
case WM_SYSCOMMAND:
switch (wParam & ~0xF) { /* low 4 bits reserved to Windows */
case IDM_SHOWLOG:
if ((lParam - IDM_SAVED_MIN) / 16 < sesslist.nsessions) {
char *session =
sesslist.sessions[(lParam - IDM_SAVED_MIN) / 16];
- cl = smalloc(16 + strlen(session));
+ cl = snewn(16 + strlen(session), char);
/* 8, but play safe */
if (!cl)
cl = NULL;
sfree(cl);
}
break;
+ case IDM_RESTART:
+ if (!back) {
+ logevent(NULL, "----- Session restarted -----");
+ start_backend();
+ }
+
+ break;
case IDM_RECONF:
{
Config prev_cfg;
}
}
- if (strcmp(prev_cfg.logfilename, cfg.logfilename) ||
- prev_cfg.logtype != cfg.logtype) {
- logfclose(logctx); /* reset logging */
- logfopen(logctx);
- }
+ /* Pass new config data to the logging module */
+ log_reconfig(logctx, &cfg);
sfree(logpal);
/*
* Flush the line discipline's edit buffer in the
* case where local editing has just been disabled.
*/
- ldisc_send(ldisc, NULL, 0, 0);
+ if (ldisc)
+ ldisc_send(ldisc, NULL, 0, 0);
if (pal)
DeleteObject(pal);
logpal = NULL;
cfgtopalette();
init_palette();
- /* Give terminal a heads-up on miscellaneous stuff */
- term_reconfig(term);
+ /* Pass new config data to the terminal */
+ term_reconfig(term, &cfg);
+
+ /* Pass new config data to the back end */
+ if (back)
+ back->reconfig(backhandle, &cfg);
/* Screen size changed ? */
if (cfg.height != prev_cfg.height ||
icon_name);
}
- if (strcmp(cfg.font, prev_cfg.font) != 0 ||
+ if (strcmp(cfg.font.name, prev_cfg.font.name) != 0 ||
strcmp(cfg.line_codepage, prev_cfg.line_codepage) != 0 ||
- cfg.fontisbold != prev_cfg.fontisbold ||
- cfg.fontheight != prev_cfg.fontheight ||
- cfg.fontcharset != prev_cfg.fontcharset ||
+ cfg.font.isbold != prev_cfg.font.isbold ||
+ cfg.font.height != prev_cfg.font.height ||
+ cfg.font.charset != prev_cfg.font.charset ||
cfg.vtmode != prev_cfg.vtmode ||
cfg.bold_colour != prev_cfg.bold_colour ||
cfg.resize_action == RESIZE_DISABLED ||
case IDM_COPYALL:
term_copyall(term);
break;
+ case IDM_PASTE:
+ term_do_paste(term);
+ break;
case IDM_CLRSB:
term_clrsb(term);
break;
case IDM_RESET:
term_pwron(term);
- ldisc_send(ldisc, NULL, 0, 0);
- break;
- case IDM_TEL_AYT:
- back->special(backhandle, TS_AYT);
- net_pending_errors();
- break;
- case IDM_TEL_BRK:
- back->special(backhandle, TS_BRK);
- net_pending_errors();
- break;
- case IDM_TEL_SYNCH:
- back->special(backhandle, TS_SYNCH);
- net_pending_errors();
- break;
- case IDM_TEL_EC:
- back->special(backhandle, TS_EC);
- net_pending_errors();
- break;
- case IDM_TEL_EL:
- back->special(backhandle, TS_EL);
- net_pending_errors();
- break;
- case IDM_TEL_GA:
- back->special(backhandle, TS_GA);
- net_pending_errors();
- break;
- case IDM_TEL_NOP:
- back->special(backhandle, TS_NOP);
- net_pending_errors();
- break;
- case IDM_TEL_ABORT:
- back->special(backhandle, TS_ABORT);
- net_pending_errors();
- break;
- case IDM_TEL_AO:
- back->special(backhandle, TS_AO);
- net_pending_errors();
- break;
- case IDM_TEL_IP:
- back->special(backhandle, TS_IP);
- net_pending_errors();
- break;
- case IDM_TEL_SUSP:
- back->special(backhandle, TS_SUSP);
- net_pending_errors();
- break;
- case IDM_TEL_EOR:
- back->special(backhandle, TS_EOR);
- net_pending_errors();
- break;
- case IDM_TEL_EOF:
- back->special(backhandle, TS_EOF);
- net_pending_errors();
+ if (ldisc)
+ ldisc_send(ldisc, NULL, 0, 0);
break;
case IDM_ABOUT:
showabout(hwnd);
if (wParam >= IDM_SAVED_MIN && wParam <= IDM_SAVED_MAX) {
SendMessage(hwnd, WM_SYSCOMMAND, IDM_SAVEDSESS, wParam);
}
+ if (wParam >= IDM_SPECIAL_MIN && wParam <= IDM_SPECIAL_MAX) {
+ int i = (wParam - IDM_SPECIAL_MIN) / 0x10;
+ /*
+ * Ensure we haven't been sent a bogus SYSCOMMAND
+ * which would cause us to reference invalid memory
+ * and crash. Perhaps I'm just too paranoid here.
+ */
+ if (i >= n_specials)
+ break;
+ if (back)
+ back->special(backhandle, specials[i].code);
+ net_pending_errors();
+ }
}
break;
case WM_LBUTTONUP:
case WM_MBUTTONUP:
case WM_RBUTTONUP:
+ if (message == WM_RBUTTONDOWN &&
+ ((wParam & MK_CONTROL) || (cfg.mouse_is_xterm == 2))) {
+ POINT cursorpos;
+
+ show_mouseptr(1); /* make sure pointer is visible */
+ GetCursorPos(&cursorpos);
+ TrackPopupMenu(popup_menus[CTXMENU].menu,
+ TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON,
+ cursorpos.x, cursorpos.y,
+ 0, hwnd, NULL);
+ break;
+ }
{
int button, press;
* window, we put up the System menu instead of doing
* selection.
*/
- if (is_full_screen() && press && button == MBT_LEFT &&
- X_POS(lParam) == 0 && Y_POS(lParam) == 0) {
- SendMessage(hwnd, WM_SYSCOMMAND, SC_MOUSEMENU, 0);
- return 0;
+ {
+ char mouse_on_hotspot = 0;
+ POINT pt;
+
+ GetCursorPos(&pt);
+#ifndef NO_MULTIMON
+ {
+ HMONITOR mon;
+ MONITORINFO mi;
+
+ mon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL);
+
+ if (mon != NULL) {
+ mi.cbSize = sizeof(MONITORINFO);
+ GetMonitorInfo(mon, &mi);
+
+ if (mi.rcMonitor.left == pt.x &&
+ mi.rcMonitor.top == pt.y) {
+ mouse_on_hotspot = 1;
+ }
+ }
+ }
+#else
+ if (pt.x == 0 && pt.y == 0) {
+ mouse_on_hotspot = 1;
+ }
+#endif
+ if (is_full_screen() && press &&
+ button == MBT_LEFT && mouse_on_hotspot) {
+ SendMessage(hwnd, WM_SYSCOMMAND, SC_MOUSEMENU,
+ MAKELPARAM(pt.x, pt.y));
+ return 0;
+ }
}
+
if (press) {
click(button,
TO_CHR_X(X_POS(lParam)), TO_CHR_Y(Y_POS(lParam)),
is_alt_pressed());
SetCapture(hwnd);
} else {
- term_mouse(term, button, MA_RELEASE,
+ term_mouse(term, button, translate_button(button), MA_RELEASE,
TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
wParam & MK_CONTROL, is_alt_pressed());
}
return 0;
case WM_MOUSEMOVE:
- show_mouseptr(1);
+ {
+ /*
+ * Windows seems to like to occasionally send MOUSEMOVE
+ * events even if the mouse hasn't moved. Don't unhide
+ * the mouse pointer in this case.
+ */
+ static WPARAM wp = 0;
+ static LPARAM lp = 0;
+ if (wParam != wp || lParam != lp ||
+ last_mousemove != WM_MOUSEMOVE) {
+ show_mouseptr(1);
+ wp = wParam; lp = lParam;
+ last_mousemove = WM_MOUSEMOVE;
+ }
+ }
/*
* Add the mouse position and message time to the random
* number noise.
b = MBT_MIDDLE;
else
b = MBT_RIGHT;
- term_mouse(term, b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
+ term_mouse(term, b, translate_button(b), MA_DRAG,
+ TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
wParam & MK_CONTROL, is_alt_pressed());
}
return 0;
case WM_NCMOUSEMOVE:
- show_mouseptr(1);
+ {
+ static WPARAM wp = 0;
+ static LPARAM lp = 0;
+ if (wParam != wp || lParam != lp ||
+ last_mousemove != WM_NCMOUSEMOVE) {
+ show_mouseptr(1);
+ wp = wParam; lp = lParam;
+ last_mousemove = WM_NCMOUSEMOVE;
+ }
+ }
noise_ultralight(lParam);
- return 0;
+ break;
case WM_IGNORE_CLIP:
ignore_clip = wParam; /* don't panic on DESTROYCLIPBOARD */
break;
* we're sent.
*/
term_seen_key_event(term);
- ldisc_send(ldisc, buf, len, 1);
+ if (ldisc)
+ ldisc_send(ldisc, buf, len, 1);
show_mouseptr(0);
}
}
if (n > 0) {
int i;
- buff = (char*) smalloc(n);
+ buff = snewn(n, char);
ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
/*
* Jaeyoun Chung reports that Korean character
*/
term_seen_key_event(term);
for (i = 0; i < n; i += 2) {
- luni_send(ldisc, (unsigned short *)(buff+i), 1, 1);
+ if (ldisc)
+ luni_send(ldisc, (unsigned short *)(buff+i), 1, 1);
}
free(buff);
}
buf[1] = wParam;
buf[0] = wParam >> 8;
term_seen_key_event(term);
- lpage_send(ldisc, kbd_codepage, buf, 2, 1);
+ if (ldisc)
+ lpage_send(ldisc, kbd_codepage, buf, 2, 1);
} else {
char c = (unsigned char) wParam;
term_seen_key_event(term);
- lpage_send(ldisc, kbd_codepage, &c, 1, 1);
+ if (ldisc)
+ lpage_send(ldisc, kbd_codepage, &c, 1, 1);
}
return (0);
case WM_CHAR:
{
char c = (unsigned char)wParam;
term_seen_key_event(term);
- lpage_send(ldisc, CP_ACP, &c, 1, 1);
+ if (ldisc)
+ lpage_send(ldisc, CP_ACP, &c, 1, 1);
}
return 0;
case WM_SETCURSOR:
SetCursor(LoadCursor(NULL, IDC_ARROW));
return TRUE;
}
+ break;
+ case WM_SYSCOLORCHANGE:
+ if (cfg.system_colour) {
+ /* Refresh palette from system colours. */
+ /* XXX actually this zaps the entire palette. */
+ systopalette();
+ init_palette();
+ /* Force a repaint of the terminal window. */
+ term_invalidate(term);
+ }
+ break;
+ case WM_AGENT_CALLBACK:
+ {
+ struct agent_callback *c = (struct agent_callback *)lParam;
+ c->callback(c->callback_ctx, c->data, c->len);
+ sfree(c);
+ }
+ return 0;
default:
if (message == wm_mousewheel || message == WM_MOUSEWHEEL) {
int shift_pressed=0, control_pressed=0;
if (send_raw_mouse &&
!(cfg.mouse_override && shift_pressed)) {
/* send a mouse-down followed by a mouse up */
- term_mouse(term, b,
+ term_mouse(term, b, translate_button(b),
MA_CLICK,
TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), shift_pressed,
control_pressed, is_alt_pressed());
- term_mouse(term, b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
+ term_mouse(term, b, translate_button(b),
+ MA_RELEASE, TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), shift_pressed,
control_pressed, is_alt_pressed());
} else {
*
* We are allowed to fiddle with the contents of `text'.
*/
-void do_text(Context ctx, int x, int y, char *text, int len,
- unsigned long attr, int lattr)
+void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
+ unsigned long attr, int lattr)
{
COLORREF fg, bg, t;
int nfg, nbg, nfont;
HDC hdc = ctx;
RECT line_box;
int force_manual_underline = 0;
- int fnt_width = font_width * (1 + (lattr != LATTR_NORM));
- int char_width = fnt_width;
+ int fnt_width, char_width;
int text_adjust = 0;
static int *IpDx = 0, IpDxLEN = 0;
+ lattr &= LATTR_MODE;
+
+ char_width = fnt_width = font_width * (1 + (lattr != LATTR_NORM));
+
if (attr & ATTR_WIDE)
char_width *= 2;
int i;
if (len > IpDxLEN) {
sfree(IpDx);
- IpDx = smalloc((len + 16) * sizeof(int));
+ IpDx = snewn(len + 16, int);
IpDxLEN = (len + 16);
}
for (i = 0; i < IpDxLEN; i++)
nfont |= FONT_NARROW;
/* Special hack for the VT100 linedraw glyphs. */
- if ((attr & CSET_MASK) == 0x2300) {
- if (text[0] >= (char) 0xBA && text[0] <= (char) 0xBD) {
- switch ((unsigned char) (text[0])) {
- case 0xBA:
- text_adjust = -2 * font_height / 5;
- break;
- case 0xBB:
- text_adjust = -1 * font_height / 5;
- break;
- case 0xBC:
- text_adjust = font_height / 5;
- break;
- case 0xBD:
- text_adjust = 2 * font_height / 5;
- break;
- }
- if (lattr == LATTR_TOP || lattr == LATTR_BOT)
- text_adjust *= 2;
- attr &= ~CSET_MASK;
- text[0] = (char) (unitab_xterm['q'] & CHAR_MASK);
- attr |= (unitab_xterm['q'] & CSET_MASK);
- if (attr & ATTR_UNDER) {
- attr &= ~ATTR_UNDER;
- force_manual_underline = 1;
- }
+ if (text[0] >= 0x23BA && text[0] <= 0x23BD) {
+ switch ((unsigned char) (text[0])) {
+ case 0xBA:
+ text_adjust = -2 * font_height / 5;
+ break;
+ case 0xBB:
+ text_adjust = -1 * font_height / 5;
+ break;
+ case 0xBC:
+ text_adjust = font_height / 5;
+ break;
+ case 0xBD:
+ text_adjust = 2 * font_height / 5;
+ break;
+ }
+ if (lattr == LATTR_TOP || lattr == LATTR_BOT)
+ text_adjust *= 2;
+ text[0] = ucsdata.unitab_xterm['q'];
+ if (attr & ATTR_UNDER) {
+ attr &= ~ATTR_UNDER;
+ force_manual_underline = 1;
}
}
/* Anything left as an original character set is unprintable. */
- if (DIRECT_CHAR(attr)) {
- attr &= ~CSET_MASK;
- attr |= 0xFF00;
- memset(text, 0xFD, len);
+ if (DIRECT_CHAR(text[0])) {
+ int i;
+ for (i = 0; i < len; i++)
+ text[i] = 0xFFFD;
}
/* OEM CP */
- if ((attr & CSET_MASK) == ATTR_OEMCP)
+ if ((text[0] & CSET_MASK) == CSET_OEMCP)
nfont |= FONT_OEM;
- nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
- nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+ nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+ nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
+ nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+ nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
if (bold_mode == BOLD_FONT && (attr & ATTR_BOLD))
nfont |= FONT_BOLD;
if (und_mode == UND_FONT && (attr & ATTR_UNDER))
nbg = t;
}
if (bold_mode == BOLD_COLOURS && (attr & ATTR_BOLD))
- nfg++;
+ nfg |= 1;
if (bold_mode == BOLD_COLOURS && (attr & ATTR_BLINK))
- nbg++;
+ nbg |= 1;
fg = colours[nfg];
bg = colours[nbg];
SelectObject(hdc, fonts[nfont]);
SetTextColor(hdc, fg);
SetBkColor(hdc, bg);
- SetBkMode(hdc, OPAQUE);
+ if (attr & TATTR_COMBINING)
+ SetBkMode(hdc, TRANSPARENT);
+ else
+ SetBkMode(hdc, OPAQUE);
line_box.left = x;
line_box.top = y;
line_box.right = x + char_width * len;
line_box.right = font_width*term->cols+offset_width;
/* We're using a private area for direct to font. (512 chars.) */
- if (dbcs_screenfont && (attr & CSET_MASK) == ATTR_ACP) {
+ if (ucsdata.dbcs_screenfont && (text[0] & CSET_MASK) == CSET_ACP) {
/* Ho Hum, dbcs fonts are a PITA! */
/* To display on W9x I have to convert to UCS */
static wchar_t *uni_buf = 0;
int nlen, mptr;
if (len > uni_len) {
sfree(uni_buf);
- uni_buf = smalloc((uni_len = len) * sizeof(wchar_t));
+ uni_len = len;
+ uni_buf = snewn(uni_len, wchar_t);
}
for(nlen = mptr = 0; mptr<len; mptr++) {
uni_buf[nlen] = 0xFFFD;
- if (IsDBCSLeadByteEx(font_codepage, (BYTE) text[mptr])) {
+ if (IsDBCSLeadByteEx(ucsdata.font_codepage, (BYTE) text[mptr])) {
+ char dbcstext[2];
+ dbcstext[0] = text[mptr] & 0xFF;
+ dbcstext[1] = text[mptr+1] & 0xFF;
IpDx[nlen] += char_width;
- MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
- text+mptr, 2, uni_buf+nlen, 1);
+ MultiByteToWideChar(ucsdata.font_codepage, MB_USEGLYPHCHARS,
+ dbcstext, 2, uni_buf+nlen, 1);
mptr++;
}
else
{
- MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
- text+mptr, 1, uni_buf+nlen, 1);
+ char dbcstext[1];
+ dbcstext[0] = text[mptr] & 0xFF;
+ MultiByteToWideChar(ucsdata.font_codepage, MB_USEGLYPHCHARS,
+ dbcstext, 1, uni_buf+nlen, 1);
}
nlen++;
}
}
IpDx[0] = -1;
- } else if (DIRECT_FONT(attr)) {
+ } else if (DIRECT_FONT(text[0])) {
+ static char *directbuf = NULL;
+ static int directlen = 0;
+ int i;
+ if (len > directlen) {
+ directlen = len;
+ directbuf = sresize(directbuf, directlen, char);
+ }
+
+ for (i = 0; i < len; i++)
+ directbuf[i] = text[i] & 0xFF;
+
ExtTextOut(hdc, x,
y - font_height * (lattr == LATTR_BOT) + text_adjust,
- ETO_CLIPPED | ETO_OPAQUE, &line_box, text, len, IpDx);
+ ETO_CLIPPED | ETO_OPAQUE, &line_box, directbuf, len, IpDx);
if (bold_mode == BOLD_SHADOW && (attr & ATTR_BOLD)) {
SetBkMode(hdc, TRANSPARENT);
ExtTextOut(hdc, x - 1,
y - font_height * (lattr ==
LATTR_BOT) + text_adjust,
- ETO_CLIPPED, &line_box, text, len, IpDx);
+ ETO_CLIPPED, &line_box, directbuf, len, IpDx);
}
} else {
/* And 'normal' unicode characters */
static WCHAR *wbuf = NULL;
static int wlen = 0;
int i;
+
if (wlen < len) {
sfree(wbuf);
wlen = len;
- wbuf = smalloc(wlen * sizeof(WCHAR));
+ wbuf = snewn(wlen, WCHAR);
}
+
for (i = 0; i < len; i++)
- wbuf[i] = (WCHAR) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
+ wbuf[i] = text[i];
- ExtTextOutW(hdc, x,
+ /* print Glyphs as they are, without Windows' Shaping*/
+ exact_textout(hdc, x, y - font_height * (lattr == LATTR_BOT) + text_adjust,
+ &line_box, wbuf, len, IpDx, !(attr & TATTR_COMBINING));
+/* ExtTextOutW(hdc, x,
y - font_height * (lattr == LATTR_BOT) + text_adjust,
ETO_CLIPPED | ETO_OPAQUE, &line_box, wbuf, len, IpDx);
+ */
/* And the shadow bold hack. */
if (bold_mode == BOLD_SHADOW && (attr & ATTR_BOLD)) {
}
}
-void do_cursor(Context ctx, int x, int y, char *text, int len,
+/*
+ * Wrapper that handles combining characters.
+ */
+void do_text(Context ctx, int x, int y, wchar_t *text, int len,
+ unsigned long attr, int lattr)
+{
+ if (attr & TATTR_COMBINING) {
+ unsigned long a = 0;
+ attr &= ~TATTR_COMBINING;
+ while (len--) {
+ do_text_internal(ctx, x, y, text, 1, attr | a, lattr);
+ text++;
+ a = TATTR_COMBINING;
+ }
+ } else
+ do_text_internal(ctx, x, y, text, len, attr, lattr);
+}
+
+void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
unsigned long attr, int lattr)
{
int ctype = cfg.cursor_type;
if ((attr & TATTR_ACTCURS) && (ctype == 0 || term->big_cursor)) {
- if (((attr & CSET_MASK) | (unsigned char) *text) != UCSWIDE) {
+ if (*text != UCSWIDE) {
do_text(ctx, x, y, text, len, attr, lattr);
return;
}
if (!font_dualwidth) return 1;
switch (uc & CSET_MASK) {
- case ATTR_ASCII:
- uc = unitab_line[uc & 0xFF];
+ case CSET_ASCII:
+ uc = ucsdata.unitab_line[uc & 0xFF];
break;
- case ATTR_LINEDRW:
- uc = unitab_xterm[uc & 0xFF];
+ case CSET_LINEDRW:
+ uc = ucsdata.unitab_xterm[uc & 0xFF];
break;
- case ATTR_SCOACS:
- uc = unitab_scoacs[uc & 0xFF];
+ case CSET_SCOACS:
+ uc = ucsdata.unitab_scoacs[uc & 0xFF];
break;
}
if (DIRECT_FONT(uc)) {
- if (dbcs_screenfont) return 1;
+ if (ucsdata.dbcs_screenfont) return 1;
/* Speedup, I know of no font where ascii is the wrong width */
- if ((uc&CHAR_MASK) >= ' ' && (uc&CHAR_MASK)<= '~')
+ if ((uc&~CSET_MASK) >= ' ' && (uc&~CSET_MASK)<= '~')
return 1;
- if ( (uc & CSET_MASK) == ATTR_ACP ) {
+ if ( (uc & CSET_MASK) == CSET_ACP ) {
SelectObject(hdc, fonts[FONT_NORMAL]);
- } else if ( (uc & CSET_MASK) == ATTR_OEMCP ) {
+ } else if ( (uc & CSET_MASK) == CSET_OEMCP ) {
another_font(FONT_OEM);
if (!fonts[FONT_OEM]) return 0;
} else
return 0;
- if ( GetCharWidth32(hdc, uc&CHAR_MASK, uc&CHAR_MASK, &ibuf) != 1 &&
- GetCharWidth(hdc, uc&CHAR_MASK, uc&CHAR_MASK, &ibuf) != 1)
+ if ( GetCharWidth32(hdc, uc&~CSET_MASK, uc&~CSET_MASK, &ibuf) != 1 &&
+ GetCharWidth(hdc, uc&~CSET_MASK, uc&~CSET_MASK, &ibuf) != 1)
return 0;
} else {
/* Speedup, I know of no font where ascii is the wrong width */
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;
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
- if ((cfg.funky_type == 3 ||
- (cfg.funky_type <= 1 && term->app_keypad_keys &&
+ if ((cfg.funky_type == FUNKY_VT400 ||
+ (cfg.funky_type <= FUNKY_LINUX && term->app_keypad_keys &&
!cfg.no_applic_k))
&& wParam == VK_NUMLOCK && !(keystate[VK_SHIFT] & 0x80)) {
/* Sanitize the number pad if not using a PC NumPad */
if (left_alt || (term->app_keypad_keys && !cfg.no_applic_k
- && cfg.funky_type != 2)
- || cfg.funky_type == 3 || cfg.nethack_keypad || compose_state) {
+ && cfg.funky_type != FUNKY_XTERM)
+ || cfg.funky_type == FUNKY_VT400 || cfg.nethack_keypad || compose_state) {
if ((HIWORD(lParam) & KF_EXTENDED) == 0) {
int nParam = 0;
switch (wParam) {
SendMessage(hwnd, WM_VSCROLL, SB_PAGEUP, 0);
return 0;
}
+ if (wParam == VK_PRIOR && shift_state == 2) {
+ SendMessage(hwnd, WM_VSCROLL, SB_LINEUP, 0);
+ return 0;
+ }
if (wParam == VK_NEXT && shift_state == 1) {
SendMessage(hwnd, WM_VSCROLL, SB_PAGEDOWN, 0);
return 0;
}
+ if (wParam == VK_NEXT && shift_state == 2) {
+ SendMessage(hwnd, WM_VSCROLL, SB_LINEDOWN, 0);
+ return 0;
+ }
if (wParam == VK_INSERT && shift_state == 1) {
term_do_paste(term);
return 0;
if (!left_alt) {
int xkey = 0;
- if (cfg.funky_type == 3 ||
- (cfg.funky_type <= 1 &&
+ if (cfg.funky_type == FUNKY_VT400 ||
+ (cfg.funky_type <= FUNKY_LINUX &&
term->app_keypad_keys && !cfg.no_applic_k)) switch (wParam) {
case VK_EXECUTE:
xkey = 'P';
xkey = 'n';
break;
case VK_ADD:
- if (cfg.funky_type == 2) {
+ if (cfg.funky_type == FUNKY_XTERM) {
if (shift_state)
xkey = 'l';
else
break;
case VK_DIVIDE:
- if (cfg.funky_type == 2)
+ if (cfg.funky_type == FUNKY_XTERM)
xkey = 'o';
break;
case VK_MULTIPLY:
- if (cfg.funky_type == 2)
+ if (cfg.funky_type == FUNKY_XTERM)
xkey = 'j';
break;
case VK_SUBTRACT:
- if (cfg.funky_type == 2)
+ if (cfg.funky_type == FUNKY_XTERM)
xkey = 'm';
break;
*p++ = "\000\033\034\035\036\037\177"[wParam - '2'];
return p - output;
}
- if (shift_state == 2 && wParam == 0xBD) {
+ if (shift_state == 2 && (wParam == 0xBD || wParam == 0xBF)) {
*p++ = 0x1F;
return p - output;
}
*p++ = 0x1C;
return p - output;
}
+ if (shift_state == 3 && wParam == 0xDE) {
+ *p++ = 0x1E; /* Ctrl-~ == Ctrl-^ in xterm at least */
+ return p - output;
+ }
if (shift_state == 0 && wParam == VK_RETURN && term->cr_lf_return) {
*p++ = '\r';
*p++ = '\n';
break;
}
/* Reorder edit keys to physical order */
- if (cfg.funky_type == 3 && code <= 6)
+ if (cfg.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 == 5 && /* SCO function keys */
+ if (cfg.funky_type == FUNKY_SCO && /* SCO function keys */
code >= 11 && code <= 34) {
char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
int index = 0;
p += sprintf((char *) p, "\x1B[%c", codes[index]);
return p - output;
}
- if (cfg.funky_type == 5 && /* SCO small keypad */
+ if (cfg.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 == 4) && code >= 11 && code <= 24) {
+ if ((term->vt52_mode || cfg.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 == 1 && code >= 11 && code <= 15) {
+ if (cfg.funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
p += sprintf((char *) p, "\x1B[[%c", code + 'A' - 11);
return p - output;
}
- if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
+ if (cfg.funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
if (term->vt52_mode)
p += sprintf((char *) p, "\x1B%c", code + 'P' - 11);
else
keystate[VK_CAPITAL] = 0;
}
- r = ToAsciiEx(wParam, scan, keystate, keys, 0, kbd_layout);
+ /* XXX how do we know what the max size of the keys array should
+ * be is? There's indication on MS' website of an Inquire/InquireEx
+ * functioning returning a KBINFO structure which tells us. */
+ if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+ /* XXX 'keys' parameter is declared in MSDN documentation as
+ * 'LPWORD lpChar'.
+ * The experience of a French user indicates that on
+ * Win98, WORD[] should be passed in, but on Win2K, it should
+ * be BYTE[]. German WinXP and my Win2K with "US International"
+ * driver corroborate this.
+ * Experimentally I've conditionalised the behaviour on the
+ * Win9x/NT split, but I suspect it's worse than that.
+ * See wishlist item `win-dead-keys' for more horrible detail
+ * and speculations. */
+ BYTE keybs[3];
+ int i;
+ r = ToAsciiEx(wParam, scan, keystate, (LPWORD)keybs, 0, kbd_layout);
+ for (i=0; i<3; i++) keys[i] = keybs[i];
+ } else {
+ r = ToAsciiEx(wParam, scan, keystate, keys, 0, kbd_layout);
+ }
#ifdef SHOW_TOASCII_RESULT
if (r == 1 && !key_down) {
if (alt_sum) {
- if (in_utf(term) || dbcs_screenfont)
+ if (in_utf(term) || ucsdata.dbcs_screenfont)
debug((", (U+%04x)", alt_sum));
else
debug((", LCH(%d)", alt_sum));
}
keybuf = nc;
term_seen_key_event(term);
- luni_send(ldisc, &keybuf, 1, 1);
+ if (ldisc)
+ luni_send(ldisc, &keybuf, 1, 1);
continue;
}
if (!key_down) {
if (alt_sum) {
- if (in_utf(term) || dbcs_screenfont) {
+ if (in_utf(term) || ucsdata.dbcs_screenfont) {
keybuf = alt_sum;
term_seen_key_event(term);
- luni_send(ldisc, &keybuf, 1, 1);
+ if (ldisc)
+ luni_send(ldisc, &keybuf, 1, 1);
} else {
ch = (char) alt_sum;
/*
* everything we're sent.
*/
term_seen_key_event(term);
- ldisc_send(ldisc, &ch, 1, 1);
+ if (ldisc)
+ ldisc_send(ldisc, &ch, 1, 1);
}
alt_sum = 0;
- } else
+ } else {
term_seen_key_event(term);
- lpage_send(ldisc, kbd_codepage, &ch, 1, 1);
+ if (ldisc)
+ lpage_send(ldisc, kbd_codepage, &ch, 1, 1);
+ }
} else {
if(capsOn && ch < 0x80) {
WCHAR cbuf[2];
cbuf[0] = 27;
cbuf[1] = xlat_uskbd2cyrllic(ch);
term_seen_key_event(term);
- luni_send(ldisc, cbuf+!left_alt, 1+!!left_alt, 1);
+ if (ldisc)
+ luni_send(ldisc, cbuf+!left_alt, 1+!!left_alt, 1);
} else {
char cbuf[2];
cbuf[0] = '\033';
cbuf[1] = ch;
term_seen_key_event(term);
- lpage_send(ldisc, kbd_codepage,
- cbuf+!left_alt, 1+!!left_alt, 1);
+ if (ldisc)
+ lpage_send(ldisc, kbd_codepage,
+ cbuf+!left_alt, 1+!!left_alt, 1);
}
}
show_mouseptr(0);
if (!left_alt)
keys[0] = 0;
/* If we will be using alt_sum fix the 256s */
- else if (keys[0] && (in_utf(term) || dbcs_screenfont))
+ else if (keys[0] && (in_utf(term) || ucsdata.dbcs_screenfont))
keys[0] = 10;
}
void set_title(void *frontend, char *title)
{
sfree(window_name);
- window_name = smalloc(1 + strlen(title));
+ window_name = snewn(1 + strlen(title), char);
strcpy(window_name, title);
if (cfg.win_name_always || !IsIconic(hwnd))
SetWindowText(hwnd, title);
void set_icon(void *frontend, char *title)
{
sfree(icon_name);
- icon_name = smalloc(1 + strlen(title));
+ icon_name = snewn(1 + strlen(title), char);
strcpy(icon_name, title);
if (!cfg.win_name_always && IsIconic(hwnd))
SetWindowText(hwnd, title);
get_unitab(CP_ACP, unitab, 0);
- rtfsize = 100 + strlen(cfg.font);
- rtf = smalloc(rtfsize);
+ rtfsize = 100 + strlen(cfg.font.name);
+ rtf = snewn(rtfsize, char);
sprintf(rtf, "{\\rtf1\\ansi%d{\\fonttbl\\f0\\fmodern %s;}\\f0",
- GetACP(), cfg.font);
+ GetACP(), cfg.font.name);
rtflen = strlen(rtf);
/*
if (rtfsize < rtflen + totallen + 3) {
rtfsize = rtflen + totallen + 512;
- rtf = srealloc(rtf, rtfsize);
+ rtf = sresize(rtf, rtfsize, char);
}
strcpy(rtf + rtflen, before); rtflen += blen;
CloseClipboard();
s = GlobalLock(clipdata);
i = MultiByteToWideChar(CP_ACP, 0, s, strlen(s) + 1, 0, 0);
- *p = converted = smalloc(i * sizeof(wchar_t));
+ *p = converted = snewn(i, wchar_t);
MultiByteToWideChar(CP_ACP, 0, s, strlen(s) + 1, converted, i);
*len = i - 1;
return;
void fatalbox(char *fmt, ...)
{
va_list ap;
- char stuff[200];
+ char *stuff, morestuff[100];
va_start(ap, fmt);
- vsprintf(stuff, fmt, ap);
+ stuff = dupvprintf(fmt, ap);
va_end(ap);
- MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
+ sprintf(morestuff, "%.70s Fatal Error", appname);
+ MessageBox(hwnd, stuff, morestuff, MB_ICONERROR | MB_OK);
+ sfree(stuff);
cleanup_exit(1);
}
void modalfatalbox(char *fmt, ...)
{
va_list ap;
- char stuff[200];
+ char *stuff, morestuff[100];
va_start(ap, fmt);
- vsprintf(stuff, fmt, ap);
+ stuff = dupvprintf(fmt, ap);
va_end(ap);
- MessageBox(hwnd, stuff, "PuTTY Fatal Error",
+ sprintf(morestuff, "%.70s Fatal Error", appname);
+ MessageBox(hwnd, stuff, morestuff,
MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
+ sfree(stuff);
cleanup_exit(1);
}
*/
lastbeep = GetTickCount();
} else if (mode == BELL_WAVEFILE) {
- if (!PlaySound(cfg.bell_wavefile, NULL, SND_ASYNC | SND_FILENAME)) {
- char buf[sizeof(cfg.bell_wavefile) + 80];
+ if (!PlaySound(cfg.bell_wavefile.path, NULL,
+ SND_ASYNC | SND_FILENAME)) {
+ char buf[sizeof(cfg.bell_wavefile.path) + 80];
+ char otherbuf[100];
sprintf(buf, "Unable to play sound file\n%s\n"
- "Using default sound instead", cfg.bell_wavefile);
- MessageBox(hwnd, buf, "PuTTY Sound Error",
+ "Using default sound instead", cfg.bell_wavefile.path);
+ sprintf(otherbuf, "%.70s Sound Error", appname);
+ MessageBox(hwnd, buf, otherbuf,
MB_OK | MB_ICONEXCLAMATION);
cfg.beep = BELL_DEFAULT;
}
+ } else if (mode == BELL_PCSPEAKER) {
+ static long lastbeep = 0;
+ long beepdiff;
+
+ beepdiff = GetTickCount() - lastbeep;
+ if (beepdiff >= 0 && beepdiff < 50)
+ return;
+
+ /*
+ * We must beep in different ways depending on whether this
+ * is a 95-series or NT-series OS.
+ */
+ if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT)
+ Beep(800, 100);
+ else
+ MessageBeep(-1);
+ lastbeep = GetTickCount();
}
/* Otherwise, either visual bell or disabled; do nothing here */
if (!term->has_focus) {
/*
* See if we're in full-screen mode.
*/
-int is_full_screen()
+static int is_full_screen()
{
if (!IsZoomed(hwnd))
return FALSE;
* one monitor is present. */
static int get_fullscreen_rect(RECT * ss)
{
-#ifdef MONITOR_DEFAULTTONEAREST
+#if defined(MONITOR_DEFAULTTONEAREST) && !defined(NO_MULTIMON)
HMONITOR mon;
MONITORINFO mi;
mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
* Go full-screen. This should only be called when we are already
* maximised.
*/
-void make_full_screen()
+static void make_full_screen()
{
DWORD style;
RECT ss;
/*
* Clear the full-screen attributes.
*/
-void clear_full_screen()
+static void clear_full_screen()
{
DWORD oldstyle, style;
/*
* Toggle full-screen mode.
*/
-void flip_full_screen()
+static void flip_full_screen()
{
if (is_full_screen()) {
ShowWindow(hwnd, SW_RESTORE);
*/
return;
}
+
+int from_backend(void *frontend, int is_stderr, const char *data, int len)
+{
+ return term_data(term, is_stderr, data, len);
+}
+
+void agent_schedule_callback(void (*callback)(void *, void *, int),
+ void *callback_ctx, void *data, int len)
+{
+ struct agent_callback *c = snew(struct agent_callback);
+ c->callback = callback;
+ c->callback_ctx = callback_ctx;
+ c->data = data;
+ c->len = len;
+ PostMessage(hwnd, WM_AGENT_CALLBACK, 0, (LPARAM)c);
+}
projects / u / mdw / putty / blobdiff