Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(541)

Unified Diff: win8/metro_driver/metro_driver_win7.cc

Issue 1267483003: Combine the WM_CHAR with WM_KEY* for key event flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: win8/metro_driver/metro_driver_win7.cc
diff --git a/win8/metro_driver/metro_driver_win7.cc b/win8/metro_driver/metro_driver_win7.cc
index 3ace04caee0a06327e53b95281b2c12e2be42b5c..205692ff35b1cb5c3e77c6223343e27842b5f64c 100644
--- a/win8/metro_driver/metro_driver_win7.cc
+++ b/win8/metro_driver/metro_driver_win7.cc
@@ -463,7 +463,6 @@ class CoreDispatcherEmulation :
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
@@ -913,6 +912,14 @@ class CoreWindowEmulation
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_S
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;
@@ -925,15 +932,6 @@ class CoreWindowEmulation
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;
}
« ui/base/ime/remote_input_method_win.cc ('K') | « ui/base/ime/remote_input_method_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698