AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Webclient: Fix copy/paste not working on IE11 because of last two commits

Browse Source
This commit is contained in:
UnknownShadow200 2021-01-31 21:03:54 +11:00
parent 79a7c24aee
commit 5b82fbb124
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Input.c
View File

@ -215,11 +215,8 @@ void Input_SetPressed(int key) {
Input_Pressed[key] = true; Input_Pressed[key] = true;
Event_RaiseInput(&InputEvents.Down, key, wasPressed); Event_RaiseInput(&InputEvents.Down, key, wasPressed);
#ifndef CC_BUILD_WEB
/* Webclient needs special handling for clipboard copy/paste */
if (key == 'C' && Key_IsActionPressed()) Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_COPY, 0); if (key == 'C' && Key_IsActionPressed()) Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_COPY, 0);
if (key == 'V' && Key_IsActionPressed()) Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_PASTE, 0); if (key == 'V' && Key_IsActionPressed()) Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_PASTE, 0);
#endif
/* don't allow multiple left mouse down events */ /* don't allow multiple left mouse down events */
if (key != KEY_LMOUSE || wasPressed) return; if (key != KEY_LMOUSE || wasPressed) return;

46
src/Window.c
View File

@ -3556,15 +3556,14 @@ void Window_Init(void) {
DisplayInfo.ScaleY = DisplayInfo.ScaleX; DisplayInfo.ScaleY = DisplayInfo.ScaleX;
/* Copy text, but only if user isn't selecting something else on the webpage */ /* Copy text, but only if user isn't selecting something else on the webpage */
/* (don't check window.clipboardData here, that's handled in Clipboard_SetText instead) */
EM_ASM(window.addEventListener('copy', EM_ASM(window.addEventListener('copy',
function(e) { function(e) {
if (window.getSelection && window.getSelection().toString()) return; if (window.getSelection && window.getSelection().toString()) return;
ccall('Window_ReqClipboardText', 'void'); ccall('Window_RequestClipboardText', 'void');
if (!window.cc_copyText) return; if (!window.cc_copyText) return;
if (window.clipboardData) { if (e.clipboardData) {
window.clipboardData.setData('Text', window.cc_copyText);
} else if (e.clipboardData) {
e.clipboardData.setData('text/plain', window.cc_copyText); e.clipboardData.setData('text/plain', window.cc_copyText);
e.preventDefault(); e.preventDefault();
} }
@ -3572,13 +3571,10 @@ void Window_Init(void) {
}); });
); );
/* Paste text */ /* Paste text (window.clipboardData is handled in Clipboard_GetText instead) */
EM_ASM(window.addEventListener('paste', EM_ASM(window.addEventListener('paste',
function(e) { function(e) {
if (window.clipboardData) { if (e.clipboardData) {
var contents = window.clipboardData.getData('Text');
ccall('Window_GotClipboardText', 'void', ['string'], [contents]);
} else if (e.clipboardData) {
var contents = e.clipboardData.getData('text/plain'); var contents = e.clipboardData.getData('text/plain');
ccall('Window_GotClipboardText', 'void', ['string'], [contents]); ccall('Window_GotClipboardText', 'void', ['string'], [contents]);
} }
@ -3639,21 +3635,45 @@ void Window_SetTitle(const cc_string* title) {
static char pasteBuffer[512]; static char pasteBuffer[512];
static cc_string pasteStr; static cc_string pasteStr;
EMSCRIPTEN_KEEPALIVE void Window_ReqClipboardText(void) { EMSCRIPTEN_KEEPALIVE void Window_RequestClipboardText(void) {
Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_COPY, 0); Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_COPY, 0);
} }
EMSCRIPTEN_KEEPALIVE void Window_GotClipboardText(char* src) { EMSCRIPTEN_KEEPALIVE void Window_StoreClipboardText(char* src) {
String_InitArray(pasteStr, pasteBuffer); String_InitArray(pasteStr, pasteBuffer);
String_AppendUtf8(&pasteStr, src, String_CalcLen(src, 2048)); String_AppendUtf8(&pasteStr, src, String_CalcLen(src, 2048));
}
EMSCRIPTEN_KEEPALIVE void Window_GotClipboardText(char* src) {
Window_StoreClipboardText(src);
Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_PASTE, 0); Event_RaiseInput(&InputEvents.Down, INPUT_CLIPBOARD_PASTE, 0);
} }
void Clipboard_GetText(cc_string* value) { String_Copy(value, &pasteStr); } void Clipboard_GetText(cc_string* value) {
/* For IE11, use window.clipboardData to get the clipboard */
EM_ASM_({
if (window.clipboardData) {
var contents = window.clipboardData.getData('Text');
ccall('Window_StoreClipboardText', 'void', ['string'], [contents]);
}
});
String_Copy(value, &pasteStr);
pasteStr.length = 0;
}
void Clipboard_SetText(const cc_string* value) { void Clipboard_SetText(const cc_string* value) {
char str[NATIVE_STR_LEN]; char str[NATIVE_STR_LEN];
Platform_EncodeUtf8(str, value); Platform_EncodeUtf8(str, value);
EM_ASM_({ window.cc_copyText = UTF8ToString($0); }, str);
/* For IE11, use window.clipboardData to set the clipboard */
/* For other browsers, instead use the window.copy events */
EM_ASM_({
if (window.clipboardData) {
if (window.getSelection && window.getSelection().toString()) return;
window.clipboardData.setData('Text', UTF8ToString($0));
} else {
window.cc_copyText = UTF8ToString($0);
}
}, str);
} }
void Window_Show(void) { } void Window_Show(void) { }