ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix win32 clipboard reading

This commit is contained in:
Allen Webster 2021-07-14 06:29:02 -07:00
parent 0635126cee
commit fd51cb31c7
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
platform_win32/win32_4ed.cpp
View File

@ -378,42 +378,45 @@ win32_read_clipboard_contents(Thread_Context *tctx, Arena *arena){
String_Const_u8 result = {}; String_Const_u8 result = {};
#if 0
b32 has_text = false; b32 has_text = false;
b32 has_unicode = IsClipboardFormatAvailable(CF_UNICODETEXT); b32 has_unicode = IsClipboardFormatAvailable(CF_UNICODETEXT);
if (!has_unicode){ if (!has_unicode){
has_text = IsClipboardFormatAvailable(CF_TEXT); has_text = IsClipboardFormatAvailable(CF_TEXT);
} }
b32 can_read = has_unicode || has_text; b32 can_read = has_unicode || has_text;
#endif
if (can_read){ if (OpenClipboard(win32vars.window_handle)){
if (OpenClipboard(win32vars.window_handle)){ b32 got_result = false;
if (has_unicode){ if (!got_result){
HANDLE clip_data = GetClipboardData(CF_UNICODETEXT); HANDLE clip_data = GetClipboardData(CF_UNICODETEXT);
if (clip_data != 0){ if (clip_data != 0){
u16 *clip_16_ptr = (u16*)GlobalLock(clip_data); u16 *clip_16_ptr = (u16*)GlobalLock(clip_data);
if (clip_16_ptr != 0){ if (clip_16_ptr != 0){
String_Const_u16 clip_16 = SCu16(clip_16_ptr); String_Const_u16 clip_16 = SCu16(clip_16_ptr);
result = string_u8_from_string_u16(arena, clip_16, StringFill_NullTerminate).string; got_result = true;
} result = string_u8_from_string_u16(arena, clip_16, StringFill_NullTerminate).string;
} }
GlobalUnlock(clip_data); GlobalUnlock(clip_data);
} }
else{
HANDLE clip_data = GetClipboardData(CF_TEXT);
if (clip_data != 0){
char *clip_ascii_ptr = (char*)GlobalLock(clip_data);
if (clip_ascii_ptr != 0){
String_Const_char clip_ascii = SCchar(clip_ascii_ptr);
result = string_u8_from_string_char(arena, clip_ascii, StringFill_NullTerminate).string;
}
}
GlobalUnlock(clip_data);
}
CloseClipboard();
} }
if (!got_result){
HANDLE clip_data = GetClipboardData(CF_TEXT);
if (clip_data != 0){
char *clip_ascii_ptr = (char*)GlobalLock(clip_data);
if (clip_ascii_ptr != 0){
String_Const_char clip_ascii = SCchar(clip_ascii_ptr);
got_result = true;
result = string_u8_from_string_char(arena, clip_ascii, StringFill_NullTerminate).string;
}
GlobalUnlock(clip_data);
}
}
CloseClipboard();
} }
return(result); return(result);
} }

3
ship_files/changes.txt
View File

@ -1,4 +1,7 @@
4.1.8
+ Fix: unreliable clipboard reading on windows
4.1.8 4.1.8
+ On command line "-U <path>" sets the user directory + On command line "-U <path>" sets the user directory
+ On command line "-L" "> log.txt" to get a startup log + On command line "-L" "> log.txt" to get a startup log