Combine the WM_CHAR with WM_KEY* for key event flow.

win8/metro_driver/metro_driver_win7.cc

 // Copyright (c) 2012 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 "stdafx.h"
 #include <corewindow.h>
 #include <shobjidl.h>
 
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 445 matching lines @@
   HRESULT STDMETHODCALLTYPE
   ProcessEvents(winui::Core::CoreProcessEventsOption options) override {
     // We don't support the other message pump modes. So we basically enter a
     // traditional message loop that we only exit a teardown.
     if (options != winui::Core::CoreProcessEventsOption_ProcessUntilQuit)
       return E_FAIL;
 
     MSG msg = {0};
     while((::GetMessage(&msg, NULL, 0, 0) != 0) && g_window_count > 0) {
       ProcessInputMessage(msg);
-      ::TranslateMessage(&msg);
       ::DispatchMessage(&msg);
     }
     // TODO(cpu): figure what to do with msg.WParam which we would normally
     // return here.
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE
   RunAsync(winui::Core::CoreDispatcherPriority priority,
            winui::Core::IDispatchedHandler* agileCallback,
@@ skipping 429 matching lines @@
 
   HRESULT STDMETHODCALLTYPE put_MessageHandled(boolean value) override {
     return S_OK;
   }
 
   // InputHandler
   bool HandleKeyboardMessage(const MSG& msg) override {
     switch (msg.message) {
       case WM_KEYDOWN:
       case WM_KEYUP: {
+        ::TranslateMessage(&msg);
+        MSG char_msg;
+        while (::PeekMessage(&char_msg, msg.hwnd, WM_CHAR, WM_SYSCHAR,

[James Su, 2015/08/04 17:06:44]

ditto

And WM_KEYDOWN/WM_KEYUP won't generate WM_SYSCHAR/WM_SYSDEADCHAR.

[Shu Chen, 2015/08/05 01:36:45]

Done.

+                             PM_REMOVE)) {
+          mswr::ComPtr<winui::Core::ICharacterReceivedEventArgs> char_args;
+          char_args = mswr::Make<KeyEvent>(char_msg);
+          character_received_handler_->Invoke(this, char_args.Get());
+        }
         mswr::ComPtr<winui::Core::IKeyEventArgs> event_args;
         event_args = mswr::Make<KeyEvent>(msg);
         KeyEventHandler* handler = NULL;
         if (msg.message == WM_KEYDOWN) {
           handler = key_down_handler_;
         } else {
           handler = key_up_handler_;
         }
         handler->Invoke(this, event_args.Get());
         break;
       }
 
-      case WM_CHAR:
-      case WM_DEADCHAR:
-      case WM_UNICHAR: {
-        mswr::ComPtr<winui::Core::ICharacterReceivedEventArgs> event_args;
-        event_args = mswr::Make<KeyEvent>(msg);
-        character_received_handler_->Invoke(this, event_args.Get());
-        break;
-      }
-
       default:
         return false;
     }
     return true;
   }
 
   bool HandleMouseMessage(const MSG& msg) override {
     PointerEventHandler* handler = NULL;
     mswr::ComPtr<winui::Core::IPointerEventArgs> event_args;
     event_args = mswr::Make<MouseEvent>(msg);
@@ skipping 271 matching lines @@
 };
 
 
 mswr::ComPtr<winapp::Core::ICoreApplication> InitWindows7() {
   HRESULT hr = ::CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
   if (FAILED(hr))
     CHECK(false);
   return mswr::Make<CoreApplicationWin7Emulation>();
 }