X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/c5e9c988d0706d1abb7fab7b2d2b1514bc119584..6dd1ecd8a2cb10212d4caf19f72eefd6558700b7:/window.c

diff --git a/window.c b/window.c
index 6afd10e8..0a688573 100644
--- a/window.c
+++ b/window.c
@@ -181,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;
@@ -711,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;
@@ -1016,7 +1020,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    len = TranslateKey (wParam, lParam, buf);
 	    if (len == -1)
 		return DefWindowProc (hwnd, message, wParam, lParam);
-	    back->send (buf, len);
+	    ldisc->send (buf, len);
 	}
 	return 0;
       case WM_KEYUP:
@@ -1056,7 +1060,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	 */
 	{
 	    char c = xlat_kbd2tty((unsigned char)wParam);
-	    back->send (&c, 1);
+	    ldisc->send (&c, 1);
 	}
 	return 0;
     }
@@ -1245,6 +1249,29 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
     }
 
     /*
+     * 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.
      */
@@ -1287,24 +1314,7 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
 	return p - output;
     }
 
-    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;
-	}
-    } else if (app_keypad_keys) {
+    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