X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_console.h;h=1024b82ac468b0b6e6c08d557e7561e965ffc387;hb=76d234b7dc5e6500e8a54009b367e7620f11ef97;hp=6f3c2bad7128e2650073138a6b8ed97137298101;hpb=11c1052e4f820d3002d2096f931bca70a4f3ef08;p=vg.git

diff --git a/vg_console.h b/vg_console.h
index 6f3c2ba..1024b82 100644
--- a/vg_console.h
+++ b/vg_console.h
@@ -73,29 +73,29 @@ struct vg_console{
 }
 static vg_console;
 
-VG_STATIC void _vg_console_draw( void );
+static void _vg_console_draw( void );
 void           _vg_console_println( const char *str );
-VG_STATIC int  _vg_console_list( int argc, char const *argv[] );
-VG_STATIC void _vg_console_init(void);
-VG_STATIC void _vg_console_write_persistent(void);
-VG_STATIC void _vg_console_free(void);
-VG_STATIC void  vg_execute_console_input( const char *cmd );
+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  vg_execute_console_input( const char *cmd );
 
 /*
  * Console interface
  */
-VG_STATIC void console_history_get( char* buf, int entry_num );
-VG_STATIC int _vg_console_enabled(void);
-VG_STATIC void console_proc_key( SDL_Keysym ev );
+static void console_history_get( char* buf, int entry_num );
+static int _vg_console_enabled(void);
+static void console_proc_key( SDL_Keysym ev );
 
 /*
  * Implementation
  */
-VG_STATIC int _vg_console_enabled(void){ 
+static int _vg_console_enabled(void){ 
 	return vg_console.enabled; 
 }
 
-VG_STATIC 
+static 
 void vg_console_reg_var( const char *alias, void *ptr, enum vg_var_dtype type, 
                          u32 flags )
 {
@@ -115,7 +115,7 @@ void vg_console_reg_var( const char *alias, void *ptr, enum vg_var_dtype type,
    vg_info( "Console variable '%s' registered\n", alias );
 }
 
-VG_STATIC 
+static 
 void vg_console_reg_cmd( const char *alias,
                          int (*function)(int argc, const char *argv[]),
                          void (*poll_suggest)(int argc, const char *argv[]) )
@@ -132,7 +132,7 @@ void vg_console_reg_cmd( const char *alias,
    vg_info( "Console function '%s' registered\n", alias );
 }
 
-VG_STATIC int _vg_console_list( int argc, char const *argv[] ){
+static int _vg_console_list( int argc, char const *argv[] ){
 	for( int i=0; i<vg_console.function_count; i ++ ){
 		struct vg_cmd *cmd = &vg_console.functions[ i ];
 		vg_info( "* %s\n", cmd->name );
@@ -194,19 +194,25 @@ int _ccmd_vg_console_defaults( int argc, const char *argv[] ){
    return 0;
 }
 
-VG_STATIC void _vg_console_init(void){
+static void _vg_console_init(void){
    vg_console_reg_cmd( "list", _vg_console_list, NULL );
    vg_console_reg_cmd( "crash", _test_break, NULL );
    vg_console_reg_cmd( "exec", _vg_console_exec, NULL );
    vg_console_reg_cmd( "defaults", _ccmd_vg_console_defaults, NULL );
-   vg_console_reg_var( "cheats", &vg_console.cheats, k_var_dtype_i32, 0 );
+   vg_console_reg_var( "cheats", &vg_console.cheats, k_var_dtype_i32, 
+#ifdef VG_DEVWINDOW
+                       VG_VAR_PERSISTENT
+#else 
+                       0
+#endif
+                       );
 }
 
-VG_STATIC void vg_console_load_autos(void){
+static void vg_console_load_autos(void){
    _vg_console_exec( 1, (const char *[]){ "auto.conf" } );
 }
 
-VG_STATIC void _vg_console_write_persistent(void){
+static void _vg_console_write_persistent(void){
 	FILE *fp = fopen( "cfg/auto.conf", "w" );
 	
 	for( int i=0; i<vg_console.var_count; i ++ ){
@@ -230,7 +236,7 @@ VG_STATIC void _vg_console_write_persistent(void){
 	fclose( fp );
 }
 
-VG_STATIC void _vg_console_free(void)
+static void _vg_console_free(void)
 {
 	_vg_console_write_persistent();
 }
@@ -240,7 +246,7 @@ VG_STATIC void _vg_console_free(void)
  * returns number of tokens
  * dst must be as long as src
  */
-VG_STATIC int vg_console_tokenize( const char *src, char *dst, 
+static int vg_console_tokenize( const char *src, char *dst, 
                                    const char *args[8] )
 {
 	int arg_count = 0,
@@ -275,7 +281,7 @@ VG_STATIC int vg_console_tokenize( const char *src, char *dst,
    return arg_count;
 }
 
-VG_STATIC vg_var *vg_console_match_var( const char *kw )
+static vg_var *vg_console_match_var( const char *kw )
 {
 	for( int i=0; i<vg_console.var_count; i ++ ){
 		struct vg_var *cv = &vg_console.vars[ i ];
@@ -287,7 +293,7 @@ VG_STATIC vg_var *vg_console_match_var( const char *kw )
    return NULL;
 }
 
-VG_STATIC vg_cmd *vg_console_match_cmd( const char *kw )
+static vg_cmd *vg_console_match_cmd( const char *kw )
 {
 	for( int i=0; i<vg_console.function_count; i ++ ){
 		struct vg_cmd *cmd = &vg_console.functions[ i ];
@@ -299,7 +305,7 @@ VG_STATIC vg_cmd *vg_console_match_cmd( const char *kw )
    return NULL;
 }
 
-VG_STATIC void vg_execute_console_input( const char *cmd )
+static void vg_execute_console_input( const char *cmd )
 {
 	char temp[512];
 	char const *args[8];
@@ -420,7 +426,7 @@ u32 str_lcs( const char *s1, const char *s2 ){
 }
 
 /* str must not fuckoff ever! */
-VG_STATIC void console_suggest_score_text( const char *str, const char *input,
+static void console_suggest_score_text( const char *str, const char *input,
                                            int minscore )
 {
    /* filter duplicates */
@@ -456,7 +462,7 @@ VG_STATIC void console_suggest_score_text( const char *str, const char *input,
    }
 }
 
-VG_STATIC void console_update_suggestions(void)
+static void console_update_suggestions(void)
 {
    if( vg_ui.focused_control_type != k_ui_control_textbox ||
        vg_ui.textbuf != vg_console.input )
@@ -528,7 +534,7 @@ VG_STATIC void console_update_suggestions(void)
 /*
  * Suggestion controls
  */
-VG_STATIC void _console_fetch_suggestion(void)
+static void _console_fetch_suggestion(void)
 {
    char *target = &vg_console.input[ vg_console.suggestion_pastepos ];
 
@@ -548,7 +554,7 @@ VG_STATIC void _console_fetch_suggestion(void)
    }
 }
 
-VG_STATIC void _console_suggest_store_normal(void)
+static void _console_suggest_store_normal(void)
 {
    if( vg_console.suggestion_select == -1 ){
       char *target = &vg_console.input[ vg_console.suggestion_pastepos ];
@@ -556,7 +562,7 @@ VG_STATIC void _console_suggest_store_normal(void)
    }
 }
 
-VG_STATIC void _console_suggest_next(void)
+static void _console_suggest_next(void)
 {
    if( vg_console.suggestion_count ){
       _console_suggest_store_normal();
@@ -570,7 +576,7 @@ VG_STATIC void _console_suggest_next(void)
    }
 }
 
-VG_STATIC void _console_suggest_prev(void)
+static void _console_suggest_prev(void)
 {
    if( vg_console.suggestion_count ){
       _console_suggest_store_normal();
@@ -584,14 +590,14 @@ VG_STATIC void _console_suggest_prev(void)
    }
 }
 
-VG_STATIC void _vg_console_on_update( char *buf, u32 len )
+static void _vg_console_on_update( char *buf, u32 len )
 {
    if( buf == vg_console.input ){
       console_update_suggestions();
    }
 }
 
-VG_STATIC void console_history_get( char* buf, int entry_num )
+static void console_history_get( char* buf, int entry_num )
 {
 	if( !vg_console.history_count )
 		return;
@@ -602,7 +608,7 @@ VG_STATIC void console_history_get( char* buf, int entry_num )
 	strcpy( buf, vg_console.history[ pick ] );
 }
 
-VG_STATIC void _vg_console_on_up( char *buf, u32 len )
+static void _vg_console_on_up( char *buf, u32 len )
 {
    if( buf == vg_console.input ){
       vg_console.history_pos = 
@@ -627,7 +633,7 @@ VG_STATIC void _vg_console_on_up( char *buf, u32 len )
    }
 }
 
-VG_STATIC void _vg_console_on_down( char *buf, u32 len )
+static void _vg_console_on_down( char *buf, u32 len )
 {
    if( buf == vg_console.input ){
       vg_console.history_pos = VG_MAX( 0, vg_console.history_pos-1 );
@@ -639,7 +645,7 @@ VG_STATIC void _vg_console_on_down( char *buf, u32 len )
    }
 }
 
-VG_STATIC void _vg_console_on_enter( char *buf, u32 len )
+static void _vg_console_on_enter( char *buf, u32 len )
 {
    if( buf == vg_console.input ){
       if( !strlen( vg_console.input ) ) 
@@ -669,14 +675,14 @@ VG_STATIC void _vg_console_on_enter( char *buf, u32 len )
    }
 }
 
-VG_STATIC void _vg_console_draw(void)
+static void _vg_console_draw(void)
 {
 	if( !vg_console.enabled ) return;
 
    SDL_AtomicLock( &log_print_sl );
 
 	int ptr = vg_log.log_line_current;
-   int const fh = 14, log_lines = 32;
+   int const fh = vg_ui.font->line_height, log_lines = 32;
    int console_lines = VG_MIN( log_lines, vg_log.log_line_count );
 
    ui_rect rect_log   = { 0, 0,                vg.window_x, log_lines*fh },
@@ -710,7 +716,8 @@ VG_STATIC void _vg_console_draw(void)
       .change = _vg_console_on_update,
       .enter = _vg_console_on_enter
    };
-   ui_textbox( rect_input, vg_console.input, vg_list_size(vg_console.input),
+   ui_textbox( rect_input, NULL, 
+               vg_console.input, vg_list_size(vg_console.input), 1,
                UI_TEXTBOX_AUTOFOCUS, &callbacks );
 
    /* 
@@ -720,9 +727,9 @@ VG_STATIC void _vg_console_draw(void)
       ui_rect rect_suggest;
       rect_copy( rect_input, rect_suggest );
 
-      rect_suggest[0] += 6 + UI_GLYPH_SPACING_X*vg_console.suggestion_pastepos;
+      rect_suggest[0] += 6 + vg_ui.font->spacing*vg_console.suggestion_pastepos;
       rect_suggest[1] += rect_input[3];
-      rect_suggest[2]  = UI_GLYPH_SPACING_X * vg_console.suggestion_maxlen;
+      rect_suggest[2]  = vg_ui.font->spacing * vg_console.suggestion_maxlen;
       rect_suggest[3]  = vg_console.suggestion_count * fh;
 
       ui_fill( rect_suggest, bg_colour );