Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-956

3 files changed, 107 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ea8c01bef59..d5edca82fe9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-14  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (w32_read_socket): Use MULTIBYTE_CHAR_KEYSTROKE_EVENT
+        for characters above 127.
+
+2007-12-13  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (w32_wnd_proc, Fw32_reconstruct_hot_key): Range check
+        before dereferencing array.
+        (lookup_vk_code): Remove zero comparison.
+
 2007-12-14  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
diff --git a/src/w32fns.c b/src/w32fns.c
index 491ccedeb13..0c5bd1e4cc3 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2957,7 +2957,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
              they don't produce WM_CHAR messages).  This ensures that
              indicator lights are toggled promptly on Windows 9x, for
              example.  */
-          if (lispy_function_keys[wParam] != 0)
+          if (wParam < 256 && lispy_function_keys[wParam])
             {
               windows_translate = 1;
               goto translate;
@@ -3079,7 +3079,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
           break;
         default:
           /* If not defined as a function key, change it to a WM_CHAR message. */
-          if (lispy_function_keys[wParam] == 0)
+          if (wParam > 255 || !lispy_function_keys[wParam])
             {
               DWORD modifiers = construct_console_modifiers ();
 
@@ -8159,7 +8159,7 @@ lookup_vk_code (char *key)
   int i;
 
   for (i = 0; i < 256; i++)
-    if (lispy_function_keys[i] != 0
+    if (lispy_function_keys[i]
         && strcmp (lispy_function_keys[i], key) == 0)
       return i;
 
@@ -8337,7 +8337,7 @@ usage: (w32-reconstruct-hot-key ID)  */)
   vk_code = HOTKEY_VK_CODE (hotkeyid);
   w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);
 
-  if (lispy_function_keys[vk_code])
+  if (vk_code < 256 && lispy_function_keys[vk_code])
     key = intern (lispy_function_keys[vk_code]);
   else
     key = make_number (vk_code);
diff --git a/src/w32term.c b/src/w32term.c
index 4f4701b5f23..2c22399bc1b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4170,6 +4170,8 @@ x_scroll_bar_clear (f)
 static int temp_index;
 static short temp_buffer[100];
 
+/* Temporarily store lead byte of DBCS input sequences.  */
+static char dbcs_lead = 0;
 
 /* Read events coming from the W32 shell.
    This routine is called by the SIGIO handler.
@@ -4329,8 +4331,96 @@ w32_read_socket (sd, expected, hold_quit)
               if (temp_index == sizeof temp_buffer / sizeof (short))
                 temp_index = 0;
               temp_buffer[temp_index++] = msg.msg.wParam;
-              inev.kind = ASCII_KEYSTROKE_EVENT;
-              inev.code = msg.msg.wParam;
+
+              if (msg.msg.wParam < 128 && !dbcs_lead)
+                {
+                  inev.kind = ASCII_KEYSTROKE_EVENT;
+                  inev.code = msg.msg.wParam;
+                }
+              else if (msg.msg.wParam < 256)
+                {
+                  wchar_t code;
+
+                  inev.kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
+
+                  if (IsDBCSLeadByteEx(CP_ACP, (BYTE) msg.msg.wParam))
+                    {
+                      dbcs_lead = (char) msg.msg.wParam;
+                      inev.kind = NO_EVENT;
+                      break;
+                    }
+                  else if (dbcs_lead)
+                    {
+                      char dbcs[2];
+                      dbcs[0] = dbcs_lead;
+                      dbcs[1] = (char) msg.msg.wParam;
+                      dbcs_lead = 0;
+                      if (!MultiByteToWideChar(CP_ACP, 0, dbcs, 2, &code, 1))
+                        {
+                          /* Garbage */
+                          DebPrint (("Invalid DBCS sequence: %d %d\n",
+                                     dbcs[0], dbcs[1]));
+                          inev.kind = NO_EVENT;
+                          break;
+                        }
+                    }
+                  else
+                    {
+                      char single_byte = (char) msg.msg.wParam;
+                      if (!MultiByteToWideChar(CP_ACP, 0, &single_byte, 1,
+                                               &code, 1))
+                        {
+                          /* What to do with garbage? */
+                          DebPrint (("Invalid character: %d\n", single_byte));
+                          inev.kind = NO_EVENT;
+                          break;
+                        }
+                    }
+
+                  /* Now process unicode input as per xterm.c */
+                  if (code < 0x80)
+                    {
+                      inev.kind = ASCII_KEYSTROKE_EVENT;
+                      inev.code = code;
+                    }
+                  else if (code < 0xA0)
+                    inev.code = MAKE_CHAR (CHARSET_8_BIT_CONTROL, code, 0);
+                  else if (code < 0x100)
+                    inev.code = MAKE_CHAR (charset_latin_iso8859_1, code, 0);
+                  else
+                    {
+                      int c1, c2;
+                      int charset_id;
+
+                      if (code < 0x2500)
+                        {
+                          charset_id = charset_mule_unicode_0100_24ff;
+                          code -= 0x100;
+                        }
+                      else if (code < 0xE000)
+                        {
+                          charset_id = charset_mule_unicode_2500_33ff;
+                          code -= 0x2500;
+                        }
+                      else
+                        {
+                          charset_id = charset_mule_unicode_e000_ffff;
+                          code -= 0xE000;
+                        }
+
+                      c1 = (code / 96) + 32;
+                      c2 = (code % 96) + 32;
+                      inev.code = MAKE_CHAR (charset_id, c1, c2);
+                    }
+                }
+              else
+                {
+                  /* Windows shouldn't generate WM_CHAR events above 0xFF
+                     in non-Unicode message handlers.  */
+                  DebPrint (("Non-byte WM_CHAR: %d\n", msg.msg.wParam));
+                  inev.kind = NO_EVENT;
+                  break;
+                }
               inev.modifiers = msg.dwModifiers;
               XSETFRAME (inev.frame_or_window, f);
               inev.timestamp = msg.msg.time;