From fd51cb31c721f7ebb6f077e434afac68a12d7df8 Mon Sep 17 00:00:00 2001
From: Allen Webster <yoyo4thdimention@gmail.com>
Date: Wed, 14 Jul 2021 06:29:02 -0700
Subject: [PATCH] fix win32 clipboard reading

---
 platform_win32/win32_4ed.cpp | 49 +++++++++++++++++++-----------------
 ship_files/changes.txt       |  3 +++
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp
index d9bfdcef..66773183 100644
--- a/platform_win32/win32_4ed.cpp
+++ b/platform_win32/win32_4ed.cpp
@@ -378,42 +378,45 @@ win32_read_clipboard_contents(Thread_Context *tctx, Arena *arena){
     
     String_Const_u8 result = {};
     
+#if 0    
     b32 has_text = false;
     b32 has_unicode = IsClipboardFormatAvailable(CF_UNICODETEXT);
     if (!has_unicode){
         has_text = IsClipboardFormatAvailable(CF_TEXT);
     }
     b32 can_read = has_unicode || has_text;
+#endif
     
-    if (can_read){
-        if (OpenClipboard(win32vars.window_handle)){
-            if (has_unicode){
-                HANDLE clip_data = GetClipboardData(CF_UNICODETEXT);
-                if (clip_data != 0){
-                    u16 *clip_16_ptr = (u16*)GlobalLock(clip_data);
-                    if (clip_16_ptr != 0){
-                        String_Const_u16 clip_16 = SCu16(clip_16_ptr);
-                        result = string_u8_from_string_u16(arena, clip_16, StringFill_NullTerminate).string;
-                    }
+    if (OpenClipboard(win32vars.window_handle)){
+        b32 got_result = false;
+        if (!got_result){
+            HANDLE clip_data = GetClipboardData(CF_UNICODETEXT);
+            if (clip_data != 0){
+                u16 *clip_16_ptr = (u16*)GlobalLock(clip_data);
+                if (clip_16_ptr != 0){
+                    String_Const_u16 clip_16 = SCu16(clip_16_ptr);
+                    got_result = true;
+                    result = string_u8_from_string_u16(arena, clip_16, StringFill_NullTerminate).string;
                 }
                 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);
 }
 
diff --git a/ship_files/changes.txt b/ship_files/changes.txt
index 3edf4ebf..e68f27e8 100644
--- a/ship_files/changes.txt
+++ b/ship_files/changes.txt
@@ -1,4 +1,7 @@
 
+4.1.8
+ + Fix: unreliable clipboard reading on windows
+
 4.1.8
  + On command line "-U <path>" sets the user directory
  + On command line "-L" "> log.txt" to get a startup log