Clipboard now implemented as a custom layer feature; API transition mechanism established for deprecating old clipboard API without immediately breaking existing code for anyone

Author: Allen Webster

4ed.cpp

@@ -256,11 +256,6 @@ App_Init_Sig(app_init){
     global_history_init(&models->global_history);
     text_layout_init(tctx, &models->text_layouts);
 
-    // NOTE(allen): clipboard setup
-    models->working_set.clipboard_max_size = ArrayCount(models->working_set.clipboards);
-    models->working_set.clipboard_size = 0;
-    models->working_set.clipboard_current = 0;
-    
     // NOTE(allen): style setup
     {
         Scratch_Block scratch(tctx);
@@ -328,7 +323,7 @@ App_Step_Sig(app_step){
     Models *models = (Models*)base_ptr;
 
     Mutex_Lock file_order_lock(models->working_set.mutex);
-    Scratch_Block scratch(tctx, Scratch_Share);
+    Scratch_Block scratch(tctx);
 
     models->next_animate_delay = max_u32;
     models->animate_next_frame = false;
@@ -339,11 +334,8 @@ App_Step_Sig(app_step){
     models->input = input;
 
     // NOTE(allen): OS clipboard event handling
-    String_Const_u8 clipboard = input->clipboard;
-    if (clipboard.str != 0){
-        String_Const_u8 *dest = working_set_next_clipboard_string(&models->heap, &models->working_set, clipboard.size);
-        dest->size = eol_convert_in((char*)dest->str, (char*)clipboard.str, (i32)clipboard.size);
-        co_send_core_event(tctx, models, CoreCode_NewClipboardContents, *dest);
+    if (input->clipboard.str != 0){
+        co_send_core_event(tctx, models, CoreCode_NewClipboardContents, input->clipboard);
     }
 
     // NOTE(allen): reorganizing panels on screen
@@ -378,7 +370,6 @@ App_Step_Sig(app_step){
             system_cli_begin_update(cli);
             if (system_cli_update_step(cli, dest, max, &amount)){
                 if (file != 0 && amount > 0){
-                    amount = eol_in_place_convert_in(dest, amount);
                     output_file_append(tctx, models, file, SCu8(dest, amount));
                     edited_file = true;
                 }

4ed_api_implementation.cpp

@@ -206,41 +206,6 @@ child_process_get_state(Application_Links *app, Child_Process_ID child_process_i
     return(child_process_get_state(&models->child_processes, child_process_id));
 }
 
-api(custom) function b32
-clipboard_clear(Application_Links *app, i32 clipboard_id){
-    Models *models = (Models*)app->cmd_context;
-    working_set_clipboard_clear(&models->heap, &models->working_set);
-    return(true);
-}
-
-api(custom) function b32
-clipboard_post_internal_only(Application_Links *app, i32 clipboard_id, String_Const_u8 string)
-{
-    Models *models = (Models*)app->cmd_context;
-    String_Const_u8 *dest = working_set_next_clipboard_string(&models->heap, &models->working_set, (i32)string.size);
-    block_copy(dest->str, string.str, string.size);
-    return(true);
-}
-
-api(custom) function i32
-clipboard_count(Application_Links *app, i32 clipboard_id)
-{
-    Models *models = (Models*)app->cmd_context;
-    return(models->working_set.clipboard_size);
-}
-
-api(custom) function String_Const_u8
-push_clipboard_index(Application_Links *app, Arena *arena, i32 clipboard_id, i32 item_index)
-{
-    Models *models = (Models*)app->cmd_context;
-    String_Const_u8 *str = working_set_clipboard_index(&models->working_set, item_index);
-    String_Const_u8 result = {};
-    if (str != 0){
-        result = push_string_copy(arena, *str);
-    }
-    return(result);
-}
-
 api(custom) function b32
 enqueue_virtual_event(Application_Links *app, Input_Event *event){
     Models *models = (Models*)app->cmd_context;
@@ -2013,8 +1978,8 @@ managed_scope_get_attachment(Application_Links *app, Managed_Scope scope, Manage
         }
         else{
 #define M \
-            "ERROR: scope attachment already exists with a size smaller than the requested size; no attachment pointer can be returned."
-                print_message(app, string_u8_litexpr(M));
+"ERROR: scope attachment already exists with a size smaller than the requested size; no attachment pointer can be returned."
+            print_message(app, string_u8_litexpr(M));
 #undef M
         }
     }

4ed_buffer.cpp

@@ -172,96 +172,6 @@ buffer_update_cursors_lean_r(Cursor_With_Index *sorted_positions, i32 count,
 
 //////////////////////////////////////
 
-internal i32
-eol_convert_in(char *dest, char *src, i32 size){
-    i32 i = 0;
-    i32 j = 0;
-    i32 k = 0;
-    
-    for (; j < size && src[j] != '\r'; ++j);
-    block_copy(dest, src, j);
-    
-    if (j < size){
-        k = 1;
-        ++j;
-        for (i = j; i < size; ++i){
-            if (src[i] == '\r'){
-                block_copy(dest + j - k, src + j, i - j);
-                ++k;
-                j = i+1;
-            }
-        }
-        block_copy(dest + j - k, src + j, i - j);
-        j = i - k;
-    }
-    
-    return(j);
-}
-
-internal i32
-eol_in_place_convert_in(char *data, i32 size){
-    i32 i = 0;
-    i32 j = 0;
-    i32 k = 0;
-    
-    for (; j < size && data[j] != '\r'; ++j);
-    
-    if (j < size){
-        k = 1;
-        ++j;
-        for (i = j; i < size; ++i){
-            if (data[i] == '\r'){
-                block_copy(data + j - k, data + j, i - j);
-                ++k;
-                j = i+1;
-            }
-        }
-        block_copy(data + j - k, data + j, i - j);
-        j = i - k;
-    }
-    
-    return(j);
-}
-
-// TODO(allen): iterative memory check?
-internal b32
-eol_convert_out(char *dest, i64 max, char *src, i64 size, i64 *size_out){
-    i64 j = 0;
-    for (i64 i = 0; i < size; ++i, ++j){
-        if (src[i] == '\n'){
-            dest[j] = '\r';
-            ++j;
-            dest[j] = '\n';
-        }
-        else{
-            dest[j] = src[i];
-        }
-    }
-    *size_out = j;
-    return(true);
-}
-
-// TODO(allen): iterative memory check?
-internal i32
-eol_in_place_convert_out(char *data, i32 size, i32 max, i32 *size_out){
-    i32 result = 1;
-    i32 i = 0;
-    
-    for (; i < size; ++i){
-        if (data[i] == '\n'){
-            block_copy(data + i + 1, data + i, size - i);
-            data[i] = '\r';
-            ++i;
-            ++size;
-        }
-    }
-    
-    *size_out = size;
-    return(result);
-}
-
-//////////////////////////////////////
-
 internal b32
 buffer_good(Gap_Buffer *buffer){
     return(buffer->data != 0);

4ed_system_api.cpp

@@ -120,10 +120,12 @@ define_api(Arena *arena){
     {
         API_Call *call = api_call(arena, api, "get_clipboard", "String_Const_u8");
         api_param(arena, call, "Arena*", "arena");
+        api_param(arena, call, "i32", "index");
     }
     {
         API_Call *call = api_call(arena, api, "post_clipboard", "void");
         api_param(arena, call, "String_Const_u8", "str");
+        api_param(arena, call, "i32", "index");
     }
 
     {

4ed_working_set.cpp

@@ -206,6 +206,7 @@ get_file_from_identifier(Working_Set *working_set, Buffer_Identifier buffer){
 
 ////////////////////////////////
 
+#if 0
 // TODO(allen): Bring the clipboard fully to the custom side.
 internal void
 working_set_clipboard_clear(Heap *heap, Working_Set *working){
@@ -257,6 +258,7 @@ working_set_clipboard_index(Working_Set *working, i32 index){
     }
     return(result);
 }
+#endif
 
 ////////////////////////////////
 

4ed_working_set.h

@@ -34,14 +34,6 @@ struct Working_Set{
     Node has_external_mod_sentinel;
     System_Mutex mutex;
     System_Thread file_change_thread;
-    
-    // TODO(allen): do(update clipboard system to exist fully in the custom layer)
-    // NOTE(allen): These members have nothing to do with the working set or
-    // the mutex that gaurds the other members.
-    String_Const_u8 clipboards[64];
-    i32 clipboard_size;
-    i32 clipboard_max_size;
-    i32 clipboard_current;
 };
 
 #endif