window defaults&persistent

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 919f6f3b878049b68f55afb749eddf904d7c37c1..7822a9595c8e7ae9ec5c87f91f9f25d191909584 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -758,47 +758,45 @@ static void _vg_init_window( const char *window_name )
    vg.window_x = video_mode.w;
    vg.window_y = video_mode.h;
 
-#ifdef VG_DEVWINDOW
-   vg.window_x = 1280;
-   vg.window_y = 720;
-#endif
-
 #ifndef _WIN32
        SDL_SetHint( "SDL_VIDEO_X11_XINERAMA", "1" );
        SDL_SetHint( "SDL_VIDEO_X11_XRANDR", "0" );
        SDL_SetHint( "SDL_VIDEO_X11_XVIDMODE", "0" );
 #endif
 
-   vg_info( "CreateWindow( %d %d @%dhz )\n", vg.window_x, vg.window_y,
-                                             vg.display_refresh_rate );
+   u32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_GRABBED;
+
+#ifdef VG_DEVWINDOW
+   flags |= SDL_WINDOW_BORDERLESS;
+   vg.screen_mode = 2;
+   vg.window_x = 1280;
+   vg.window_y = 720;
+#else
+
+   if( vg.screen_mode == 2 )
+      flags |= SDL_WINDOW_RESIZABLE;
+   else if( vg.screen_mode == 1 )
+      flags |= SDL_WINDOW_FULLSCREEN;
+   else
+      flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+
+#endif
+
+   vg_info( "CreateWindow( %d %d %u )\n", vg.window_x, vg.window_y, flags );
 
-   /* TODO: Allow selecting closest video mode from launch opts */
    if((vg.window = SDL_CreateWindow( window_name,
+         0, 0, vg.window_x, vg.window_y, flags ))){
 
 #ifdef VG_DEVWINDOW
-         0, 0, vg.window_x, vg.window_y, 
-         SDL_WINDOW_BORDERLESS|SDL_WINDOW_OPENGL|SDL_WINDOW_INPUT_GRABBED
-      ))){
       SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
-      vg.screen_mode = 2;
-   }
-#else
-                                     0, 0,
-                                     vg.window_x, vg.window_y,
-
-                                     SDL_WINDOW_FULLSCREEN_DESKTOP | 
-                                     SDL_WINDOW_OPENGL |
-                                     SDL_WINDOW_INPUT_GRABBED |
-                                     SDL_WINDOW_RESIZABLE
-                                     )))
-   {
+#endif
+      
       if( SDL_SetWindowDisplayMode( vg.window, &video_mode ) ){
          vg_error( "SDL_SetWindowDisplayMode failed: %s", SDL_GetError() );
          SDL_Quit();
          exit(0);
       }
    }
-#endif
    else{
       vg_error( "SDL_CreateWindow failed: %s", SDL_GetError() );
       exit(0);
@@ -850,12 +848,7 @@ static void _vg_init_window( const char *window_name )
    }
 
    vg_info( "Display refresh rate: %d\n", dispmode.refresh_rate );
-   vg.fps_limit = vg.display_refresh_rate;
-
-#if defined(_WIN32) || defined(VG_DEVWINDOW)
-#else
-   //vg.vsync = 1;
-#endif
+   if( !vg.fps_limit) vg.fps_limit = vg.display_refresh_rate;
 }
 
 static void _vg_terminate(void)
@@ -884,8 +877,16 @@ static void vg_enter( int argc, char *argv[], const char *window_name ){
    vg_alloc_quota();
    _vg_console_init();
    
-   vg_console_reg_var( "fps_limit", &vg.fps_limit, k_var_dtype_i32, 0 );
-   vg_console_reg_var( "vsync", &vg.vsync, k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_fps_limit", &vg.fps_limit, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_vsync", &vg.vsync, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_quality", &vg.quality_profile, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_screen_mode", &vg.screen_mode,
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_load_autos();
+
    vg_console_reg_cmd( "vg_settings", cmd_vg_settings_toggle, NULL );
    _vg_init_window( window_name );