added emitter sprites

[fishladder.git] / vg / vg_console.h

diff --git a/vg/vg_console.h b/vg/vg_console.h
index 48dee1a4a0fbd36d4f625fdab7c0f25dfc9da7f4..76d38007241ef256112d1440159b7dcccc38331c 100644 (file)
--- a/vg/vg_console.h
+++ b/vg/vg_console.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
+
 struct vg_console
 {
        struct vg_convar
@@ -20,6 +22,8 @@ struct vg_console
                                int min, max, clamp;
                        } opt_i32;
                };
+
+               int persistent; // Should be stored to cfg/auto.conf
        } 
        *convars;
        
@@ -44,7 +48,43 @@ struct vg_console
 }
 vg_console = { .scale = 2 };
 
-static int vg_console_enabled(void) { return vg_console.enabled; }
+// Declerations
+// ------------
+
+// Registration
+static void vg_convar_push( struct vg_convar cv );
+static void vg_function_push( struct vg_cmd cmd );
+
+static void vg_console_draw( void );
+void vg_console_println( const char *str );
+static int vg_console_list( int argc, char const *argv[] );
+static void vg_console_init(void);
+static void vg_console_write_persistent(void);
+static void vg_console_free(void);
+static void execute_console_input( const char *cmd );
+
+// Console interface
+// -----------------
+
+static void console_make_selection( int* start, int* end );
+static void console_move_cursor( int* cursor0, int* cursor1, int dir, int snap_together );
+static int console_makeroom( int datastart, int length );
+static int console_delete_char( int direction );
+static void console_to_clipboard(void);
+static void console_clipboard_paste(void);
+static void console_put_char( char c );
+static void console_history_get( char* buf, int entry_num );
+static void console_proc_key( GLFWwindow* ptrW, int key, int scancode, int action, int mods );
+static void console_proc_wchar( GLFWwindow* ptrW, u32 uWchar );
+static int vg_console_enabled(void);
+
+// =========================================================================================================
+// Implementation
+
+static int vg_console_enabled(void) 
+{ 
+       return vg_console.enabled; 
+}
 
 static void vg_convar_push( struct vg_convar cv )
 {
@@ -61,18 +101,15 @@ static void vg_console_draw( void )
        if( !vg_console.enabled )
                return;
 
-       int ptr = vg_console.current - vg_console.len;
-       if( ptr <= 0 )
-               ptr += vg_list_size( vg_console.lines );
-       ptr --;
+       int ptr = vg_console.current-1;
        
        ui_global_ctx.cursor[0] = 0;
        ui_global_ctx.cursor[1] = 0;
-       ui_global_ctx.cursor[3] = vg_console.len*8*vg_console.scale;
+       ui_global_ctx.cursor[3] = vg_list_size( vg_console.lines )*8*vg_console.scale;
        ui_fill_x( &ui_global_ctx );
        
        ui_new_node( &ui_global_ctx );
-       {               
+       {
                ui_fill_rect( &ui_global_ctx, ui_global_ctx.cursor, 0x77333333 );
        
                ui_global_ctx.cursor[3] = 8*vg_console.scale;
@@ -80,12 +117,13 @@ static void vg_console_draw( void )
                
                for( int i = 0; i < vg_console.len; i ++ )
                {
-                       ui_text( &ui_global_ctx, vg_console.lines[ptr], vg_console.scale, 0 );
+                       if( ptr < 0 )
+                               ptr = vg_list_size( vg_console.lines )-1;
+         
+                       ui_text( &ui_global_ctx, vg_console.lines[ptr], vg_console.scale );
                        ui_global_ctx.cursor[1] -= 8*vg_console.scale;
                
                        ptr --;
-                       if( ptr < 0 )
-                               ptr = vg_list_size( vg_console.lines )-1;
                }
        }
        ui_end_down( &ui_global_ctx );
@@ -97,13 +135,13 @@ static void vg_console_draw( void )
        {
                ui_fill_rect( &ui_global_ctx, ui_global_ctx.cursor, 0x77333333 );
                
-               ui_text( &ui_global_ctx, vg_console.input, vg_console.scale, 0 );
+               ui_text( &ui_global_ctx, vg_console.input, vg_console.scale );
                
                int start = VG_MIN( vg_console.cursor_pos, vg_console.cursor_user ),
                         end   = VG_MAX( vg_console.cursor_pos, vg_console.cursor_user );
                
-               ui_global_ctx.cursor[0] = start * ui_glyph_spacing_x * vg_console.scale + 2;
-               ui_global_ctx.cursor[2] = (start == end? 0.2f: (float)(end-start)) * (float)ui_glyph_spacing_x * (float)vg_console.scale;
+               ui_global_ctx.cursor[0] = (start * ui_glyph_spacing_x * vg_console.scale) + 2;
+               ui_global_ctx.cursor[2] = (start == end? 0.2f: (float)(end-start)) * (float)ui_glyph_spacing_x * (float)vg_console.scale * 0.5f;
                
                ui_fill_rect( &ui_global_ctx, ui_global_ctx.cursor, 0x66ffffff );
        }
@@ -152,10 +190,59 @@ static void vg_console_init(void)
                .name = "list",
                .function = vg_console_list
        });
+
+       // Read and exec persistent commands
+       FILE *fp = fopen( "cfg/auto.conf", "r" );
+       if( fp )
+       {
+               char line[256];
+
+               while( fgets( line, sizeof( line ), fp ) )
+               {
+                       line[ strcspn( line, "\r\n#" ) ] = 0x00;
+
+                       if( line[0] != 0x00 )
+                       {
+                               execute_console_input( line );
+                       }
+               }
+
+               fclose( fp );
+       }
+}
+
+static void vg_console_write_persistent(void)
+{
+       FILE *fp = fopen( "cfg/auto.conf", "w" );
+       
+       for( int i = 0; i < arrlen( vg_console.convars ); i ++ )
+       {
+               struct vg_convar *cv = &vg_console.convars[i];
+
+               if( cv->persistent )
+               {
+                       switch( cv->data_type )
+                       {
+                               case k_convar_dtype_i32:
+                                       fprintf( fp, "%s %d\n", cv->name, *(i32 *)(cv->data) );
+                               break;
+                               case k_convar_dtype_u32:
+                                       fprintf( fp, "%s %u\n", cv->name, *(u32 *)(cv->data) );
+                               break;
+                               case k_convar_dtype_f32:
+                                       fprintf( fp, "%s %.5f\n", cv->name, *(float *)(cv->data ) );
+                               break;
+                       }
+               }
+       }
+
+       fclose( fp );
 }
 
 static void vg_console_free(void)
 {
+       vg_console_write_persistent();
+
        arrfree( vg_console.convars );
        arrfree( vg_console.functions );
 }
@@ -177,6 +264,9 @@ static void execute_console_input( const char *cmd )
                        {
                                temp[i] = '\0';
                                in_token = 0;
+                               
+                               if( arg_count == vg_list_size( args ) )
+                                       break;
                        }
                        else
                        {