#include <windows.h>
#include <commctrl.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
+#include <time.h>
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
+#include "winstuff.h"
+#include "storage.h"
#include "win_res.h"
#define IDM_SHOWLOG 0x0010
#define WM_IGNORE_SIZE (WM_XUSER + 1)
#define WM_IGNORE_CLIP (WM_XUSER + 2)
+/* Needed for Chinese support and apparently not always defined. */
+#ifndef VK_PROCESSKEY
+#define VK_PROCESSKEY 0xE5
+#endif
+
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 LPARAM pend_netevent_lParam = 0;
static void enact_pending_netevent(void);
+static time_t last_movement = 0;
+
#define FONT_NORMAL 0
#define FONT_BOLD 1
#define FONT_UNDERLINE 2
#define FONT_OEMBOLDUND 6
#define FONT_OEMUND 7
static HFONT fonts[8];
+static int font_needs_hand_underlining;
static enum {
BOLD_COLOURS, BOLD_SHADOW, BOLD_FONT
} bold_mode;
static HWND hwnd;
+static HBITMAP caretbm;
+
static int dbltime, lasttime, lastact;
static Mouse_Button lastbtn;
static char *window_name, *icon_name;
+static Ldisc *real_ldisc;
+
+void begin_session(void) {
+ ldisc = real_ldisc;
+}
+
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
static char appname[] = "PuTTY";
WORD winsock_ver;
MSG msg;
int guess_width, guess_height;
- putty_inst = inst;
+ hinst = inst;
+ flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
winsock_ver = MAKEWORD(1, 1);
if (WSAStartup(winsock_ver, &wsadata)) {
return 1;
}
/* WISHLIST: maybe allow config tweaking even if winsock not present? */
+ sk_init();
InitCommonControls();
+ /* Ensure a Maximize setting in Explorer doesn't maximise the
+ * config box. */
+ defuse_showwindow();
+
/*
* Process the command line.
*/
default_protocol = DEFAULT_PROTOCOL;
default_port = DEFAULT_PORT;
- do_defaults(NULL);
+ do_defaults(NULL, &cfg);
p = cmdline;
while (*p && isspace(*p)) p++;
tolower(p[1]) == 'o' &&
tolower(p[2]) == 'g') {
logfile = "putty.log";
+ } else if (q == p + 7 &&
+ tolower(p[0]) == 'c' &&
+ tolower(p[1]) == 'l' &&
+ tolower(p[2]) == 'e' &&
+ tolower(p[3]) == 'a' &&
+ tolower(p[4]) == 'n' &&
+ tolower(p[5]) == 'u' &&
+ tolower(p[6]) == 'p') {
+ /*
+ * `putty -cleanup'. Remove all registry 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"
+ "\n"
+ "THIS PROCESS WILL DESTROY YOUR SAVED\n"
+ "SESSIONS. Are you really sure you want\n"
+ "to continue?",
+ "PuTTY Warning",
+ MB_YESNO | MB_ICONWARNING) == IDYES) {
+ cleanup_all();
+ }
+ exit(0);
}
p = q + strspn(q, " \t");
}
* An initial @ means to activate a saved session.
*/
if (*p == '@') {
- do_defaults (p+1);
+ int i = strlen(p);
+ while (i > 1 && isspace(p[i-1]))
+ i--;
+ p[i] = '\0';
+ do_defaults (p+1, &cfg);
if (!*cfg.host && !do_config()) {
WSACleanup();
return 0;
return 0;
}
}
+
+ /* See if host is of the form user@host */
+ if (cfg.host[0] != '\0') {
+ char *atsign = strchr(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';
+ }
+ memmove(cfg.host, atsign+1, 1+strlen(atsign+1));
+ }
+ }
}
/*
}
}
- ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
+ real_ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
+ /* To start with, we use the simple line discipline, so we can
+ * type passwords etc without fear of them being echoed... */
+ ldisc = &ldisc_simple;
if (!prev) {
wndclass.style = 0;
}
{
- int winmode = WS_OVERLAPPEDWINDOW|WS_VSCROLL;
- if (!cfg.scrollbar) winmode &= ~(WS_VSCROLL);
- if (cfg.locksize) winmode &= ~(WS_THICKFRAME|WS_MAXIMIZEBOX);
- hwnd = CreateWindow (appname, appname,
- winmode,
- CW_USEDEFAULT, CW_USEDEFAULT,
- guess_width, guess_height,
- NULL, NULL, inst, NULL);
+ int winmode = WS_OVERLAPPEDWINDOW|WS_VSCROLL;
+ if (!cfg.scrollbar) winmode &= ~(WS_VSCROLL);
+ if (cfg.locksize) winmode &= ~(WS_THICKFRAME|WS_MAXIMIZEBOX);
+ hwnd = CreateWindow (appname, appname,
+ winmode,
+ CW_USEDEFAULT, CW_USEDEFAULT,
+ guess_width, guess_height,
+ NULL, NULL, inst, NULL);
}
/*
SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER);
/*
+ * Set up a caret bitmap, with no content.
+ */
+ {
+ char *bits;
+ int size = (font_width+15)/16 * 2 * font_height;
+ bits = calloc(size, 1);
+ caretbm = CreateBitmap(font_width, font_height, 1, 1, bits);
+ free(bits);
+ }
+
+ /*
* Initialise the scroll bar.
*/
{
*/
{
char *error;
- char msg[1024];
+ char msg[1024], *title;
char *realhost;
- error = back->init (hwnd, cfg.host, cfg.port, &realhost);
+ error = back->init (cfg.host, cfg.port, &realhost);
if (error) {
sprintf(msg, "Unable to open connection:\n%s", error);
MessageBox(NULL, msg, "PuTTY Error", MB_ICONERROR | MB_OK);
return 0;
}
window_name = icon_name = NULL;
- sprintf(msg, "%s - PuTTY", realhost);
- set_title (msg);
- set_icon (msg);
+ if (*cfg.wintitle) {
+ title = cfg.wintitle;
+ } else {
+ sprintf(msg, "%s - PuTTY", realhost);
+ title = msg;
+ }
+ set_title (title);
+ set_icon (title);
}
session_closed = FALSE;
has_focus = (GetForegroundWindow() == hwnd);
UpdateWindow (hwnd);
+ if (GetMessage (&msg, NULL, 0, 0) == 1)
{
int timer_id = 0, long_timer = 0;
- while (GetMessage (&msg, NULL, 0, 0) == 1) {
+ while (msg.message != WM_QUIT) {
/* Sometimes DispatchMessage calls routines that use their own
* GetMessage loop, setup this timer so we get some control back.
*
timer_id = SetTimer(hwnd, 1, 20, NULL);
DispatchMessage (&msg);
- /* This is too fast, but I'll leave it for now 'cause it shows
- * how often term_update is called (far too often at times!)
- */
+ /* Make sure we blink everything that needs it. */
term_blink(0);
/* Send the paste buffer if there's anything to send */
* we've delayed, reading the socket, writing, and repainting
* the window.
*/
- if (!PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) {
- if (pending_netevent) {
- enact_pending_netevent();
+ if (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+ continue;
- term_blink(1);
- }
- } else continue;
- if (!PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) {
- if (timer_id) {
- KillTimer(hwnd, timer_id);
- timer_id = 0;
- }
- if (inbuf_head)
- term_out();
- term_update();
- if (!has_focus)
- timer_id = SetTimer(hwnd, 1, 2000, NULL);
- else if (cfg.blinktext)
- timer_id = SetTimer(hwnd, 1, 250, NULL);
- else
- timer_id = SetTimer(hwnd, 1, 500, NULL);
- long_timer = 1;
+ if (pending_netevent) {
+ enact_pending_netevent();
+
+ /* Force the cursor blink on */
+ term_blink(1);
+
+ if (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+ continue;
+ }
+
+ /* Okay there is now nothing to do so we make sure the screen is
+ * completely up to date then tell windows to call us in a little
+ * while.
+ */
+ if (timer_id) {
+ KillTimer(hwnd, timer_id);
+ timer_id = 0;
}
+ HideCaret(hwnd);
+ if (inbuf_head)
+ term_out();
+ term_update();
+ ShowCaret(hwnd);
+ if (!has_focus)
+ timer_id = SetTimer(hwnd, 1, 59500, NULL);
+ else
+ timer_id = SetTimer(hwnd, 1, 250, NULL);
+ long_timer = 1;
+
+ /* There's no point rescanning everything in the message queue
+ * so we do an apperently unneccesary wait here
+ */
+ WaitMessage();
+ if (GetMessage (&msg, NULL, 0, 0) != 1)
+ break;
}
}
}
/*
+ * Set up, or shut down, an AsyncSelect. Called from winnet.c.
+ */
+char *do_select(SOCKET skt, int startup) {
+ int msg, events;
+ if (startup) {
+ msg = WM_NETEVENT;
+ events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE;
+ } else {
+ msg = events = 0;
+ }
+ if (!hwnd)
+ return "do_select(): internal error (hwnd==NULL)";
+ if (WSAAsyncSelect (skt, hwnd, msg, events) == SOCKET_ERROR) {
+ switch (WSAGetLastError()) {
+ case WSAENETDOWN: return "Network is down";
+ default: return "WSAAsyncSelect(): unknown error";
+ }
+ }
+ return NULL;
+}
+
+/*
+ * Print a message box and close the connection.
+ */
+void connection_fatal(char *fmt, ...) {
+ va_list ap;
+ char stuff[200];
+
+ va_start(ap, fmt);
+ vsprintf(stuff, fmt, ap);
+ va_end(ap);
+ MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
+ if (cfg.close_on_exit)
+ PostQuitMessage(1);
+ else {
+ session_closed = TRUE;
+ SetWindowText (hwnd, "PuTTY (inactive)");
+ }
+}
+
+/*
* Actually do the job requested by a WM_NETEVENT
*/
static void enact_pending_netevent(void) {
- int i;
+ static int reentering = 0;
+ extern int select_result(WPARAM, LPARAM);
+ int ret;
+
+ if (reentering)
+ return; /* don't unpend the pending */
+
pending_netevent = FALSE;
- i = back->msg (pend_netevent_wParam, pend_netevent_lParam);
- if (i < 0) {
- char buf[1024];
- switch (WSABASEERR + (-i) % 10000) {
- case WSAECONNRESET:
- sprintf(buf, "Connection reset by peer");
- break;
- default:
- sprintf(buf, "Unexpected network error %d", -i);
- break;
- }
- MessageBox(hwnd, buf, "PuTTY Fatal Error",
- MB_ICONERROR | MB_OK);
- PostQuitMessage(1);
- } else if (i == 0) {
+ reentering = 1;
+ ret = select_result (pend_netevent_wParam, pend_netevent_lParam);
+ reentering = 0;
+
+ if (ret == 0) {
if (cfg.close_on_exit)
PostQuitMessage(0);
else {
if (cfg.fontisbold) {
fw_dontcare = FW_BOLD;
- fw_bold = FW_BLACK;
+ fw_bold = FW_HEAVY;
} else {
fw_dontcare = FW_DONTCARE;
fw_bold = FW_BOLD;
f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE);
+ /*
+ * Some fonts, e.g. 9-pt Courier, draw their underlines
+ * outside their character cell. We successfully prevent
+ * screen corruption by clipping the text output, but then
+ * we lose the underline completely. Here we try to work
+ * out whether this is such a font, and if it is, we set a
+ * flag that causes underlines to be drawn by hand.
+ *
+ * Having tried other more sophisticated approaches (such
+ * as examining the TEXTMETRIC structure or requesting the
+ * height of a string), I think we'll do this the brute
+ * force way: we create a small bitmap, draw an underlined
+ * space on it, and test to see whether any pixels are
+ * foreground-coloured. (Since we expect the underline to
+ * go all the way across the character cell, we only search
+ * down a single column of the bitmap, half way across.)
+ */
+ {
+ HDC und_dc;
+ HBITMAP und_bm, und_oldbm;
+ int i, gotit;
+ COLORREF c;
+
+ und_dc = CreateCompatibleDC(hdc);
+ und_bm = CreateCompatibleBitmap(hdc, font_width, font_height);
+ und_oldbm = SelectObject(und_dc, und_bm);
+ SelectObject(und_dc, fonts[FONT_UNDERLINE]);
+ SetTextAlign(und_dc, TA_TOP | TA_LEFT | TA_NOUPDATECP);
+ SetTextColor (und_dc, RGB(255,255,255));
+ SetBkColor (und_dc, RGB(0,0,0));
+ SetBkMode (und_dc, OPAQUE);
+ ExtTextOut (und_dc, 0, 0, ETO_OPAQUE, NULL, " ", 1, NULL);
+ gotit = FALSE;
+ for (i = 0; i < font_height; i++) {
+ c = GetPixel(und_dc, font_width/2, i);
+ if (c != RGB(0,0,0))
+ gotit = TRUE;
+ }
+ SelectObject(und_dc, und_oldbm);
+ DeleteObject(und_bm);
+ DeleteDC(und_dc);
+ font_needs_hand_underlining = !gotit;
+ }
+
if (bold_mode == BOLD_FONT) {
f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
f(FONT_BOLDUND, cfg.fontcharset, fw_bold, TRUE);
static int ignore_size = FALSE;
static int ignore_clip = FALSE;
static int just_reconfigged = FALSE;
+ static int resizing = FALSE;
switch (message) {
case WM_TIMER:
enact_pending_netevent();
if (inbuf_head)
term_out();
+ HideCaret(hwnd);
term_update();
+ ShowCaret(hwnd);
+ if (cfg.ping_interval > 0)
+ {
+ time_t now;
+ time(&now);
+ if (now-last_movement > cfg.ping_interval * 60 - 10)
+ {
+ back->special(TS_PING);
+ last_movement = now;
+ }
+ }
return 0;
case WM_CREATE:
break;
case WM_PAINT:
{
PAINTSTRUCT p;
+ HideCaret(hwnd);
hdc = BeginPaint (hwnd, &p);
if (pal) {
SelectPalette (hdc, pal, TRUE);
SelectObject (hdc, GetStockObject(SYSTEM_FONT));
SelectObject (hdc, GetStockObject(WHITE_PEN));
EndPaint (hwnd, &p);
+ ShowCaret(hwnd);
}
return 0;
case WM_NETEVENT:
pending_netevent = TRUE;
pend_netevent_wParam=wParam;
pend_netevent_lParam=lParam;
+ time(&last_movement);
return 0;
case WM_SETFOCUS:
has_focus = TRUE;
+ CreateCaret(hwnd, caretbm, 0, 0);
+ ShowCaret(hwnd);
term_out();
term_update();
break;
case WM_KILLFOCUS:
has_focus = FALSE;
+ DestroyCaret();
term_out();
term_update();
break;
break;
case WM_ENTERSIZEMOVE:
EnableSizeTip(1);
+ resizing = TRUE;
break;
case WM_EXITSIZEMOVE:
EnableSizeTip(0);
+ resizing = FALSE;
+ back->size();
break;
case WM_SIZING:
{
if (w != cols || h != rows || just_reconfigged) {
term_invalidate();
term_size (h, w, cfg.savelines);
- back->size();
+ /*
+ * Don't call back->size in mid-resize. (To prevent
+ * massive numbers of resize events getting sent
+ * down the connection during an NT opaque drag.)
+ */
+ if (!resizing)
+ back->size();
just_reconfigged = FALSE;
}
}
unsigned char buf[20];
int len;
- len = TranslateKey (message, wParam, lParam, buf);
- if (len == -1)
- return DefWindowProc (hwnd, message, wParam, lParam);
- ldisc->send (buf, len);
+ if (wParam==VK_PROCESSKEY) {
+ MSG m;
+ m.hwnd = hwnd;
+ m.message = WM_KEYDOWN;
+ m.wParam = wParam;
+ m.lParam = lParam & 0xdfff;
+ TranslateMessage(&m);
+ } else {
+ len = TranslateKey (message, wParam, lParam, buf);
+ if (len == -1)
+ return DefWindowProc (hwnd, message, wParam, lParam);
+ ldisc->send (buf, len);
+ }
}
return 0;
+ case WM_IME_CHAR:
+ {
+ unsigned char buf[2];
+
+ buf[1] = wParam;
+ buf[0] = wParam >> 8;
+ ldisc->send (buf, 2);
+ }
case WM_CHAR:
case WM_SYSCHAR:
/*
}
/*
+ * Move the system caret. (We maintain one, even though it's
+ * invisible, for the benefit of blind people: apparently some
+ * helper software tracks the system caret, so we should arrange to
+ * have one.)
+ */
+void sys_cursor(int x, int y) {
+ SetCaretPos(x * font_width, y * font_height);
+}
+
+/*
* Draw a line of text in the window, at given character
* coordinates, in given attributes.
*
RECT line_box;
int force_manual_underline = 0;
int fnt_width = font_width*(1+(lattr!=LATTR_NORM));
-static int *IpDx = 0, IpDxLEN = 0;;
+ static int *IpDx = 0, IpDxLEN = 0;;
if (len>IpDxLEN || IpDx[0] != fnt_width) {
int i;
}
}
- if (attr & ATTR_GBCHR) {
- int i;
- /*
- * GB mapping: map # to pound, and everything else stays
- * normal.
- */
- for (i=0; i<len; i++)
- if (text[i] == '#')
- text[i] = cfg.vtmode == VT_OEMONLY ? '\x9C' : '\xA3';
- } else if (attr & ATTR_LINEDRW) {
+ if (attr & ATTR_LINEDRW) {
int i;
/* ISO 8859-1 */
static const char poorman[] =
/*
* Line drawing mapping: map ` thru ~ (0x60 thru 0x7E) to
* VT100 line drawing chars; everything else stays normal.
+ *
+ * Actually '_' maps to space too, but that's done before.
*/
switch (cfg.vtmode) {
case VT_XWINDOWS:
nfont &= ~(FONT_BOLD|FONT_UNDERLINE);
}
+ if (font_needs_hand_underlining && (attr & ATTR_UNDER))
+ force_manual_underline = 1;
if (attr & ATTR_REVERSE) {
t = nfg; nfg = nbg; nbg = t;
}
static int recurse = 0;
int nc = -1;
- if(0)
- {
- char buf[256];
- char * p;
- sprintf(buf, "cc(%d,%d)", first, second);
- for(p=buf; *p; p++)
- c_write1(*p);
- }
-
for(c=composetbl; *c; c++) {
if( (*c)[0] == first && (*c)[1] == second)
{
* codes. Returns number of bytes used or zero to drop the message
* or -1 to forward the message to windows.
*/
-static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, unsigned char *output) {
+static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
+ unsigned char *output) {
BYTE keystate[256];
int scan, left_alt = 0, key_down, shift_state;
int r, i, code;
unsigned char * p = output;
-static WORD keys[3];
-static int compose_state = 0;
-static int compose_char = 0;
-static WPARAM compose_key = 0;
+ static WORD keys[3];
+ static int compose_state = 0;
+ static int compose_char = 0;
+ static WPARAM compose_key = 0;
r = GetKeyboardState(keystate);
if (!r) memset(keystate, 0, sizeof(keystate));
else
{
+#if 0
+ { /* Tell us all about key events */
+ static BYTE oldstate[256];
+ static int first = 1;
+ static int scan;
+ int ch;
+ if(first) memcpy(oldstate, keystate, sizeof(oldstate));
+ first=0;
+
+ if ((HIWORD(lParam)&(KF_UP|KF_REPEAT))==KF_REPEAT) {
+ debug(("+"));
+ } else if ((HIWORD(lParam)&KF_UP) && scan==(HIWORD(lParam) & 0xFF) ) {
+ debug((". U"));
+ } else {
+ debug((".\n"));
+ if (wParam >= VK_F1 && wParam <= VK_F20 )
+ debug(("K_F%d", wParam+1-VK_F1));
+ else switch(wParam)
+ {
+ case VK_SHIFT: debug(("SHIFT")); break;
+ case VK_CONTROL: debug(("CTRL")); break;
+ case VK_MENU: debug(("ALT")); break;
+ default: debug(("VK_%02x", wParam));
+ }
+ if(message == WM_SYSKEYDOWN || message == WM_SYSKEYUP)
+ debug(("*"));
+ debug((", S%02x", scan=(HIWORD(lParam) & 0xFF) ));
+
+ ch = MapVirtualKey(wParam, 2);
+ if (ch>=' ' && ch<='~') debug((", '%c'", ch));
+ else if (ch) debug((", $%02x", ch));
+
+ if (keys[0]) debug((", KB0=%02x", keys[0]));
+ if (keys[1]) debug((", KB1=%02x", keys[1]));
+ if (keys[2]) debug((", KB2=%02x", keys[2]));
+
+ if ( (keystate[VK_SHIFT]&0x80)!=0) debug((", S"));
+ if ( (keystate[VK_CONTROL]&0x80)!=0) debug((", C"));
+ if ( (HIWORD(lParam)&KF_EXTENDED) ) debug((", E"));
+ if ( (HIWORD(lParam)&KF_UP) ) debug((", U"));
+ }
+
+ if ((HIWORD(lParam)&(KF_UP|KF_REPEAT))==KF_REPEAT)
+ ;
+ else if ( (HIWORD(lParam)&KF_UP) )
+ oldstate[wParam&0xFF] ^= 0x80;
+ else
+ oldstate[wParam&0xFF] ^= 0x81;
+
+ for(ch=0; ch<256; ch++)
+ if (oldstate[ch] != keystate[ch])
+ debug((", M%02x=%02x", ch, keystate[ch]));
+
+ memcpy(oldstate, keystate, sizeof(oldstate));
+ }
+#endif
+
/* Note if AltGr was pressed and if it was used as a compose key */
- if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
- {
- keystate[VK_RMENU] = keystate[VK_MENU];
- if (!compose_state) compose_key = wParam;
- }
- if (wParam == VK_APPS && !compose_state)
- compose_key = wParam;
+ if (cfg.compose_key) {
+ if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
+ {
+ keystate[VK_RMENU] = keystate[VK_MENU];
+ if (!compose_state) compose_key = wParam;
+ }
+ if (wParam == VK_APPS && !compose_state)
+ compose_key = wParam;
- if (wParam == compose_key)
- {
- if (compose_state == 0 && (HIWORD(lParam)&(KF_UP|KF_REPEAT))==0)
- compose_state = 1;
- else if (compose_state == 1 && (HIWORD(lParam)&KF_UP))
- compose_state = 2;
- else
- compose_state = 0;
- }
- else if (compose_state==1 && wParam != VK_CONTROL)
- compose_state = 0;
+ if (wParam == compose_key)
+ {
+ if (compose_state == 0 && (HIWORD(lParam)&(KF_UP|KF_REPEAT))==0)
+ compose_state = 1;
+ else if (compose_state == 1 && (HIWORD(lParam)&KF_UP))
+ compose_state = 2;
+ else
+ compose_state = 0;
+ }
+ else if (compose_state==1 && wParam != VK_CONTROL)
+ compose_state = 0;
+ } else
+ compose_state = 0;
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
- if ( (cfg.funky_type == 0 || (cfg.funky_type == 1 && app_keypad_keys))
+ if ( (cfg.funky_type == 3 || (cfg.funky_type <= 1 && app_keypad_keys))
&& wParam==VK_NUMLOCK && !(keystate[VK_SHIFT]&0x80)) {
wParam = VK_EXECUTE;
/* Sanitize the number pad if not using a PC NumPad */
if( left_alt || (app_keypad_keys && cfg.funky_type != 2)
- || cfg.nethack_keypad || compose_state )
+ || cfg.funky_type == 3 || cfg.nethack_keypad || compose_state )
{
if ((HIWORD(lParam)&KF_EXTENDED) == 0)
{
/* Lets see if it's a pattern we know all about ... */
if (wParam == VK_PRIOR && shift_state == 1) {
- SendMessage (hwnd, WM_VSCROLL, SB_PAGEUP, 0);
- return 0;
+ SendMessage (hwnd, WM_VSCROLL, SB_PAGEUP, 0);
+ return 0;
}
if (wParam == VK_NEXT && shift_state == 1) {
- SendMessage (hwnd, WM_VSCROLL, SB_PAGEDOWN, 0);
- return 0;
+ SendMessage (hwnd, WM_VSCROLL, SB_PAGEDOWN, 0);
+ return 0;
}
+ if (wParam == VK_INSERT && shift_state == 1) {
+ term_mouse (MB_PASTE, MA_CLICK, 0, 0);
+ term_mouse (MB_PASTE, MA_RELEASE, 0, 0);
+ return 0;
+ }
if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
- return -1;
+ return -1;
}
if (left_alt && wParam == VK_SPACE && cfg.alt_space) {
- SendMessage (hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
- return -1;
+
+ SendMessage (hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
+ return -1;
+ }
+ /* Control-Numlock for app-keypad mode switch */
+ if (wParam == VK_PAUSE && shift_state == 2) {
+ app_keypad_keys ^= 1;
+ return 0;
}
/* Nethack keypad */
if (!left_alt) {
int xkey = 0;
- if ( cfg.funky_type == 0 ||
- ( cfg.funky_type == 1 && app_keypad_keys)) switch(wParam) {
+ if ( cfg.funky_type == 3 ||
+ ( cfg.funky_type <= 1 && app_keypad_keys)) switch(wParam) {
case VK_EXECUTE: xkey = 'P'; break;
case VK_DIVIDE: xkey = 'Q'; break;
case VK_MULTIPLY:xkey = 'R'; break;
case VK_NUMPAD9: xkey = 'y'; break;
case VK_DECIMAL: xkey = 'n'; break;
- case VK_ADD: if(shift_state) xkey = 'm';
- else xkey = 'l';
+ case VK_ADD: if(cfg.funky_type==2) {
+ if(shift_state) xkey = 'l';
+ else xkey = 'k';
+ } else if(shift_state) xkey = 'm';
+ else xkey = 'l';
break;
+
+ case VK_DIVIDE: if(cfg.funky_type==2) xkey = 'o'; break;
+ case VK_MULTIPLY:if(cfg.funky_type==2) xkey = 'j'; break;
+ case VK_SUBTRACT:if(cfg.funky_type==2) xkey = 'm'; break;
+
case VK_RETURN:
if (HIWORD(lParam)&KF_EXTENDED)
xkey = 'M';
case VK_PRIOR: code = 5; break;
case VK_NEXT: code = 6; break;
}
+ /* Reorder edit keys to physical order */
+ if (cfg.funky_type == 3 && code <= 6 ) code = "\0\2\1\4\5\3\6"[code];
+
if (cfg.funky_type == 1 && 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) {
- p += sprintf((char *)p, "\x1BO%c", code + 'P' - 11);
+ if (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)) {
return p - output;
}
}
+
+ /*
+ * Finally, deal with Return ourselves. (Win95 seems to
+ * foul it up when Alt is pressed, for some reason.)
+ */
+ if (wParam == VK_RETURN) /* Return */
+ {
+ *p++ = 0x0D;
+ return p-output;
+ }
}
/* Okay we've done everything interesting; let windows deal with
if ((nc=check_compose(compose_char,ch)) == -1)
{
- c_write1('\007');
+ MessageBeep(MB_ICONHAND);
return 0;
}
*p++ = xlat_kbd2tty((unsigned char)nc);
}
/* This stops ALT press-release doing a 'COMMAND MENU' function */
-#if 0
- if (message == WM_SYSKEYUP && wParam == VK_MENU)
- {
- keystate[VK_MENU] = 0;
- return 0;
+ if (!cfg.alt_only) {
+ if (message == WM_SYSKEYUP && wParam == VK_MENU)
+ return 0;
}
-#endif
return -1;
}
}
}
-void write_clip (void *data, int len) {
+void write_clip (void *data, int len, int must_deselect) {
HGLOBAL clipdata;
void *lock;
((unsigned char *) lock) [len] = 0;
GlobalUnlock (clipdata);
- SendMessage (hwnd, WM_IGNORE_CLIP, TRUE, 0);
+ if (!must_deselect)
+ SendMessage (hwnd, WM_IGNORE_CLIP, TRUE, 0);
+
if (OpenClipboard (hwnd)) {
EmptyClipboard();
SetClipboardData (CF_TEXT, clipdata);
CloseClipboard();
} else
GlobalFree (clipdata);
- SendMessage (hwnd, WM_IGNORE_CLIP, FALSE, 0);
+
+ if (!must_deselect)
+ SendMessage (hwnd, WM_IGNORE_CLIP, FALSE, 0);
}
void get_clip (void **p, int *len) {
projects / u / mdw / putty / blobdiff