X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=4628735241fc54be7b62d00640da1a25d3ad21fd;hb=5d957fa546b1d2df1ccebc98c1a45cae38092f5e;hp=2b7664129d5df05204c60e53f67a2629d682a0b8;hpb=37299201ea61744044352c1b70c9e68faa206c3e;p=sdl_omap.git

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index 2b76641..4628735 100644
--- 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,19 @@ 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->handles_any_size = 1;
+	this->info.hw_available = 1;
+
 	return 0;
 }
 
@@ -49,35 +66,14 @@ 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, 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 },
+	static SDL_Rect omap_mode_max = {
+		/* with handles_any_size, should accept anything up to this
+		 * XXX: possibly set this dynamically based on free vram? */
+		0, 0, 1600, 1200
 	};
-	// 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_max,
 		NULL
 	};