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

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index 4628735..f7ab47f 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,12 +91,28 @@ 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;
+
 	trace("%d, %d, %d, %08x", width, height, bpp, flags);
 
-	if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0)
+	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\n", bpp);
+		return NULL;
+	}
+	if (format == NULL)
 		return NULL;
 
-	if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0))
+	if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0)
 		return NULL;
 
 	current->flags = SDL_FULLSCREEN | SDL_DOUBLEBUF | SDL_HWSURFACE;
@@ -190,9 +208,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)