bunch of stuff for pre-alpha build

[fishladder.git] / vg / vg_console.h

diff --git a/vg/vg_console.h b/vg/vg_console.h
index 94de7d205db4c8d46b65eeac44daddf4de837219..0e974f83b0223e2d87f257a0cd41b7357aa81467 100644 (file)
--- a/vg/vg_console.h
+++ b/vg/vg_console.h
@@ -23,6 +23,13 @@ struct vg_console
        } 
        *convars;
        
+       struct vg_cmd
+       {
+               int (*function)( int argc, char const *argv[] );
+               const char *name;
+       }
+       *functions;
+       
        char lines[16][512];
        u32 current, len;
        
@@ -44,6 +51,11 @@ static void vg_convar_push( struct vg_convar cv )
        arrpush( vg_console.convars, cv ); 
 }
 
+static void vg_function_push( struct vg_cmd cmd )
+{
+       arrpush( vg_console.functions, cmd );
+}
+
 static void vg_console_draw( void )
 {
        if( !vg_console.enabled )
@@ -109,6 +121,25 @@ void vg_console_println( const char *str )
                vg_console.current = 0;
 }
 
+static int vg_console_list( int argc, char const *argv[] )
+{
+       for( int i = 0; i < arrlen( vg_console.functions ); i ++ )
+       {
+               struct vg_cmd *cmd = &vg_console.functions[ i ];
+               vg_info( "* %s\n", cmd->name );
+       }
+       
+       vg_info( "* snowsound\n" );
+       
+       for( int i = 0; i < arrlen( vg_console.convars ); i ++ )
+       {
+               struct vg_convar *cv = &vg_console.convars[ i ];
+               vg_info( "%s\n", cv->name );
+       }
+       
+       return 0;
+}
+
 static void vg_console_init(void)
 {
        vg_log_callback = vg_console_println;
@@ -116,66 +147,74 @@ static void vg_console_init(void)
        vg_convar_push( (struct vg_convar)
        { .name = "console_scale", .data = &vg_console.scale, .data_type = k_convar_dtype_i32, 
                .opt_i32 = { .clamp = 1, .min = 1, .max = 7 } } );
+       
+       vg_function_push( (struct vg_cmd){
+               .name = "list",
+               .function = vg_console_list
+       });
 }
 
 static void vg_console_free(void)
 {
        arrfree( vg_console.convars );
+       arrfree( vg_console.functions );
 }
 
-// Returns advance amount
-static int console_token_read( char *buf, int buf_len, const char *src )
+static void execute_console_input( const char *cmd )
 {
-       int wait_for_next = 0;
-
-       for( int i = 0; i < buf_len; i ++ )
+       char temp[512];
+       char const *args[9];
+       int arg_count = 0;
+       
+       int in_token = 0;
+       
+       // Split string into tokens
+       for( int i = 0; i < vg_list_size( temp ); i ++ )
        {
-               if( src[i] )
+               if( cmd[i] )
                {
-                       if( isspace( src[i] ) )
+                       if( isspace( cmd[i] ) )
                        {
-                               buf[i] = '\0';
-                               wait_for_next = 1;
+                               temp[i] = '\0';
+                               in_token = 0;
                        }
-                       else 
+                       else
                        {
-                               if( wait_for_next )
-                                       return i;
+                               temp[i] = cmd[i];
                                
-                               buf[i] = src[i];
-                       }       
+                               if( !in_token )
+                               {
+                                       args[ arg_count ++ ] = temp + i;
+                                       in_token = 1;
+                               }
+                       }
                }
                else
                {
-                       buf[i] = '\0';
-                       return i;
+                       temp[i] = '\0';
+                       break;
                }
        }
        
-       return 0;
-}
-
-static void execute_console_input( const char *cmd )
-{
-       char temp[512];
-       int cmd_pos = console_token_read( temp, 512, cmd );
+       if( arg_count == 0 )
+               return;
        
        int data_int;
        
        for( int i = 0; i < arrlen( vg_console.convars ); i ++ )
        {
                struct vg_convar *cv = &vg_console.convars[ i ];
-               if( !strcmp( cv->name, temp ) )
+               if( !strcmp( cv->name, args[0] ) )
                {
-                       // Matched, try get value
-                       if( console_token_read( temp, 512, cmd+cmd_pos ) )
+                       // Cvar Matched, try get value
+                       if( arg_count >= 2 )
                        {
                                switch( cv->data_type )
                                {
                                        case k_convar_dtype_u32:
                                        case k_convar_dtype_i32: 
                                                
-                                               data_int = atoi( temp ); 
+                                               data_int = atoi( args[1] ); 
                                                *((int *)cv->data) = cv->opt_i32.clamp? VG_MIN( VG_MAX(data_int, cv->opt_i32.min), cv->opt_i32.max ): data_int;
                                        
                                        break;
@@ -196,7 +235,19 @@ static void execute_console_input( const char *cmd )
                }
        }
        
-       vg_error( "No command/variable named '%s'\n", temp );
+       // Try commands
+       for( int i = 0; i < arrlen( vg_console.functions ); i ++ )
+       {
+               struct vg_cmd *cmd = &vg_console.functions[ i ];
+               if( !strcmp( cmd->name, args[0] ) )
+               {
+                       // Call function
+                       cmd->function( arg_count-1, args+1 );
+                       return;
+               }
+       }
+       
+       vg_error( "No command/variable named '%s'. Use 'list' to view all\n", args[0] );
 }
 
 // =============================================================================================================================