Add keyboard events to metro aura

win8/metro_driver/chrome_app_view.cc

Index: win8/metro_driver/chrome_app_view.cc
===================================================================
--- win8/metro_driver/chrome_app_view.cc	(revision 162199)
+++ win8/metro_driver/chrome_app_view.cc	(working copy)
@@ -52,6 +52,10 @@
     winui::Core::CoreWindow*,
     winui::Core::PointerEventArgs*> PointerEventHandler;
 
+typedef winfoundtn::ITypedEventHandler<
+    winui::Core::CoreWindow*,
+    winui::Core::KeyEventArgs*> KeyEventHandler;
+
 struct Globals globals;
 
 // TODO(ananta)
@@ -702,14 +706,9 @@
   HRESULT hr = url_launch_handler_.Initialize();
   CheckHR(hr, "Failed to initialize url launch handler.");
 
-  // Register for size notifications.
-  hr = window_->add_SizeChanged(mswr::Callback<SizeChangedHandler>(
-      this, &ChromeAppView::OnSizeChanged).Get(),
-      &sizechange_token_);
-  CheckHR(hr);
-
 #if defined(USE_AURA)
-  // Register for pointer notifications.
+  // Register for pointer and keyboard notifications. We forward
+  // them to the browser process via IPC.
   hr = window_->add_PointerMoved(mswr::Callback<PointerEventHandler>(
       this, &ChromeAppView::OnPointerMoved).Get(),
       &pointermoved_token_);
@@ -724,8 +723,28 @@
       this, &ChromeAppView::OnPointerReleased).Get(),
       &pointerreleased_token_);
   CheckHR(hr);
-#endif
 
+  hr = window_->add_KeyDown(mswr::Callback<KeyEventHandler>(
+      this, &ChromeAppView::OnKeyDown).Get(),
+      &keydown_token_);
+  CheckHR(hr);
+
+  hr = window_->add_KeyUp(mswr::Callback<KeyEventHandler>(
+      this, &ChromeAppView::OnKeyUp).Get(),
+      &keyup_token_);
+  CheckHR(hr);
+
+  // By initializing the direct 3D swap chain with the corewindow
+  // we can now directly blit to it from the browser process.
+  direct3d_helper_.Initialize(window);
+  DVLOG(1) << "Initialized Direct3D.";
+#else
+  // Register for size notifications.
+  hr = window_->add_SizeChanged(mswr::Callback<SizeChangedHandler>(
+      this, &ChromeAppView::OnSizeChanged).Get(),

[scottmg, 2012/10/18 00:53:19]

don't we still need this if we get snapped, etc?

[cpu_(ooo_6.6-7.5), 2012/10/18 20:15:26]

Yes we will, but the current impl assumes we have chrome.dll loaded and we
don't, so its mostly luck that we snap without crashing today.

The next change from me is probably splitting ChromeAppView in two classes so we
can do metro-ash and and legacy-metro without ifdefs everywhere.

+      &sizechange_token_);
+  CheckHR(hr);
+
   // Register for edge gesture notifications.
   mswr::ComPtr<winui::Input::IEdgeGestureStatics> edge_gesture_statics;
   hr = winrt_utils::CreateActivationFactory(
@@ -772,15 +791,13 @@
 
   DVLOG(1) << "Created appview instance.";
 
-  direct3d_helper_.Initialize(window);
-
-  DVLOG(1) << "Initialized Direct3D.";
-
   hr = devices_handler_.Initialize(window);
   // Don't check or return the failure here, we need to let the app
   // initialization succeed. Even if we won't be able to access devices
   // we still want to allow the app to start.
   LOG_IF(ERROR, FAILED(hr)) << "Failed to initialize devices handler.";
+#endif
+
   return S_OK;
 }
 
@@ -1011,7 +1028,6 @@
       return E_UNEXPECTED;
     }
   }
-#endif
 
   if (RegisterHotKey(globals.core_window, kFlipWindowsHotKeyId,
                      MOD_CONTROL, VK_F12)) {
@@ -1022,6 +1038,9 @@
   HRESULT hr = settings_handler_.Initialize();
   CheckHR(hr,"Failed to initialize settings handler.");
   return hr;
+#else
+  return S_OK;
+#endif
 }
 
 // We subclass the core window for moving the associated chrome window when the
@@ -1132,6 +1151,40 @@
   return S_OK;
 }
 
+HRESULT ChromeAppView::OnKeyDown(winui::Core::ICoreWindow* sender,
+                                 winui::Core::IKeyEventArgs* args) {
+  winsys::VirtualKey virtual_key;
+  HRESULT hr = args->get_VirtualKey(&virtual_key);
+  if (FAILED(hr))
+    return hr;
+  winui::Core::CorePhysicalKeyStatus status;
+  hr = args->get_KeyStatus(&status);
+  if (FAILED(hr))
+    return hr;
+
+  ui_channel_->Send(new MetroViewerHostMsg_KeyDown(virtual_key,
+                                                   status.RepeatCount,
+                                                   status.ScanCode));
+  return S_OK;
+}
+
+HRESULT ChromeAppView::OnKeyUp(winui::Core::ICoreWindow* sender,
+                               winui::Core::IKeyEventArgs* args) {
+  winsys::VirtualKey virtual_key;
+  HRESULT hr = args->get_VirtualKey(&virtual_key);
+  if (FAILED(hr))
+    return hr;
+  winui::Core::CorePhysicalKeyStatus status;
+  hr = args->get_KeyStatus(&status);
+  if (FAILED(hr))
+    return hr;
+
+  ui_channel_->Send(new MetroViewerHostMsg_KeyUp(virtual_key,
+                                                 status.RepeatCount,
+                                                 status.ScanCode));
+  return S_OK;
+}
+
 HRESULT ChromeAppView::OnPositionChanged(int x, int y) {
   DVLOG(1) << __FUNCTION__;