X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=window.c;h=0a6885731187a98971bfb11a070676af238bd6eb;hb=143424030cf68abdf36ac662e398ac6d0660e6d6;hp=6ca4b48d9afd918f5af71616a1e6c4add83f4c55;hpb=0e3f5802b3f72dbe0d9235f2ade63169f48da5de;p=PuTTY.git

diff --git a/window.c b/window.c
index 6ca4b48d..0a688573 100644
--- a/window.c
+++ b/window.c
@@ -82,6 +82,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     MSG msg;
     int guess_width, guess_height;
 
+    putty_inst = inst;
+
     winsock_ver = MAKEWORD(1, 1);
     if (WSAStartup(winsock_ver, &wsadata)) {
 	MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
@@ -179,7 +181,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     }
 
     back = (cfg.protocol == PROT_SSH ? &ssh_backend : 
-			cfg.protocol == PROT_TELNET ? &telnet_backend : &raw_backend );
+	    cfg.protocol == PROT_TELNET ? &telnet_backend :
+	    &raw_backend);
+
+    ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
 
     if (!prev) {
 	wndclass.style         = 0;
@@ -339,9 +344,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 	    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_ENABLED, IDM_SHOWLOG, "Show Negotiation");
 	    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, "New Session");
 	AppendMenu (m, MF_ENABLED, IDM_DUPSESS, "Duplicate Session");
 	s = CreateMenu();
@@ -504,8 +510,8 @@ static void init_fonts(void) {
 		           CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, \
 			   FIXED_PITCH | FF_DONTCARE, cfg.font)
     if (cfg.vtmode != VT_OEMONLY) {
-	f(FONT_NORMAL, ANSI_CHARSET, fw_dontcare, FALSE);
-	f(FONT_UNDERLINE, ANSI_CHARSET, fw_dontcare, TRUE);
+	f(FONT_NORMAL, cfg.fontcharset, fw_dontcare, FALSE);
+	f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE);
     }
     if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_OEMONLY) {
 	f(FONT_OEM, OEM_CHARSET, fw_dontcare, FALSE);
@@ -513,8 +519,8 @@ static void init_fonts(void) {
     }
     if (bold_mode == BOLD_FONT) {
 	if (cfg.vtmode != VT_OEMONLY) {
-	    f(FONT_BOLD, ANSI_CHARSET, fw_bold, FALSE);
-	    f(FONT_BOLDUND, ANSI_CHARSET, fw_bold, TRUE);
+	    f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
+	    f(FONT_BOLDUND, cfg.fontcharset, fw_bold, TRUE);
 	}
 	if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_OEMONLY) {
 	    f(FONT_OEMBOLD, OEM_CHARSET, fw_bold, FALSE);
@@ -613,13 +619,20 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
     switch (message) {
       case WM_CREATE:
 	break;
+      case WM_CLOSE:
+	if (!cfg.warn_on_close ||
+	    MessageBox(hwnd, "Are you sure you want to close this session?",
+		       "PuTTY Exit Confirmation",
+		       MB_ICONWARNING | MB_OKCANCEL) == IDOK)
+	    DestroyWindow(hwnd);
+	return 0;
       case WM_DESTROY:
 	PostQuitMessage (0);
 	return 0;
       case WM_SYSCOMMAND:
 	switch (wParam & ~0xF) {       /* low 4 bits reserved to Windows */
 	  case IDM_SHOWLOG:
-	    shownegot(hwnd);
+	    showeventlog(hwnd);
 	    break;
 	  case IDM_NEWSESS:
 	  case IDM_DUPSESS:
@@ -701,6 +714,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    und_mode = UND_FONT;
 	    init_fonts();
 	    sfree(logpal);
+	    ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
 	    if (pal)
 		DeleteObject(pal);
 	    logpal = NULL;
@@ -871,6 +885,12 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
       case WM_IGNORE_SIZE:
 	ignore_size = TRUE;	       /* don't panic on next WM_SIZE msg */
 	break;
+      case WM_ENTERSIZEMOVE:
+          EnableSizeTip(1);
+          break;
+      case WM_EXITSIZEMOVE:
+          EnableSizeTip(0);
+          break;
       case WM_SIZING:
 	{
 	    int width, height, w, h, ew, eh;
@@ -880,6 +900,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    height = r->bottom - r->top - extra_height;
 	    w = (width + font_width/2) / font_width; if (w < 1) w = 1;
 	    h = (height + font_height/2) / font_height; if (h < 1) h = 1;
+        UpdateSizeTip(hwnd, w, h);
 	    ew = width - w * font_width;
 	    eh = height - h * font_height;
 	    if (ew != 0) {
@@ -997,7 +1018,9 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    int len;
 
 	    len = TranslateKey (wParam, lParam, buf);
-	    back->send (buf, len);
+	    if (len == -1)
+		return DefWindowProc (hwnd, message, wParam, lParam);
+	    ldisc->send (buf, len);
 	}
 	return 0;
       case WM_KEYUP:
@@ -1036,8 +1059,8 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	 * we're ready to cope.
 	 */
 	{
-	    char c = wParam;
-	    back->send (&c, 1);
+	    char c = xlat_kbd2tty((unsigned char)wParam);
+	    ldisc->send (&c, 1);
 	}
 	return 0;
     }
@@ -1225,6 +1248,29 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
         cancel_alt = TRUE;
     }
 
+    /*
+     * NetHack keypad mode. This may conflict with Shift-PgUp/PgDn,
+     * so we do it first.
+     */
+    if (cfg.nethack_keypad) {
+	int shift = keystate[VK_SHIFT] & 0x80;
+        /*
+         * NB the shifted versions only work with numlock off.
+         */
+	switch ( (lParam >> 16) & 0x1FF ) {
+	  case 0x047: *p++ = shift ? 'Y' : 'y'; return p - output;
+	  case 0x048: *p++ = shift ? 'K' : 'k'; return p - output;
+	  case 0x049: *p++ = shift ? 'U' : 'u'; return p - output;
+	  case 0x04B: *p++ = shift ? 'H' : 'h'; return p - output;
+	  case 0x04C: *p++ = '.'; return p - output;
+	  case 0x04D: *p++ = shift ? 'L' : 'l'; return p - output;
+	  case 0x04F: *p++ = shift ? 'B' : 'b'; return p - output;
+	  case 0x050: *p++ = shift ? 'J' : 'j'; return p - output;
+	  case 0x051: *p++ = shift ? 'N' : 'n'; return p - output;
+	  case 0x053: *p++ = '.'; return p - output;
+	}
+    }
+
     /*
      * Shift-PgUp, Shift-PgDn, and Alt-F4 all produce window
      * events: we'll deal with those now.
@@ -1237,9 +1283,12 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
 	SendMessage (hwnd, WM_VSCROLL, SB_PAGEDOWN, 0);
 	return 0;
     }
-    if ((lParam & 0x20000000) && wParam == VK_F4) {
-	SendMessage (hwnd, WM_DESTROY, 0, 0);
-	return 0;
+    if ((lParam & 0x20000000) && wParam == VK_F4 && cfg.alt_f4) {
+	return -1;
+    }
+    if ((lParam & 0x20000000) && wParam == VK_SPACE && cfg.alt_space) {
+	SendMessage (hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
+	return -1;
     }
 
     /*
@@ -1265,12 +1314,12 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
 	return p - output;
     }
 
-    /*
-     * If we're in applications keypad mode, we have to process it
-     * before char-map translation, because it will pre-empt lots
-     * of stuff, even if NumLock is off.
-     */
     if (app_keypad_keys) {
+	/*
+	 * If we're in applications keypad mode, we have to process it
+	 * before char-map translation, because it will pre-empt lots
+	 * of stuff, even if NumLock is off.
+	 */
 	if (ret) {
 	    /*
 	     * Hack to ensure NumLock doesn't interfere with
@@ -1324,10 +1373,20 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
      */
     if (ret) {
 	WORD chr;
-	int r = ToAscii (wParam, (lParam >> 16) & 0xFF,
-			 keystate, &chr, 0);
+	int r;
+	BOOL capsOn=keystate[VK_CAPITAL] !=0;
+
+	/* helg: clear CAPS LOCK state if caps lock switches to cyrillic */
+	if(cfg.xlat_capslockcyr)
+	    keystate[VK_CAPITAL] = 0;
+
+	r = ToAscii (wParam, (lParam >> 16) & 0xFF,
+		     keystate, &chr, 0);
+
+	if(capsOn)
+	    chr = xlat_latkbd2win((unsigned char)(chr & 0xFF));
 	if (r == 1) {
-	    *p++ = chr & 0xFF;
+	    *p++ = xlat_kbd2tty((unsigned char)(chr & 0xFF));
 	    return p - output;
 	}
     }