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=4628735241fc54be7b62d00640da1a25d3ad21fd;hpb=5d957fa546b1d2df1ccebc98c1a45cae38092f5e;p=sdl_omap.git

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index 4628735..fd4925c 100644
--- a/src/video/omapdss/sdlif.c
+++ b/src/video/omapdss/sdlif.c
@@ -11,6 +11,8 @@
 #include "../SDL_sysvideo.h"
 #include "../SDL_pixels_c.h"
 #include "../../events/SDL_events_c.h"
+
+#include "linux/xenv.h"
 #include "omapsdl.h"
 
 
@@ -89,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);
@@ -150,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)
@@ -190,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)