Fixing syntax errors

Author: gspencergoog

shell/platform/windows/flutter_windows_view.h

@@ -143,7 +143,11 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate {
   void SendText(const std::u16string&);
 
   // Reports a raw keyboard message to Flutter engine.
-  void SendKey(int key, int scancode, int action, char32_t character);
+  void SendKey(int key,
+               int scancode,
+               int action,
+               char32_t character,
+               bool extended);
 
   // Reports scroll wheel events to Flutter engine.
   void SendScroll(double x,

shell/platform/windows/key_event_handler.cc

@@ -110,6 +110,8 @@ void KeyEventHandler::KeyboardHook(FlutterWindowsView* view,
   LPARAM extraInfo = GetMessageExtraInfo();
   if (extraInfo == kSynthesizedEvent) {
     // Don't pass messages that we synthesized to the framework again.
+    std::cerr << "Skipping synthesized key for scancode " << scancode << " ("
+              << character << ")" << std::endl;
     return;
   }
   // TODO: Translate to a cross-platform key code system rather than passing
@@ -133,11 +135,11 @@ void KeyEventHandler::KeyboardHook(FlutterWindowsView* view,
       std::cerr << "Unknown key event action: " << action << std::endl;
       return;
   }
-  channel_->Send(event, [action, extended, scancode](const uint8_t* reply,
-                                                     size_t reply_size) {
+  channel_->Send(event, [action, extended, scancode, character](
+                            const uint8_t* reply, size_t reply_size) {
     auto decoded = flutter::JsonMessageCodec::GetInstance().DecodeMessage(
         reply, reply_size);
-    bool handled = decoded[kHandledKey].GetBool();
+    bool handled = (*decoded)[kHandledKey].GetBool();
     if (!handled) {
       // Since the framework didn't handle the event, we inject a newly
       // synthesized one. We let Windows figure out the virtual key and
@@ -153,7 +155,9 @@ void KeyEventHandler::KeyboardHook(FlutterWindowsView* view,
       key_event.dwExtraInfo = static_cast<ULONG_PTR>(kSynthesizedEvent);
       INPUT input_event;
       input_event.type = INPUT_KEYBOARD;
-      input_event.ki = &key_event;
+      input_event.ki = key_event;
+      std::cerr << "Synthesizing key for scancode " << scancode << " ("
+                << character << ")" << std::endl;
       UINT accepted = SendInput(1, &input_event, sizeof(input_event));
       if (accepted != 1) {
         std::cerr << "Unable to synthesize event for unhandled keyboard event "

shell/platform/windows/win32_window.cc

@@ -116,6 +116,12 @@ Win32Window::HandleMessage(UINT const message,
   int xPos = 0, yPos = 0;
   UINT width = 0, height = 0;
   UINT button_pressed = 0;
+  LPARAM extraInfo = GetMessageExtraInfo();
+  if (extraInfo == 0xbaddecaf) {
+    // Don't pass messages that we synthesized to the framework again.
+    std::cerr << "Found Extra Info synthesized key for scancode " << scancode << " ("
+              << character << ")" << std::endl;
+  }
 
   switch (message) {
     case kWmDpiChangedBeforeParent:
@@ -237,39 +243,45 @@ Win32Window::HandleMessage(UINT const message,
         OnText(text);
       }
 
-      // All key presses that generate a character should be sent from
-      // WM_CHAR. In order to send the full key press information, the keycode
-      // is persisted in keycode_for_char_message_ obtained from WM_KEYDOWN.
-      if (keycode_for_char_message_ != 0) {
-        const unsigned int scancode = (lparam >> 16) & 0xff;
-        OnKey(keycode_for_char_message_, scancode, WM_KEYDOWN, code_point);
-        keycode_for_char_message_ = 0;
-      }
-      break;
-    }
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-    case WM_KEYUP:
-    case WM_SYSKEYUP:
-      const bool is_keydown_message =
-          (message == WM_KEYDOWN || message == WM_SYSKEYDOWN);
-      // Check if this key produces a character. If so, the key press should
-      // be sent with the character produced at WM_CHAR. Store the produced
-      // keycode (it's not accessible from WM_CHAR) to be used in WM_CHAR.
-      const unsigned int character = MapVirtualKey(wparam, MAPVK_VK_TO_CHAR);
-      if (character > 0 && is_keydown_message) {
-        keycode_for_char_message_ = wparam;
+        // All key presses that generate a character should be sent from
+        // WM_CHAR. In order to send the full key press information, the keycode
+        // is persisted in keycode_for_char_message_ obtained from WM_KEYDOWN.
+        if (keycode_for_char_message_ != 0) {
+          const unsigned int scancode = (lparam >> 16) & 0xff;
+          const bool extended = ((lparam >> 24) & 0x01) == 0x01;
+          window->OnKey(keycode_for_char_message_, scancode, WM_KEYDOWN,
+                        code_point, extended);
+          keycode_for_char_message_ = 0;
+        }
         break;
       }
-      unsigned int keyCode(wparam);
-      const unsigned int scancode = (lparam >> 16) & 0xff;
-      // If the key is a modifier, get its side.
-      if (keyCode == VK_SHIFT || keyCode == VK_MENU || keyCode == VK_CONTROL) {
-        keyCode = MapVirtualKey(scancode, MAPVK_VSC_TO_VK_EX);
-      }
-      const int action = is_keydown_message ? WM_KEYDOWN : WM_KEYUP;
-      OnKey(keyCode, scancode, action, 0);
-      break;
+      case WM_KEYDOWN:
+      case WM_SYSKEYDOWN:
+      case WM_KEYUP:
+      case WM_SYSKEYUP:
+        const bool is_keydown_message =
+            (message == WM_KEYDOWN || message == WM_SYSKEYDOWN);
+        // Check if this key produces a character. If so, the key press should
+        // be sent with the character produced at WM_CHAR. Store the produced
+        // keycode (it's not accessible from WM_CHAR) to be used in WM_CHAR.
+        const unsigned int character = MapVirtualKey(wparam, MAPVK_VK_TO_CHAR);
+        if (character > 0 && is_keydown_message) {
+          keycode_for_char_message_ = wparam;
+          break;
+        }
+        unsigned int keyCode(wparam);
+        const unsigned int scancode = (lparam >> 16) & 0xff;
+        const bool extended = ((lparam >> 24) & 0x01) == 0x01;
+        // If the key is a modifier, get its side.
+        if (keyCode == VK_SHIFT || keyCode == VK_MENU ||
+            keyCode == VK_CONTROL) {
+          keyCode = MapVirtualKey(scancode, MAPVK_VSC_TO_VK_EX);
+        }
+        const int action = is_keydown_message ? WM_KEYDOWN : WM_KEYUP;
+        window->OnKey(keyCode, scancode, action, 0, extended);
+        break;
+    }
+    return DefWindowProc(hwnd, message, wparam, lparam);
   }
 
   return DefWindowProc(window_handle_, message, wparam, lparam);