Undo fade out

Author: Allen Webster

4ed_api_implementation.cpp

@@ -13,6 +13,7 @@ function void
 output_file_append(Thread_Context *tctx, Models *models, Editing_File *file, String_Const_u8 value){
     i64 end = buffer_size(&file->state.buffer);
     Edit_Behaviors behaviors = {};
+    behaviors.pos_before_edit = end;
     edit_single(tctx, models, file, Ii64(end), value, behaviors);
 }
 
@@ -237,6 +238,22 @@ buffer_read_range(Application_Links *app, Buffer_ID buffer_id, Range_i64 range,
     return(result);
 }
 
+function Edit_Behaviors
+get_active_edit_behaviors(Models *models, Editing_File *file){
+    Panel *panel = layout_get_active_panel(&models->layout);
+    Assert(panel != 0);
+    View *view = panel->view;
+    Assert(view != 0);
+    Edit_Behaviors behaviors = {};
+    if (view->file == file){
+        behaviors.pos_before_edit = view->edit_pos_.cursor_pos;
+    }
+    else{
+        behaviors.pos_before_edit = -1;
+    }
+    return(behaviors);
+}
+
 api(custom) function b32
 buffer_replace_range(Application_Links *app, Buffer_ID buffer_id, Range_i64 range, String_Const_u8 string)
 {
@@ -246,7 +263,7 @@ buffer_replace_range(Application_Links *app, Buffer_ID buffer_id, Range_i64 rang
     if (api_check_buffer(file)){
         i64 size = buffer_size(&file->state.buffer);
         if (0 <= range.first && range.first <= range.one_past_last && range.one_past_last <= size){
-            Edit_Behaviors behaviors = {};
+            Edit_Behaviors behaviors = get_active_edit_behaviors(models, file);
             edit_single(app->tctx, models, file, range, string, behaviors);
             result = true;
         }
@@ -261,7 +278,7 @@ buffer_batch_edit(Application_Links *app, Buffer_ID buffer_id, Batch_Edit *batch
     Editing_File *file = imp_get_file(models, buffer_id);
     b32 result = false;
     if (api_check_buffer(file)){
-        Edit_Behaviors behaviors = {};
+        Edit_Behaviors behaviors = get_active_edit_behaviors(models, file);
         result = edit_batch(app->tctx, models, file, batch, behaviors);
     }
     return(result);
@@ -2422,6 +2439,7 @@ buffer_history_get_max_record_index(Application_Links *app, Buffer_ID buffer_id)
 function void
 buffer_history__fill_record_info(Record *record, Record_Info *out){
     out->kind = record->kind;
+    out->pos_before_edit = record->pos_before_edit;
     out->edit_number = record->edit_number;
     switch (out->kind){
         case RecordKind_Single:

4ed_edit.cpp

@@ -239,7 +239,7 @@ edit__apply(Thread_Context *tctx, Models *models, Editing_File *file, Range_i64
     if (!behaviors.do_not_post_to_history){
         ProfileTLBlock(tctx, &models->profile_list, "edit apply history");
         history_record_edit(&models->global_history, &file->state.history, buffer,
-                            edit);
+                            behaviors.pos_before_edit, edit);
         file->state.current_record_index =
             history_get_record_count(&file->state.history);
     }
@@ -348,6 +348,7 @@ edit_change_current_history_state(Thread_Context *tctx, Models *models, Editing_
 
         Edit_Behaviors behaviors_prototype = {};
         behaviors_prototype.do_not_post_to_history = true;
+        behaviors_prototype.pos_before_edit = -1;
 
         if (current < target_index){
             do{

4ed_edit.h

@@ -14,6 +14,7 @@
 
 struct Edit_Behaviors{
     b32 do_not_post_to_history;
+    i64 pos_before_edit;
 };
 
 #endif

4ed_history.cpp

@@ -241,14 +241,22 @@ history__free_nodes(History *history, i32 first_index, Node *first_node, Node *l
 }
 
 internal void
-history_record_edit(Global_History *global_history, History *history, Gap_Buffer *buffer, Edit edit){
+history_record_edit(Global_History *global_history, History *history, Gap_Buffer *buffer,
+                    i64 pos_before_edit, Edit edit){
     if (history->activated){
         Assert(history->record_lookup.count == history->record_count);
 
         Record *new_record = history__allocate_record(history);
         history__stash_record(history, new_record);
 
         new_record->restore_point = begin_temp(&history->arena);
+        if (pos_before_edit >= 0){
+            new_record->pos_before_edit = pos_before_edit;
+        }
+        else{
+            new_record->pos_before_edit = edit.range.min;
+        }
+        
         new_record->edit_number = global_history_get_edit_number(global_history);
 
         new_record->kind = RecordKind_Single;
@@ -294,6 +302,7 @@ history__optimize_group(Arena *scratch, History *history, Record *record){
         if (record->group.count == 1){
             Record *child = right;
             record->restore_point = child->restore_point;
+            record->pos_before_edit = child->pos_before_edit;
             record->edit_number = child->edit_number;
             record->kind = RecordKind_Single;
             record->single = child->single;
@@ -383,6 +392,7 @@ history_merge_records(Arena *scratch, History *history, i32 first_index, i32 las
         Record *last_record  = CastFromMember(Record, node, last_node);
 
         new_record->restore_point = first_record->restore_point;
+        new_record->pos_before_edit = first_record->pos_before_edit;
         new_record->edit_number = last_record->edit_number;
         new_record->kind = RecordKind_Group;
 

4ed_history.h

@@ -21,6 +21,7 @@ struct Record_Batch_Slot{
 struct Record{
     Node node;
     Temp_Memory restore_point;
+    i64 pos_before_edit;
     i32 edit_number;
     Record_Kind kind;
     union{

4ed_view.h

@@ -79,17 +79,16 @@ struct View{
     f32 preferred_x;
 
     b8 new_scroll_target;
+    b8 hide_scrollbar;
+    b8 hide_file_bar;
+    b8 show_whitespace;
 
     Coroutine *co;
     Co_Out co_out;
 
     Arena node_arena;
     View_Context_Node *ctx;
 
-    b8 hide_scrollbar;
-    b8 hide_file_bar;
-    b8 show_whitespace;
-    
     Query_Set query_set;
 };
 

custom/4coder_base_commands.cpp

@@ -1700,9 +1700,10 @@ CUSTOM_DOC("Reopen the current buffer from the hard drive.")
 
 ////////////////////////////////
 
-internal i32
+internal i64
 record_get_new_cursor_position_undo(Application_Links *app, Buffer_ID buffer_id, History_Record_Index index, Record_Info record){
-    i32 new_edit_position = 0;
+    i64 new_edit_position = record.pos_before_edit;
+#if 0
     switch (record.kind){
         default:
         case RecordKind_Single:
@@ -1715,16 +1716,17 @@ record_get_new_cursor_position_undo(Application_Links *app, Buffer_ID buffer_id,
             new_edit_position = (i32)(sub_record.single_first + sub_record.single_string_backward.size);
         }break;
     }
+#endif
     return(new_edit_position);
 }
 
-internal i32
+internal i64
 record_get_new_cursor_position_undo(Application_Links *app, Buffer_ID buffer_id, History_Record_Index index){
     Record_Info record = buffer_history_get_record_info(app, buffer_id, index);
     return(record_get_new_cursor_position_undo(app, buffer_id, index, record));
 }
 
-internal i32
+internal i64
 record_get_new_cursor_position_redo(Application_Links *app, Buffer_ID buffer_id, History_Record_Index index, Record_Info record){
     i64 new_edit_position = 0;
     switch (record.kind){
@@ -1742,21 +1744,80 @@ record_get_new_cursor_position_redo(Application_Links *app, Buffer_ID buffer_id,
     return((i32)(new_edit_position));
 }
 
-internal i32
+internal i64
 record_get_new_cursor_position_redo(Application_Links *app, Buffer_ID buffer_id, History_Record_Index index){
     Record_Info record = buffer_history_get_record_info(app, buffer_id, index);
     return(record_get_new_cursor_position_redo(app, buffer_id, index, record));
 }
 
+function void
+undo__fade_finish(Application_Links *app, Fade_Range *range){
+    Buffer_ID buffer = range->buffer_id;
+    History_Record_Index current = buffer_history_get_current_state_index(app, buffer);
+    if (current > 0){
+        buffer_history_set_current_state_index(app, buffer, current - 1);
+    }
+}
+
+function void
+undo__flush_fades(Application_Links *app, Buffer_ID buffer){
+    Fade_Range **prev_next = &buffer_fade_ranges.first;
+    for (Fade_Range *node = buffer_fade_ranges.first, *next = 0;
+         node != 0;
+         node = next){
+        next = node->next;
+        if (node->buffer_id == buffer &&
+            node->finish_call == undo__fade_finish){
+            undo__fade_finish(app, node);
+            *prev_next = next;
+            free_fade_range(node);
+            buffer_fade_ranges.count -= 1;
+        }
+        else{
+            prev_next = &node->next;
+            buffer_fade_ranges.last = node;
+        }
+    }
+}
+
 CUSTOM_COMMAND_SIG(undo)
 CUSTOM_DOC("Advances backwards through the undo history of the current buffer.")
 {
     View_ID view = get_active_view(app, Access_ReadWriteVisible);
     Buffer_ID buffer = view_get_buffer(app, view, Access_ReadWriteVisible);
+    undo__flush_fades(app, buffer);
+    
     History_Record_Index current = buffer_history_get_current_state_index(app, buffer);
     if (current > 0){
-        i32 new_position = record_get_new_cursor_position_undo(app, buffer, current);
-        buffer_history_set_current_state_index(app, buffer, current - 1);
+        Record_Info record = buffer_history_get_record_info(app, buffer, current);
+        
+        b32 do_immedite_undo = true;
+        f32 undo_fade_time = 0.33f;
+        if (undo_fade_time > 0.f &&
+            record.kind == RecordKind_Single &&
+            record.single_string_backward.size == 0){
+            b32 has_hard_character = false;
+            for (u64 i = 0; i < record.single_string_forward.size; i += 1){
+                if (!character_is_whitespace(record.single_string_forward.str[i])){
+                    has_hard_character = true;
+                    break;
+                }
+            }
+            if (has_hard_character){
+                Range_i64 range = Ii64_size(record.single_first, record.single_string_forward.size);
+                ARGB_Color color = fcolor_resolve(fcolor_id(defcolor_undo)) & 0xFFFFFF;
+                Fade_Range *fade = buffer_post_fade(app, buffer, undo_fade_time, range, color);
+                fade->negate_fade_direction = true;
+                fade->finish_call = undo__fade_finish;
+                do_immedite_undo = false;
+            }
+        }
+        
+        if (do_immedite_undo){
+            buffer_history_set_current_state_index(app, buffer, current - 1);
+        }
+        
+        i64 new_position = record_get_new_cursor_position_undo(app, buffer, current, record);
         view_set_cursor_and_preferred_x(app, view, seek_pos(new_position));
     }
 }
@@ -1769,7 +1830,7 @@ CUSTOM_DOC("Advances forwards through the undo history of the current buffer.")
     History_Record_Index current = buffer_history_get_current_state_index(app, buffer);
     History_Record_Index max_index = buffer_history_get_max_record_index(app, buffer);
     if (current < max_index){
-        i32 new_position = record_get_new_cursor_position_redo(app, buffer, current + 1);
+        i64 new_position = record_get_new_cursor_position_redo(app, buffer, current + 1);
         buffer_history_set_current_state_index(app, buffer, current + 1);
         view_set_cursor_and_preferred_x(app, view, seek_pos(new_position));
     }
@@ -1806,15 +1867,15 @@ CUSTOM_DOC("Advances backward through the undo history in the buffer containing
     }
 
     Buffer_ID *match_buffers = push_array(scratch, Buffer_ID, match_count);
-    i32 *new_positions = push_array(scratch, i32, match_count);
+    i64 *new_positions = push_array(scratch, i64, match_count);
     match_count = 0;
 
     if (highest_edit_number != -1){
         for (Buffer_ID buffer = first_buffer_match;
              buffer != 0;
              buffer = get_buffer_next(app, buffer, Access_Always)){
             b32 did_match = false;
-            i32 new_edit_position = 0;
+            i64 new_edit_position = 0;
             for (;;){
                 History_Record_Index index = buffer_history_get_current_state_index(app, buffer);
                 if (index > 0){
@@ -1879,15 +1940,15 @@ CUSTOM_DOC("Advances forward through the undo history in the buffer containing t
     }
 
     Buffer_ID *match_buffers = push_array(scratch, Buffer_ID, match_count);
-    i32 *new_positions = push_array(scratch, i32, match_count);
+    i64 *new_positions = push_array(scratch, i64, match_count);
     match_count = 0;
 
     if (lowest_edit_number != -1){
         for (Buffer_ID buffer = first_buffer_match;
              buffer != 0;
              buffer = get_buffer_next(app, buffer, Access_Always)){
             b32 did_match = false;
-            i32 new_edit_position = 0;
+            i64 new_edit_position = 0;
             History_Record_Index max_index = buffer_history_get_max_record_index(app, buffer);
             for (;;){
                 History_Record_Index index = buffer_history_get_current_state_index(app, buffer);

custom/4coder_base_types.cpp

@@ -2894,6 +2894,23 @@ SCu32(u32 *str){
     return(string);
 }
 
+function String_Const_char
+SCchar(String_char string){
+    return(string.string);
+}
+function String_Const_u8
+SCu8(String_u8 string){
+    return(string.string);
+}
+function String_Const_u16
+SCu16(String_u16 string){
+    return(string.string);
+}
+function String_Const_u32
+SCu32(String_u32 string){
+    return(string.string);
+}
+
 function String_Const_char
 SCchar(String_Const_u8 str){
     return(SCchar((char*)str.str, str.size));
@@ -5332,6 +5349,11 @@ string_any_push(Arena *arena, u64 size, String_Encoding encoding){
     return(string);
 }
 
+#define push_string_u8 string_u8_push
+#define push_string_u16 string_u16_push
+#define push_string_u32 string_u32_push
+#define push_string_u64 string_u64_push
+
 function String_Const_char
 string_const_char_push(Arena *arena, u64 size){
     String_Const_char string = {};
@@ -5373,6 +5395,11 @@ string_const_any_push(Arena *arena, u64 size, String_Encoding encoding){
     return(string);
 }
 
+#define push_string_const_u8 string_const_u8_push
+#define push_string_const_u16 string_const_u16_push
+#define push_string_const_u32 string_const_u32_push
+#define push_string_const_u64 string_const_u64_push
+
 function String_Const_char
 push_string_copy(Arena *arena, String_Const_char src){
     String_Const_char string = {};
@@ -5641,6 +5668,11 @@ string_list_push_overlap(Arena *arena, List_String_Const_u32 *list, u32 overlap,
     }
 }
 
+#define push_string_list string_list_push
+#define push_string_list_lit(a,l,s) string_list_push_lit(a,l,s)
+#define push_string_list_u8_lit(a,l,s) string_list_u8_push_lit(a,l,s)
+#define push_string_list_overlap(a,l,o,s) string_list_push_overlap(a,l,o,s)
+
 typedef String_Const_char String_char_Mod_Function_Type(String_Const_char string);
 typedef String_Const_u8 String_u8_Mod_Function_Type(String_Const_u8 string);
 typedef String_Const_u16 String_u16_Mod_Function_Type(String_Const_u16 string);