AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 01:26:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix pasting completely non code page 437 text on X11 backend always causing game to freeze for 1 second (Thanks fam0r + soshimee)

Browse Source
This commit is contained in:
UnknownShadow200 2021-07-05 23:03:38 +10:00
parent 65b2a861e6
commit 2b32ea1812
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Window.c
View File

@ -1340,6 +1340,7 @@ static char clipboard_copy_buffer[256];
static char clipboard_paste_buffer[256]; static char clipboard_paste_buffer[256];
static cc_string clipboard_copy_text = String_FromArray(clipboard_copy_buffer); static cc_string clipboard_copy_text = String_FromArray(clipboard_copy_buffer);
static cc_string clipboard_paste_text = String_FromArray(clipboard_paste_buffer); static cc_string clipboard_paste_text = String_FromArray(clipboard_paste_buffer);
static cc_bool clipboard_paste_received;
void Clipboard_GetText(cc_string* value) { void Clipboard_GetText(cc_string* value) {
Window owner = XGetSelectionOwner(win_display, xa_clipboard); Window owner = XGetSelectionOwner(win_display, xa_clipboard);
@ -1347,12 +1348,13 @@ void Clipboard_GetText(cc_string* value) {
if (!owner) return; /* no window owner */ if (!owner) return; /* no window owner */
XConvertSelection(win_display, xa_clipboard, xa_utf8_string, xa_data_sel, win_handle, 0); XConvertSelection(win_display, xa_clipboard, xa_utf8_string, xa_data_sel, win_handle, 0);
clipboard_paste_received = false;
clipboard_paste_text.length = 0; clipboard_paste_text.length = 0;
/* wait up to 1 second for SelectionNotify event to arrive */ /* wait up to 1 second for SelectionNotify event to arrive */
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
Window_ProcessEvents(); Window_ProcessEvents();
if (clipboard_paste_text.length) { if (clipboard_paste_received) {
String_AppendString(value, &clipboard_paste_text); String_AppendString(value, &clipboard_paste_text);
return; return;
} else { } else {
@ -1614,8 +1616,6 @@ void Window_ProcessEvents(void) {
break; break;
case SelectionNotify: case SelectionNotify:
clipboard_paste_text.length = 0;
if (e.xselection.selection == xa_clipboard && e.xselection.target == xa_utf8_string && e.xselection.property == xa_data_sel) { if (e.xselection.selection == xa_clipboard && e.xselection.target == xa_utf8_string && e.xselection.property == xa_data_sel) {
Atom prop_type; Atom prop_type;
int prop_format; int prop_format;
@ -1627,6 +1627,7 @@ void Window_ProcessEvents(void) {
XDeleteProperty(win_display, win_handle, xa_data_sel); XDeleteProperty(win_display, win_handle, xa_data_sel);
if (data && items && prop_type == xa_utf8_string) { if (data && items && prop_type == xa_utf8_string) {
clipboard_paste_received = true;
clipboard_paste_text.length = 0; clipboard_paste_text.length = 0;
String_AppendUtf8(&clipboard_paste_text, data, items); String_AppendUtf8(&clipboard_paste_text, data, items);
} }