rename: mbuf_resizable stuff

src/cli_main.c

@@ -86,9 +86,9 @@ int main(int argc, char **argv)
         fprintf(stderr, "File load error: %s.\n", field_load_error_string(fle));
         return 1;
     }
-    Mbuf_reusable mbuf_r;
-    mbuf_reusable_init(&mbuf_r);
-    mbuf_reusable_ensure_size(&mbuf_r, field.height, field.width);
+    MarkBuf mbuf_r;
+    markbuf_init(&mbuf_r);
+    markbuf_ensure_size(&mbuf_r, field.height, field.width);
     Oevent_list oevent_list;
     oevent_list_init(&oevent_list);
     Usz max_ticks = (Usz)ticks;
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
         oevent_list_clear(&oevent_list);
         orca_run(field.buffer, mbuf_r.buffer, field.height, field.width, i, &oevent_list, 0);
     }
-    mbuf_reusable_deinit(&mbuf_r);
+    markbuf_deinit(&mbuf_r);
     oevent_list_deinit(&oevent_list);
     if (print_output)
         field_fput(&field, stdout);

src/field.c

@@ -171,13 +171,13 @@ char const *field_load_error_string(Field_load_error fle)
     return errstr;
 }
 
-void mbuf_reusable_init(Mbuf_reusable *mbr)
+void markbuf_init(MarkBuf *mbr)
 {
     mbr->buffer = NULL;
     mbr->capacity = 0;
 }
 
-void mbuf_reusable_ensure_size(Mbuf_reusable *mbr, Usz height, Usz width)
+void markbuf_ensure_size(MarkBuf *mbr, Usz height, Usz width)
 {
     Usz capacity = height * width;
     if (mbr->capacity < capacity) {
@@ -186,7 +186,7 @@ void mbuf_reusable_ensure_size(Mbuf_reusable *mbr, Usz height, Usz width)
     }
 }
 
-void mbuf_reusable_deinit(Mbuf_reusable *mbr)
+void markbuf_deinit(MarkBuf *mbr)
 {
     free(mbr->buffer);
 }

src/field.h

@@ -10,10 +10,10 @@
 // for saving/loading Mark* buffers to/from disk, since we currently don't need
 // that functionality.
 
-typedef struct Mbuf_reusable {
+typedef struct MarkBuf {
     Mark *buffer;
     Usz capacity;
-} Mbuf_reusable;
+} MarkBuf;
 
 // A reusable buffer for glyphs, stored with its dimensions. Also some helpers
 // for loading/saving from files and doing common operations that a UI layer
@@ -46,9 +46,9 @@ Field_load_error field_load_file(char const *filepath, Field *field);
 
 char const *field_load_error_string(Field_load_error fle);
 
-void mbuf_reusable_init(Mbuf_reusable *mbr);
-void mbuf_reusable_ensure_size(Mbuf_reusable *mbr, Usz height, Usz width);
-void mbuf_reusable_deinit(Mbuf_reusable *mbr);
+void markbuf_init(MarkBuf *mbr);
+void markbuf_ensure_size(MarkBuf *mbr, Usz height, Usz width);
+void markbuf_deinit(MarkBuf *mbr);
 
 // ------------------------------------------------------------
 // FIELD-UNDO

src/ged.c

@@ -362,7 +362,7 @@ void ged_init(Ged *a, Usz undo_limit, Usz init_bpm, Usz init_seed)
     field_init(&a->field);
     field_init(&a->scratch_field);
     field_init(&a->clipboard_field);
-    mbuf_reusable_init(&a->mbuf_r);
+    markbuf_init(&a->mbuf_r);
     undo_history_init(&a->undo_hist, undo_limit);
     oevent_list_init(&a->oevent_list);
     oevent_list_init(&a->scratch_oevent_list);
@@ -400,7 +400,7 @@ void ged_deinit(Ged *a)
     field_deinit(&a->field);
     field_deinit(&a->scratch_field);
     field_deinit(&a->clipboard_field);
-    mbuf_reusable_deinit(&a->mbuf_r);
+    markbuf_deinit(&a->mbuf_r);
     undo_history_deinit(&a->undo_hist);
     oevent_list_deinit(&a->oevent_list);
     oevent_list_deinit(&a->scratch_oevent_list);
@@ -743,7 +743,7 @@ void draw_oevent_list(WINDOW *win, Oevent_list const *oevent_list)
 
 void ged_resize_grid(
     Field *field,
-    Mbuf_reusable *mbr,
+    MarkBuf *mbr,
     Usz new_height,
     Usz new_width,
     Usz tick_num,
@@ -771,7 +771,7 @@ void ged_resize_grid(
         scratch_field->height,
         scratch_field->width);
     ged_cursor_confine(ged_cursor, new_height, new_width);
-    mbuf_reusable_ensure_size(mbr, new_height, new_width);
+    markbuf_ensure_size(mbr, new_height, new_width);
 }
 
 void draw_grid_cursor(
@@ -1120,7 +1120,7 @@ void ged_draw(Ged *a, WINDOW *win, char const *filename, bool use_fancy_dots, bo
     if (a->needs_remarking && !a->is_playing) {
         field_resize_raw_if_necessary(&a->scratch_field, a->field.height, a->field.width);
         field_copy(&a->field, &a->scratch_field);
-        mbuf_reusable_ensure_size(&a->mbuf_r, a->field.height, a->field.width);
+        markbuf_ensure_size(&a->mbuf_r, a->field.height, a->field.width);
         clear_and_run_vm(
             a->scratch_field.buffer,
             a->mbuf_r.buffer,
@@ -1498,7 +1498,7 @@ Usz adjust_rulers_humanized(Usz ruler, Usz in, Isz delta_rulers)
 // 1 unit longer than the actual ruler length.
 bool ged_resize_grid_snap_ruler(
     Field *field,
-    Mbuf_reusable *mbr,
+    MarkBuf *mbr,
     Usz ruler_y,
     Usz ruler_x,
     Isz delta_h,

src/ged.h

@@ -24,7 +24,7 @@ typedef struct {
     Field field;
     Field scratch_field;
     Field clipboard_field;
-    Mbuf_reusable mbuf_r;
+    MarkBuf mbuf_r;
     Undo_history undo_hist;
     Oevent_list oevent_list;
     Oevent_list scratch_oevent_list;
@@ -112,7 +112,7 @@ void ged_set_window_size(Ged *a, int win_h, int win_w, int softmargin_y, int sof
 
 void ged_resize_grid(
     Field *field,
-    Mbuf_reusable *mbr,
+    MarkBuf *mbr,
     Usz new_height,
     Usz new_width,
     Usz tick_num,

src/tui.c

@@ -1051,7 +1051,7 @@ Tui_menus_result tui_drive_menus(Tui *tui, int key)
                                             '.',
                                             new_field_h * new_field_w * sizeof(Glyph));
                                         ged_cursor_confine(&tui->ged->ged_cursor, new_field_h, new_field_w);
-                                        mbuf_reusable_ensure_size(&tui->ged->mbuf_r, new_field_h, new_field_w);
+                                        markbuf_ensure_size(&tui->ged->mbuf_r, new_field_h, new_field_w);
                                         ged_update_internal_geometry(tui->ged);
                                         ged_make_cursor_visible(tui->ged);
                                         tui->ged->needs_remarking = true;
@@ -1190,7 +1190,7 @@ Tui_menus_result tui_drive_menus(Tui *tui, int key)
                                 if (fle == Field_load_error_ok) {
                                     qnav_stack_pop();
                                     osoputoso(&tui->file_name, temp_name);
-                                    mbuf_reusable_ensure_size(
+                                    markbuf_ensure_size(
                                         &tui->ged->mbuf_r,
                                         tui->ged->field.height,
                                         tui->ged->field.width);

src/tui_main.c

@@ -319,7 +319,7 @@ void main_init(int argc, char **argv)
         }
         field_init_fill(&ged.field, (Usz)new_field_h, (Usz)new_field_w, '.');
     }
-    mbuf_reusable_ensure_size(&ged.mbuf_r, ged.field.height, ged.field.width);
+    markbuf_ensure_size(&ged.mbuf_r, ged.field.height, ged.field.width);
     ged_make_cursor_visible(&ged);
     ged_send_osc_bpm(&ged, (I32)ged.bpm); // Send initial BPM
     ged_set_playing(&ged, true);          // Auto-play