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

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index 2b76641..fd4925c 100644
--- a/src/video/omapdss/sdlif.c
+++ b/src/video/omapdss/sdlif.c
@@ -5,11 +5,14 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "../SDL_sysvideo.h"
 #include "../SDL_pixels_c.h"
 #include "../../events/SDL_events_c.h"
+
+#include "linux/xenv.h"
 #include "omapsdl.h"
 
 
@@ -27,6 +30,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 +41,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 +68,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
 	};
 
@@ -93,15 +91,49 @@ static SDL_Rect **omap_ListModes(SDL_VideoDevice *this, SDL_PixelFormat *format,
 static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *current, int width,
 					int height, int bpp, Uint32 flags)
 {
+	SDL_PixelFormat *format;
+	Uint32 unhandled_flags;
+	int ret;
+
 	trace("%d, %d, %d, %08x", width, height, bpp, flags);
 
-	if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0)
+	omapsdl_config_from_env();
+
+	switch (bpp) {
+	case 16:
+		format = SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0);
+		break;
+	case 24:
+		format = SDL_ReallocFormat(current, 24, 0xff0000, 0xff00, 0xff, 0);
+		break;
+	case 32:
+		format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0xff000000);
+		break;
+	default:
+		err("SetVideoMode: bpp %d not supported", bpp);
+		return NULL;
+	}
+	if (format == NULL)
 		return NULL;
 
-	if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0))
+	if (!(flags & SDL_DOUBLEBUF) && gcfg_force_doublebuf) {
+		log("forcing SDL_DOUBLEBUF");
+		flags |= SDL_DOUBLEBUF;
+	}
+
+	ret = osdl_video_set_mode(this->hidden, width, height, bpp,
+		(flags & SDL_DOUBLEBUF) ? 1 : 0);
+	if (ret < 0)
 		return NULL;
 
-	current->flags = SDL_FULLSCREEN | SDL_DOUBLEBUF | SDL_HWSURFACE;
+	flags |= SDL_FULLSCREEN | SDL_HWSURFACE;
+	unhandled_flags = flags & ~(SDL_FULLSCREEN | SDL_HWSURFACE | SDL_DOUBLEBUF);
+	if (unhandled_flags != 0) {
+		log("dropping unhandled flags: %08x", unhandled_flags);
+		flags &= ~unhandled_flags;
+	}
+
+	current->flags = flags;
 	current->w = width;
 	current->h = height;
 	current->pitch = SDL_CalculatePitch(current);
@@ -154,16 +186,13 @@ static void omap_UpdateRects(SDL_VideoDevice *this, int nrects, SDL_Rect *rects)
 {
 	trace("%d, %p", nrects, rects);
 
-	if (nrects != 1 || rects->x != 0 || rects->y != 0 ||
-			rects->w != this->screen->w || rects->h != this->screen->h) {
-		static int warned = 0;
-		if (!warned) {
-			not_supported();
-			warned = 1;
-		}
+	/* hmh.. */
+	if (nrects == 1 && rects->x == 0 && rects->y == 0 &&
+	    (this->screen->flags & SDL_DOUBLEBUF) &&
+	    rects->w == this->screen->w && rects->h == this->screen->h)
+	{
+		this->screen->pixels = osdl_video_flip(this->hidden);
 	}
-
-	this->screen->pixels = osdl_video_flip(this->hidden);
 }
 
 static void omap_InitOSKeymap(SDL_VideoDevice *this)
@@ -194,9 +223,16 @@ static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure)
 
 static void omap_PumpEvents(SDL_VideoDevice *this) 
 {
+	struct SDL_PrivateVideoData *pdata = this->hidden;
+	int dummy;
+
 	trace();
 
 	omapsdl_input_get_events(0, key_event_cb, ts_event_cb, NULL);
+
+	// XXX: we might want to process some X events too
+	if (pdata->xenv_up)
+		xenv_update(&dummy);
 }
 
 static SDL_VideoDevice *omap_create(int devindex)