TODO.md

@@ -10,14 +10,12 @@ PRIME DIRECTIVE: SIMPLIFY
 [] Look into removing *keyboard* buffer - seems like over long sessions, that could get out of hand
 - good first step: print out the memory footprint of this buffer when we exit 4coder, just so we can see what it's taking up
 [] multi cursor editing
-
-[] yeet sheet
+[] matching curly brace highlight
 
 ## Investigations
 [] What are fade ranges? Do we need them?
 
 # DONE
-[x] matching curly brace highlight
 [x] when buffers have the same filename, a short name is appended. I'd prefer to append the path relative to the project, and if the file is outside the project, append the full path.
 [x] reload dirty files if there are no local edits to them automatically
 [x] remove audio (search @Remove)

code/4ed_file.cpp

@@ -19,11 +19,13 @@ string_from_file_name(Editing_File_Name *name){
 internal void
 file_edit_positions_set_cursor(File_Edit_Positions *edit_pos, i64 pos){
     edit_pos->cursor_pos = pos;
+    edit_pos->last_set_type = EditPos_CursorSet;
 }
 
 internal void
 file_edit_positions_set_scroll(File_Edit_Positions *edit_pos, Buffer_Scroll scroll){
     edit_pos->scroll = scroll;
+    edit_pos->last_set_type = EditPos_ScrollSet;
 }
 
 internal void

code/4ed_file.h

@@ -12,7 +12,14 @@
 #if !defined(FRED_FILE_H)
 #define FRED_FILE_H
 
+typedef i32 Edit_Pos_Set_Type;
+enum{
+    EditPos_None,
+    EditPos_CursorSet,
+    EditPos_ScrollSet
+};
 struct File_Edit_Positions{
+    Edit_Pos_Set_Type last_set_type;
     Buffer_Scroll scroll;
     i64 cursor_pos;
 };

code/4ed_view.cpp

@@ -450,6 +450,7 @@ view_set_cursor_and_scroll(Thread_Context *tctx, Models *models, View *view, i64
     Vec2_f32 p = view_relative_xy_of_pos(tctx, models, view, cursor.line, pos);
     view->preferred_x = p.x;
     file_edit_positions_set_scroll(&edit_pos, scroll);
+    edit_pos.last_set_type = EditPos_None;
     view_set_edit_pos(view, edit_pos);
 }
 

code/ship_files/config.4coder

@@ -20,7 +20,7 @@ use_scope_highlight = true;
 use_paren_helper = true;
 use_comment_keywords = true;
 lister_whole_word_backspace_when_modified = true;
-show_line_number_margins = true;
+show_line_number_margins = false;
 enable_output_wrapping = false;
 
 enable_undo_fade_out = false;

code/ship_files/themes/theme-gs.4coder

@@ -32,7 +32,7 @@ defcolor_highlight_junk        = 0xFF3A0000;
 defcolor_highlight_white       = 0xFF003A3A;
 defcolor_paste                 = 0xFFDDEE00;
 defcolor_undo                  = 0xFF00DDEE;
-defcolor_back_cycle            = { 0xff282828, 0xff323232, 0xff3C3C3C, defcolor_back, };
+defcolor_back_cycle            = { defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back, defcolor_back};
 defcolor_text_cycle            = { 0xFFA00000, 0xFF00A000, 0xFF0030B0, 0xFFA0A000 };
 defcolor_line_numbers_back     = defcolor_back;
 defcolor_line_numbers_text     = 0xFF404040;