|
@@ -43,7 +43,7 @@ static bool SDLScanCodeToDarwinScanCode(SDL_Scancode code, int& darwinScanCode)
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-bool ConvertKeyEvent(const StringHash eventType, VariantMap& eventData, CefKeyEvent& keyEvent)
|
|
|
|
|
|
|
+bool ConvertKeyEvent(Input* input, const StringHash eventType, VariantMap& eventData, CefKeyEvent& keyEvent)
|
|
|
{
|
|
{
|
|
|
if (eventType != "KeyDown" && eventType != "KeyUp")
|
|
if (eventType != "KeyDown" && eventType != "KeyUp")
|
|
|
{
|
|
{
|
|
@@ -75,6 +75,11 @@ bool ConvertKeyEvent(const StringHash eventType, VariantMap& eventData, CefKeyEv
|
|
|
if (wk.qual & QUAL_CTRL)
|
|
if (wk.qual & QUAL_CTRL)
|
|
|
keyEvent.modifiers |= EVENTFLAG_CONTROL_DOWN;
|
|
keyEvent.modifiers |= EVENTFLAG_CONTROL_DOWN;
|
|
|
|
|
|
|
|
|
|
+ bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
|
|
|
|
|
+
|
|
|
|
|
+ if (superdown)
|
|
|
|
|
+ keyEvent.modifiers |= EVENTFLAG_COMMAND_DOWN;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
int darwinScanCode;
|
|
int darwinScanCode;
|
|
|
if (SDLScanCodeToDarwinScanCode((SDL_Scancode) wk.scanCode, darwinScanCode))
|
|
if (SDLScanCodeToDarwinScanCode((SDL_Scancode) wk.scanCode, darwinScanCode))
|