X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/f5eca4f80b3ee030d2c9fb42de1d350810815426..536840e61f706d39ab1715cd9c51615cbd26dbdd:/window.c

diff --git a/window.c b/window.c
index 546a9172..42e4d6d0 100644
--- a/window.c
+++ b/window.c
@@ -128,6 +128,8 @@ static char *window_name, *icon_name;
 
 static int compose_state = 0;
 
+static OSVERSIONINFOEX osVersion;
+
 /* Dummy routine, only required in plink. */
 void ldisc_update(int echo, int edit)
 {
@@ -166,6 +168,19 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * config box. */
     defuse_showwindow();
 
+    {
+	ZeroMemory(&osVersion, sizeof(osVersion));
+	osVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+	if(!GetVersionEx ((OSVERSIONINFO *) &osVersion)) {
+	// If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO.
+
+	osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+	if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion))
+	    return FALSE;
+	}
+    }
+
     /*
      * Process the command line.
      */
@@ -1873,6 +1888,31 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    kbd_codepage = atoi(lbuf);
 	}
 	break;
+      case WM_IME_COMPOSITION:
+	{
+	    HIMC hIMC;
+	    int n;
+	    char *buff;
+   
+	    if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS || 
+	        osVersion.dwPlatformId == VER_PLATFORM_WIN32s) break; /* no Unicode */
+
+	    if ((lParam & GCS_RESULTSTR) == 0) /* Composition unfinished. */
+		break; /* fall back to DefWindowProc */
+
+	    hIMC = ImmGetContext(hwnd);
+	    n = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
+
+	    if (n > 0) {
+		buff = (char*) smalloc(n);
+		ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
+		luni_send((unsigned short *)buff, n / 2);
+		free(buff);
+	    }
+	    ImmReleaseContext(hwnd, hIMC);
+	    return 1;
+	}
+
       case WM_IME_CHAR:
 	if (wParam & 0xFF00) {
 	    unsigned char buf[2];
@@ -1916,8 +1956,27 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
  */
 void sys_cursor(int x, int y)
 {
-    if (has_focus)
-	SetCaretPos(x * font_width, y * font_height);
+    COMPOSITIONFORM cf;
+    HIMC hIMC;
+
+    if (!has_focus) return;
+    
+    SetCaretPos(x * font_width, y * font_height);
+
+    /* IMM calls on Win98 and beyond only */
+    if(osVersion.dwPlatformId == VER_PLATFORM_WIN32s) return; /* 3.11 */
+    
+    if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS &&
+	    osVersion.dwMinorVersion == 0) return; /* 95 */
+
+    /* we should have the IMM functions */
+    hIMC = ImmGetContext(hwnd);
+    cf.dwStyle = CFS_POINT;
+    cf.ptCurrentPos.x = x * font_width;
+    cf.ptCurrentPos.y = y * font_height;
+    ImmSetCompositionWindow(hIMC, &cf);
+
+    ImmReleaseContext(hwnd, hIMC);
 }
 
 /*
@@ -2758,7 +2817,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    return p - output;
 	}
 
-	if (cfg.funky_type == 5 && code >= 11 && code <= 34) {
+	if (cfg.funky_type == 5 &&     /* SCO function keys */
+	    code >= 11 && code <= 34) {
 	    char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
 	    int index = 0;
 	    switch (wParam) {
@@ -2780,6 +2840,16 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    p += sprintf((char *) p, "\x1B[%c", codes[index]);
 	    return p - output;
 	}
+	if (cfg.funky_type == 5 &&     /* SCO small keypad */
+	    code >= 1 && code <= 6) {
+	    char codes[] = "HL.FIG";
+	    if (code == 3) {
+		*p++ = '\x7F';
+	    } else {
+		p += sprintf((char *) p, "\x1B[%c", codes[code-1]);
+	    }
+	    return p - output;
+	}
 	if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
 	    int offt = 0;
 	    if (code > 15)