Fixing WebKeyboardEvent.

webkit/glue/webinputevent_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "webkit/glue/webinputevent.h"
 
-#include "webkit/glue/event_conversion.h"
-
-#undef LOG
 #include "base/logging.h"
+#include "base/string_util.h"
+#include "webkit/glue/webinputevent_util.h"
 
 static const unsigned long kDefaultScrollLinesPerWheelDelta = 3;
 
 // WebMouseEvent --------------------------------------------------------------
 
 static LPARAM GetRelativeCursorPos(HWND hwnd) {
   POINT pos = {-1, -1};
   GetCursorPos(&pos);
   ScreenToClient(hwnd, &pos);
   return MAKELPARAM(pos.x, pos.y);
@@ skipping 147 matching lines @@
       default:
         break;
     }
 
     // Touchpads (or trackpoints) send the following messages in scrolling
     // horizontally.
     //  * Scrolling left
     //    message == WM_HSCROLL, wparam == SB_LINELEFT (== SB_LINEUP).
     //  * Scrolling right
     //    message == WM_HSCROLL, wparam == SB_LINERIGHT (== SB_LINEDOWN).
-    if (WM_HSCROLL == message) {        
-      key_state |= MK_SHIFT;    
-      wheel_delta = -wheel_delta;       
+    if (WM_HSCROLL == message) {
+      key_state |= MK_SHIFT;
+      wheel_delta = -wheel_delta;
     }
 
     // Use GetAsyncKeyState for key state since we are synthesizing 
     // the input
     get_key_state = GetAsyncKeyState;
   } else {
     // TODO(hbono): we should add a new variable which indicates scroll
     // direction and remove this key_state hack.
     if (WM_MOUSEHWHEEL == message)
       key_state |= MK_SHIFT;
@@ skipping 110 matching lines @@
 
 WebKeyboardEvent::WebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam,
                                    LPARAM lparam) {
   system_key = false;
 
   actual_message.hwnd = hwnd;
   actual_message.message = message;
   actual_message.wParam = wparam;
   actual_message.lParam = lparam;
 
-  key_code = static_cast<int>(wparam);
+  windows_key_code = native_key_code = static_cast<int>(wparam);
 
   switch (message) {
     case WM_SYSKEYDOWN:
       system_key = true;
     case WM_KEYDOWN:
-      type = KEY_DOWN;
+      type = RAW_KEY_DOWN;
       break;
     case WM_SYSKEYUP:
       system_key = true;
     case WM_KEYUP:
       type = KEY_UP;
       break;
     case WM_IME_CHAR:
       type = CHAR;
       break;
     case WM_SYSCHAR:
       system_key = true;
       type = CHAR;
     case WM_CHAR:
       type = CHAR;
       break;
     default:
       NOTREACHED() << "unexpected native message: " << message;
   }
 
+  memset(&text, 0, sizeof(text));
+  memset(&unmodified_text, 0, sizeof(unmodified_text));
+  memset(&key_identifier, 0, sizeof(key_identifier));
+
+  if (type == CHAR || type == RAW_KEY_DOWN) {
+    text[0] = windows_key_code;
+    unmodified_text[0] = windows_key_code;
+  }
+  if (type != CHAR) {
+    std::string key_identifier_str =
+        webkit_glue::GetKeyIdentifierForWindowsKeyCode(windows_key_code);
+    base::strlcpy(key_identifier, key_identifier_str.c_str(),
+                  kIdentifierLengthCap);
+  }
+
   if (GetKeyState(VK_SHIFT) & 0x8000)
     modifiers |= SHIFT_KEY;
   if (GetKeyState(VK_CONTROL) & 0x8000)
     modifiers |= CTRL_KEY;
   if (GetKeyState(VK_MENU) & 0x8000)
     modifiers |= (ALT_KEY | META_KEY);
 
   if (LOWORD(lparam) > 1)
     modifiers |= IS_AUTO_REPEAT;
   if (IsKeyPad(wparam, lparam))
     modifiers |= IS_KEYPAD;
 }