fullscreen problems

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 2f6ee081884c40299d08ed4f2602d7be3f794439..0dfc281c7cbc69c31392a7e32b84c57f0a87d6a1 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -769,38 +769,25 @@ static void _vg_init_window( const char *window_name )
        SDL_SetHint( "SDL_VIDEO_X11_XVIDMODE", "0" );
 #endif
 
-   u32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_GRABBED;
+   u32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_GRABBED |
+               SDL_WINDOW_RESIZABLE;
 
 #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 )
+   if( vg.screen_mode == 1 )
       flags |= SDL_WINDOW_FULLSCREEN;
-   else
+   else if( vg.screen_mode == 0 )
       flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
-
 #endif
 
    vg_info( "CreateWindow( %d %d %u )\n", vg.window_x, vg.window_y, flags );
 
-   if((vg.window = SDL_CreateWindow( window_name,
-         0, 0, vg.window_x, vg.window_y, flags ))){
-
-#ifdef VG_DEVWINDOW
-      SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
-#endif
-      
-      if( SDL_SetWindowDisplayMode( vg.window, &video_mode ) ){
-         vg_error( "SDL_SetWindowDisplayMode failed: %s", SDL_GetError() );
-         SDL_Quit();
-         exit(0);
-      }
+   if((vg.window = SDL_CreateWindow( window_name, 0, 0, 
+                                     vg.window_x, vg.window_y, flags ))){
+      if( vg.screen_mode == 2 )
+         SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
    }
    else{
       vg_error( "SDL_CreateWindow failed: %s", SDL_GetError() );