detect default resolution properly, fix res list

[sdl_omap.git] / src / video / omapdss / sdlif.c

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index 93d18f7..585f69d 100644 (file)
--- a/src/video/omapdss/sdlif.c
+++ b/src/video/omapdss/sdlif.c
@@ -5,6 +5,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "../SDL_sysvideo.h"
@@ -27,6 +28,9 @@ static void omap_free(SDL_VideoDevice *device)
 
 static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat)
 {
+       const char *tmp;
+       int w, h, ret;
+
        trace();
 
        // default to 16bpp
@@ -35,6 +39,18 @@ static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat)
        omapsdl_input_init();
        omapsdl_config();
 
+       tmp = getenv("SDL_OMAP_DEFAULT_MODE");
+       if (tmp != NULL && sscanf(tmp, "%dx%d", &w, &h) == 2) {
+               this->info.current_w = w;
+               this->info.current_h = h;
+       }
+       else if (osdl_video_detect_screen(this->hidden) == 0) {
+               this->info.current_w = this->hidden->screen_w;
+               this->info.current_h = this->hidden->screen_h;
+       }
+
+       this->info.hw_available = 1;
+
        return 0;
 }
 
@@ -50,25 +66,34 @@ static void omap_VideoQuit(SDL_VideoDevice *this)
 static SDL_Rect **omap_ListModes(SDL_VideoDevice *this, SDL_PixelFormat *format, Uint32 flags)
 {
        static SDL_Rect omap_mode_list[] = {
-               // XXX: we are not really restricted to fixed modes
-               // FIXME: should really check the display for max supported
-               { 0, 0, 800, 480 },
-               { 0, 0, 720, 480 },
-               { 0, 0, 640, 480 },
-               { 0, 0, 640, 400 },
-               { 0, 0, 512, 384 },
-               { 0, 0, 320, 240 },
-               { 0, 0, 320, 200 },
+               /* XXX: we are not really restricted to fixed modes */
+               { 0, 0, 1600, 1200 },
+               { 0, 0, 1408, 1056 },
+               { 0, 0, 1280, 1024 },
+               { 0, 0, 1152,  864 },
+               { 0, 0, 1024,  768 },
+               { 0, 0,  960,  720 },
+               { 0, 0,  800,  600 },
+               { 0, 0,  768,  576 },
+               { 0, 0,  720,  576 },
+               { 0, 0,  800,  480 },
+               { 0, 0,  720,  480 },
+               { 0, 0,  640,  480 },
+               { 0, 0,  640,  400 },
+               { 0, 0,  512,  384 },
+               { 0, 0,  320,  240 },
+               { 0, 0,  320,  200 },
        };
-       // broken API needs this
+       /* broken API needs this stupidity */
        static SDL_Rect *omap_modes[] = {
-               &omap_mode_list[0],
-               &omap_mode_list[1],
-               &omap_mode_list[2],
-               &omap_mode_list[3],
-               &omap_mode_list[4],
-               &omap_mode_list[5],
-               &omap_mode_list[6],
+               &omap_mode_list[ 0], &omap_mode_list[ 1],
+               &omap_mode_list[ 2], &omap_mode_list[ 3],
+               &omap_mode_list[ 4], &omap_mode_list[ 5],
+               &omap_mode_list[ 6], &omap_mode_list[ 7],
+               &omap_mode_list[ 8], &omap_mode_list[ 9],
+               &omap_mode_list[10], &omap_mode_list[11],
+               &omap_mode_list[12], &omap_mode_list[13],
+               &omap_mode_list[14], &omap_mode_list[15],
                NULL
        };
 
@@ -123,6 +148,18 @@ static int omap_FlipHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
        return 0;
 }
 
+/* we can't do hw surfaces (besides screen one) yet */
+static int omap_AllocHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
+{
+       trace("%p", surface);
+       return -1;
+}
+
+static void omap_FreeHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
+{
+       trace("%p", surface);
+}
+
 static int omap_SetColors(SDL_VideoDevice *this, int firstcolor, int ncolors, SDL_Color *colors)
 {
        trace("%d, %d, %p", firstcolor, ncolors, colors);
@@ -194,6 +231,8 @@ static SDL_VideoDevice *omap_create(int devindex)
        this->LockHWSurface = omap_LockHWSurface;
        this->UnlockHWSurface = omap_UnlockHWSurface;
        this->FlipHWSurface = omap_FlipHWSurface;
+       this->AllocHWSurface = omap_AllocHWSurface;
+       this->FreeHWSurface = omap_FreeHWSurface;
        this->SetColors = omap_SetColors;
        this->UpdateRects = omap_UpdateRects;
        this->VideoQuit = omap_VideoQuit;