1 files changed, 34 insertions, 24 deletions

diff --git a/modules/TUI/module.jai b/modules/TUI/module.jai
index 112c666..f8e745e 100644
--- a/modules/TUI/module.jai
+++ b/modules/TUI/module.jai
@@ -33,7 +33,7 @@
 #load "key_map.jai";
 
 #add_context tui_style  : Style;            // This contains the last style applied by the module.
-#add_context tui_buffer : *String_Builder;  // If set, this buffer will be used as output target of module procedures.
+#add_context tui_builder : *String_Builder;  // If set, this will serve as an output buffer for this module procedures.
 
 KEY_SIZE :: #run type_info(Key).runtime_size;
 #assert(input_buffer.count >= KEY_SIZE);    // The input buffer size must be capable to hold an entire Key.
@@ -42,7 +42,7 @@ active          := false;
 input_override  : Key;
 input_string    : string;
 input_buffer    : [1024] u8;
-temp_buffer     := String_Builder.{ allocator = temporary_allocator };
+temp_builder    := String_Builder.{ allocator = temporary_allocator };
 
 
 #scope_module
@@ -176,11 +176,13 @@ Style :: struct {
 }
 
 set_style :: (style: Style) {
-
-    auto_release_temp(); // TODO Does this breaks if the context.tui_buffer is a temporary buffer... and we're writting to it?
-
-    // TODO If context.tui_buffer is temporary... this will fail.... right?
-    builder := ifx context.tui_buffer != null then context.tui_buffer else *temp_buffer;
+    // If no tui_builder is provided, use a temporary one and discard it afterwards.
+    builder := context.tui_builder;
+    temp_mark: Temporary_Storage_State = ---;
+    if context.tui_builder == null {
+        builder = *temp_builder;
+        temp_mark = get_temporary_storage_mark();
+    }
     
     #if COLOR_MODE_BITS == {
         case 4;
@@ -211,8 +213,9 @@ set_style :: (style: Style) {
         append(builder, #run sprint(Commands.SetGraphicsRendition, "49"));
     }
 
-    if context.tui_buffer == null {
+    if context.tui_builder == null {
         write_builder(builder);
+        set_temporary_storage_mark(temp_mark);
     }
     
     context.tui_style = style;
@@ -497,9 +500,9 @@ read_input :: (count_limit: int = -1, terminators: .. u8) -> string {
 read_input_line :: (count_limit: int, is_visible: bool = true) -> string, Key {
     assert_is_active();
     assert(count_limit >= 0, "Invalid arguments passed to read_input_line(): 'count_limit' must be greater-than or equal to 0.");
-    
-    builder := temp_buffer;
-    
+
+    // The returned memory must be allocated before we start to use temporary memory.
+    // Otherwise, the returned memory would be invalid on calls of type (,, temporary_allocator).
     str := alloc_string(count_limit);
     str.count = 0;
     idx := 0;
@@ -510,6 +513,8 @@ read_input_line :: (count_limit: int, is_visible: bool = true) -> string, Key {
     write_strings(Commands.ShowCursor, Commands.StartBlinking, Commands.BlinkingBarShape);
     
     while true {
+        builder := temp_builder;
+        
         auto_release_temp();
 
         chars_count := count_characters(str);
@@ -601,9 +606,13 @@ draw_box :: (x: int, y: int, width: int, height: int) {
     assert_is_active();
     assert(x > 0 && y > 0 && width > 1 && height > 1, "Invalid arguments passed to draw_box(): 'x' and 'y' must be greater-than 0; 'width' and 'height' must be greater-than 1.");
     
-    auto_release_temp(); // TODO Does this breaks if the context.tui_buffer is a temporary buffer... and we're writting to it?
-    
-    builder := ifx context.tui_buffer != null then context.tui_buffer else *temp_buffer;
+    // If no tui_builder is provided, use a temporary one and discard it afterwards.
+    builder := context.tui_builder;
+    temp_mark: Temporary_Storage_State = ---;
+    if context.tui_builder == null {
+        builder = *temp_builder;
+        temp_mark = get_temporary_storage_mark();
+    }
     
     append(builder, Commands.DrawingMode);
     
@@ -633,8 +642,9 @@ draw_box :: (x: int, y: int, width: int, height: int) {
 
     append(builder, Commands.TextMode);
     
-    if context.tui_buffer == null {
+    if context.tui_builder == null {
         write_builder(builder);
+        set_temporary_storage_mark(temp_mark);
     }
 }
 
@@ -692,11 +702,11 @@ get_terminal_size :: () -> width: int, height: int {
 
 set_cursor_position :: inline (x: int, y: int) {
     assert_is_active();
-    if context.tui_buffer == null {
+    if context.tui_builder == null {
         print(Commands.SetCursorPosition, y, x);
     }
     else {
-        print_to_builder(context.tui_buffer, Commands.SetCursorPosition, y, x);
+        print_to_builder(context.tui_builder, Commands.SetCursorPosition, y, x);
     }
 }
 
@@ -740,27 +750,27 @@ set_terminal_title :: inline (title: string) {
 }
 
 using_buffer :: (buffer: *String_Builder) #expand {
-    __buffer := context.tui_buffer;
-    context.tui_buffer = buffer;
-    `defer context.tui_buffer = __buffer;
+    __buffer := context.tui_builder;
+    context.tui_builder = buffer;
+    `defer context.tui_builder = __buffer;
 }
 
 // TODO Maybe we should have a different name for this...?
 tui_print :: inline (format_string: string, args: .. Any) {
-    if context.tui_buffer == null {
+    if context.tui_builder == null {
         print(format_string, ..args, to_standard_error = false);
     }
     else {
-        print_to_builder(context.tui_buffer, format_string, ..args);
+        print_to_builder(context.tui_builder, format_string, ..args);
     }
 }
 
 // TODO Maybe we should have a different name for this...?
 tui_write :: inline (format_string: string) {
-    if context.tui_buffer == null {
+    if context.tui_builder == null {
         write_string(format_string);
     }
     else {
-        append(context.tui_buffer, format_string);
+        append(context.tui_builder, format_string);
     }
 }