X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=7511ee49bfc4bec451fa465aa42fb34fe8a7fad9;hb=e1837b2c78d48d2811ff77e8702810b7620dd4f8;hp=fb690d47a4cf37c528b0af6877247f29214ede1e;hpb=455c8c43b353b60ebbb70caa09ae87be49520838;p=sdl_omap.git

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index fb690d4..7511ee4 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,6 +94,7 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 	struct SDL_PrivateVideoData *pdata = this->hidden;
 	SDL_PixelFormat *format;
 	Uint32 unhandled_flags;
+	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);
@@ -131,14 +132,20 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 		}
 	}
 
+	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, (flags & SDL_DOUBLEBUF) ? 1 : 0);
+		width, height, bpp, &doublebuf);
 	if (fbmem == NULL) {
-		log("failing on mode %dx%d@%d, doublebuf %s",
-		    width, height, bpp, (flags & SDL_DOUBLEBUF) ? "on" : "off");
+		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);
@@ -152,6 +159,7 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 	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) {
 		int v_width  = width  - (pdata->border_l + pdata->border_r);
@@ -177,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;
 }
@@ -204,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);
 	}
 }
 
@@ -233,41 +246,74 @@ static int key_event_cb(void *cb_arg, int sdl_kc, int is_pressed)
 	if (x < (min)) x = min; \
 	if (x >= (max)) x = max
 
-static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure)
+static void translate_mouse(SDL_VideoDevice *this, int *x, int *y)
 {
-	static int was_pressed;
-	SDL_VideoDevice *this = cb_arg;
 	struct SDL_PrivateVideoData *pdata = this->hidden;
-	int xoffs;
 
 	if (!pdata->cfg_no_ts_translate && pdata->layer_w != 0 && pdata->layer_h != 0) {
-		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);
+		*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);
 	}
+}
 
-	SDL_PrivateMouseMotion(0, 0, x, y);
+static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure)
+{
+	static int was_pressed;
+	SDL_VideoDevice *this = cb_arg;
+	struct SDL_PrivateVideoData *pdata = this->hidden;
+
+	translate_mouse(this, &x, &y);
 
 	pressure = !!pressure;
 	if (pressure != was_pressed) {
-		SDL_PrivateMouseButton(pressure ? SDL_PRESSED : SDL_RELEASED, 1, 0, 0);
+		SDL_PrivateMouseButton(pressure ? SDL_PRESSED : SDL_RELEASED, 1, x, y);
 		was_pressed = pressure;
 	}
+	else
+		SDL_PrivateMouseMotion(0, 0, x, y);
+}
+
+static int mouseb_event_cb(void *cb_arg, int x, int y, int button, int is_pressed)
+{
+	SDL_VideoDevice *this = cb_arg;
+	struct SDL_PrivateVideoData *pdata = this->hidden;
+
+	translate_mouse(this, &x, &y);
+	SDL_PrivateMouseButton(is_pressed ? SDL_PRESSED : SDL_RELEASED, button, x, y);
+}
+
+static int mousem_event_cb(void *cb_arg, int x, int y)
+{
+	SDL_VideoDevice *this = cb_arg;
+	struct SDL_PrivateVideoData *pdata = this->hidden;
+
+	translate_mouse(this, &x, &y);
+	SDL_PrivateMouseMotion(0, 0, x, y);
 }
 
 static void omap_PumpEvents(SDL_VideoDevice *this) 
 {
 	struct SDL_PrivateVideoData *pdata = this->hidden;
-	int dummy;
+	int read_tslib = 1;
 
 	trace();
 
-	omapsdl_input_get_events(0, key_event_cb, ts_event_cb, this);
+	if (pdata->xenv_up) {
+		if (!pdata->cfg_ts_force_tslib) {
+			xenv_update(NULL, mouseb_event_cb, mousem_event_cb, this);
+			if (pdata->xenv_mouse)
+				read_tslib = 0;
+		}
+		else {
+			/* just flush X event queue */
+			xenv_update(NULL, NULL, NULL, NULL);
+		}
+	}
 
-	// XXX: we might want to process some X events too
-	if (pdata->xenv_up)
-		xenv_update(&dummy);
+	omapsdl_input_get_events(0, key_event_cb,
+		read_tslib ? ts_event_cb : NULL, this);
 }
 
 static SDL_VideoDevice *omap_create(int devindex)