1 files changed, 54 insertions, 10 deletions

diff --git a/win/tkWinX.c b/win/tkWinX.c
index 0b00186..579eaf7 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -9,10 +9,9 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkWinX.c 1.51 97/09/02 13:06:57
+ * SCCS: @(#) tkWinX.c 1.55 98/01/21 00:23:17
  */
 
-#include "tkInt.h"
 #include "tkWinInt.h"
 
 /*
@@ -763,19 +762,61 @@ GenerateXEvent(hwnd, message, wParam, lParam)
 		     */
 		    event.type = KeyRelease;
 		    event.xkey.keycode = wParam;
-		    event.xkey.nchars = 0;
+		    event.xkey.nbytes = 0;
 		    break;
 
 		case WM_CHAR:
 		    /*
 		     * Synthesize both a KeyPress and a KeyRelease.
+		     * Strings generated by Input Method Editor are handled
+		     * in the following manner:
+		     * 1. A series of WM_KEYDOWN & WM_KEYUP messages that 
+		     *    cause GetTranslatedKey() to be called and return
+		     *    immediately because the WM_KEYDOWNs have no 
+		     *	  associated WM_CHAR messages -- the IME window is 
+		     *	  accumulating the characters and translating them 
+		     *    itself.  In the "bind" command, you get an event
+		     *	  with a mystery keysym and %A == "" for each 
+		     *	  WM_KEYDOWN that actually was meant for the IME.
+		     * 2. A WM_KEYDOWN corresponding to the "confirm typing"
+		     *    character.  This causes GetTranslatedKey() to be 
+		     *	  called.
+		     * 3. A WM_IME_NOTIFY message saying that the IME is 
+		     *	  done.  A side effect of this message is that 
+		     *    GetTranslatedKey() thinks this means that there
+		     *	  are no WM_CHAR messages and returns immediately.
+		     *    In the "bind" command, you get an another event
+		     *	  with a mystery keysym and %A == "".
+		     * 4. A sequence of WM_CHAR messages that correspond to 
+		     *	  the characters in the IME window.  A bunch of 
+		     *    simulated KeyPress/KeyRelease events will be 
+		     *    generated, one for each character.  Adjacent 
+		     *    WM_CHAR messages may actually specify the high
+		     *	  and low bytes of a multi-byte character -- in that
+		     *    case the two WM_CHAR messages will be combined into
+		     *	  one event.  It is the event-consumer's 
+		     *	  responsibility to convert the string returned from
+		     *	  XLookupString from system encoding to UTF-8.
+		     * 5. And finally we get the WM_KEYUP for the "confirm
+		     *    typing" character.
 		     */
 
 		    event.type = KeyPress;
 		    event.xany.send_event = -1;
 		    event.xkey.keycode = 0;
-		    event.xkey.nchars = 1;
+		    event.xkey.nbytes = 1;
 		    event.xkey.trans_chars[0] = (char) wParam;
+
+		    if (IsDBCSLeadByte((BYTE) wParam)) {
+			MSG msg;
+
+			if ((PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) != 0)
+				&& (msg.message == WM_CHAR)) {
+			    GetMessage(&msg, NULL, 0, 0);
+			    event.xkey.nbytes = 2;
+			    event.xkey.trans_chars[1] = (char) msg.wParam;
+			}
+		    }
 		    Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
 		    event.type = KeyRelease;
 		    break;
@@ -874,7 +915,7 @@ GetState(message, wParam, lParam)
  *	given KeyPress event.
  *
  * Results:
- *	Sets the trans_chars and nchars member of the key event.
+ *	Sets the trans_chars and nbytes member of the key event.
  *
  * Side effects:
  *	Removes any WM_CHAR messages waiting on the top of the system
@@ -888,18 +929,21 @@ GetTranslatedKey(xkey)
     XKeyEvent *xkey;
 {
     MSG msg;
+    char buf[XMaxTransChars];
     
-    xkey->nchars = 0;
+    xkey->nbytes = 0;
 
-    while (xkey->nchars < XMaxTransChars
+    while ((xkey->nbytes < XMaxTransChars)
 	    && PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
 	if (msg.message == WM_CHAR) {
-	    xkey->trans_chars[xkey->nchars] = (char) msg.wParam;
-	    xkey->nchars++;
 	    GetMessage(&msg, NULL, 0, 0);
-	    if ((msg.message == WM_CHAR) && (msg.lParam & 0x20000000)) {
+
+	    if (msg.lParam & 0x20000000) {
 		xkey->state = 0;
 	    }
+	    buf[xkey->nbytes] = (char) msg.wParam;
+	    xkey->trans_chars[xkey->nbytes] = (char) msg.wParam;
+	    xkey->nbytes++;
 	} else {
 	    break;
 	}