AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-10 16:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Webclient: Fix can't copy/paste on Safari macOS

Browse Source
This commit is contained in:
UnknownShadow200 2021-01-31 19:28:37 +11:00
parent 083652ebf4
commit 79a7c24aee
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Window.c
View File

@ -3451,8 +3451,10 @@ static EM_BOOL OnKeyDown(int type, const EmscriptenKeyboardEvent* ev, void* data
/* If holding down Ctrl or Alt, keys aren't going to generate a KeyPress event anyways. */ /* If holding down Ctrl or Alt, keys aren't going to generate a KeyPress event anyways. */
/* This intercepts Ctrl+S etc. Ctrl+C and Ctrl+V are not intercepted for clipboard. */ /* This intercepts Ctrl+S etc. Ctrl+C and Ctrl+V are not intercepted for clipboard. */
if (Key_IsAltPressed() || Key_IsWinPressed()) return true; /* NOTE: macOS uses Win (Command) key instead of Ctrl, have to account for that too */
if (Key_IsControlPressed() && key != 'C' && key != 'V') return true; if (Key_IsAltPressed()) return true;
if (Key_IsWinPressed()) return key != 'C' && key != 'V';
if (Key_IsControlPressed()) return key != 'C' && key != 'V';
/* Space needs special handling, as intercepting this prevents the ' ' key press event */ /* Space needs special handling, as intercepting this prevents the ' ' key press event */
/* But on Safari, space scrolls the page - so need to intercept when keyboard is NOT open */ /* But on Safari, space scrolls the page - so need to intercept when keyboard is NOT open */
@ -3485,6 +3487,10 @@ static EM_BOOL OnKeyPress(int type, const EmscriptenKeyboardEvent* ev, void* dat
/* have these intercepted key presses in its text buffer) */ /* have these intercepted key presses in its text buffer) */
if (Input_TouchMode && keyboardOpen) return false; if (Input_TouchMode && keyboardOpen) return false;
/* Safari on macOS still sends a keypress event, which must not be cancelled */
/* (otherwise copy/paste doesn't work, as it uses Win+C / Win+V) */
if (ev->metaKey) return false;
if (Convert_TryCodepointToCP437(ev->charCode, &keyChar)) { if (Convert_TryCodepointToCP437(ev->charCode, &keyChar)) {
Event_RaiseInt(&InputEvents.Press, keyChar); Event_RaiseInt(&InputEvents.Press, keyChar);
} }