X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=f7a6d28ea4bb7d761a43af5f0ff665df116e41a8;hb=9ab462cd62f28e75898b20c6d9e31ad45a220d7d;hp=a4443c8ef921178f02ffe336ef0541fe9ef5bb15;hpb=5f4b1fd346a57d90ffda9eaba68c7b0b0aa8acab;p=sdl_omap.git

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index a4443c8..f7a6d28 100644
--- a/src/video/omapdss/sdlif.c
+++ b/src/video/omapdss/sdlif.c
@@ -1,5 +1,5 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2010
+ * (C) Gražvydas "notaz" Ignotas, 2010-2012
  *
  * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
  * See the COPYING file in the top-level directory.
@@ -13,7 +13,7 @@
 #include "../../events/SDL_events_c.h"
 
 #include "linux/xenv.h"
-#include "omapsdl.h"
+#include "osdl.h"
 
 
 static int omap_available(void) 
@@ -94,7 +94,8 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 	struct SDL_PrivateVideoData *pdata = this->hidden;
 	SDL_PixelFormat *format;
 	Uint32 unhandled_flags;
-	int ret;
+	int doublebuf;
+	void *fbmem;
 
 	trace("%d, %d, %d, %08x", width, height, bpp, flags);
 
@@ -108,7 +109,7 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 		format = SDL_ReallocFormat(current, 24, 0xff0000, 0xff00, 0xff, 0);
 		break;
 	case 32:
-		format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0xff000000);
+		format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0);
 		break;
 	default:
 		err("SetVideoMode: bpp %d not supported", bpp);
@@ -122,10 +123,29 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 		flags |= SDL_DOUBLEBUF;
 	}
 
-	ret = osdl_video_set_mode(pdata, width, height, bpp,
-		(flags & SDL_DOUBLEBUF) ? 1 : 0);
-	if (ret < 0)
+	if (pdata->border_l | pdata->border_r | pdata->border_t | pdata->border_b) {
+		if (pdata->border_l + pdata->border_r >= width
+		    || pdata->border_t + pdata->border_b >= height)
+		{
+			err("specified border too large, ignoring");
+			pdata->border_l = pdata->border_r = pdata->border_t = pdata->border_b = 0;
+		}
+	}
+
+	doublebuf = (flags & SDL_DOUBLEBUF) ? 1 : 0;
+	fbmem = osdl_video_set_mode(pdata,
+		pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b,
+		width, height, bpp, &doublebuf);
+	if (fbmem == NULL) {
+		err("failing on mode %dx%d@%d, doublebuf %s, border %d,%d,%d,%d",
+		    width, height, bpp, (flags & SDL_DOUBLEBUF) ? "on" : "off",
+		    pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b);
 		return NULL;
+	}
+	if ((flags & SDL_DOUBLEBUF) && !doublebuf) {
+		log("doublebuffering could not be set\n");
+		flags &= ~SDL_DOUBLEBUF;
+	}
 
 	flags |= SDL_FULLSCREEN | SDL_HWSURFACE;
 	unhandled_flags = flags & ~(SDL_FULLSCREEN | SDL_HWSURFACE | SDL_DOUBLEBUF);
@@ -138,14 +158,16 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 	current->w = width;
 	current->h = height;
 	current->pitch = SDL_CalculatePitch(current);
+	current->pixels = fbmem;
+	pdata->app_uses_flip = 0;
 
 	if (pdata->layer_w != 0 && pdata->layer_h != 0) {
-		pdata->ts_xmul = (width  << 16) / pdata->layer_w;
-		pdata->ts_ymul = (height << 16) / pdata->layer_h;
+		int v_width  = width  - (pdata->border_l + pdata->border_r);
+		int v_height = height - (pdata->border_t + pdata->border_b);
+		pdata->ts_xmul = (v_width  << 16) / pdata->layer_w;
+		pdata->ts_ymul = (v_height << 16) / pdata->layer_h;
 	}
 
-	current->pixels = osdl_video_flip(pdata);
-
 	return current;
 }
 
@@ -163,9 +185,12 @@ static void omap_UnlockHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
 
 static int omap_FlipHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
 {
+	struct SDL_PrivateVideoData *pdata = this->hidden;
+
 	trace("%p", surface);
 
-	surface->pixels = osdl_video_flip(this->hidden);
+	surface->pixels = osdl_video_flip(pdata);
+	pdata->app_uses_flip = 1;
 
 	return 0;
 }
@@ -190,14 +215,16 @@ static int omap_SetColors(SDL_VideoDevice *this, int firstcolor, int ncolors, SD
 
 static void omap_UpdateRects(SDL_VideoDevice *this, int nrects, SDL_Rect *rects)
 {
+	struct SDL_PrivateVideoData *pdata = this->hidden;
+
 	trace("%d, %p", nrects, rects);
 
-	/* 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)
+	/* for doublebuf forcing on apps */
+	if (nrects == 1 && rects->x == 0 && rects->y == 0
+	    && !pdata->app_uses_flip && (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(pdata);
 	}
 }
 
@@ -227,8 +254,8 @@ static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure)
 	int xoffs;
 
 	if (!pdata->cfg_no_ts_translate && pdata->layer_w != 0 && pdata->layer_h != 0) {
-		x = (x - pdata->layer_x) * pdata->ts_xmul >> 16;
-		y = (y - pdata->layer_y) * pdata->ts_ymul >> 16;
+		x = pdata->border_l + ((x - pdata->layer_x) * pdata->ts_xmul >> 16);
+		y = pdata->border_t + ((y - pdata->layer_y) * pdata->ts_ymul >> 16);
 		clamp(x, 0, this->screen->w);
 		clamp(y, 0, this->screen->h);
 	}