X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=sdl_omap.git;a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fconfig.c;h=10a9036bd5b692daaa7db4f35a2283815f882f95;hp=52809d6328fc4c584957dc810f36f69e399b50be;hb=5cc6dcb71c2f2f24e54bf1ab9f09d8e560e8e4d9;hpb=83b5751b446734b65e83ed4210b3c5cba3435866

diff --git a/src/video/omapdss/config.c b/src/video/omapdss/config.c
index 52809d6..10a9036 100644
--- a/src/video/omapdss/config.c
+++ b/src/video/omapdss/config.c
@@ -11,9 +11,7 @@
 #include <strings.h>
 #include <ctype.h>
 
-#include "omapsdl.h"
-
-int gcfg_force_vsync;
+#include "osdl.h"
 
 static char *sskip(char *p)
 {
@@ -51,7 +49,7 @@ static int check_token_eq(char **p_, const char *token)
 	return ret;
 }
 
-void omapsdl_config(void)
+void omapsdl_config(struct SDL_PrivateVideoData *pdata)
 {
 	char buff[256];
 	FILE *f;
@@ -65,7 +63,7 @@ void omapsdl_config(void)
 		if (line == NULL)
 			break;
 		p = line = sskip(line);
-		if (*p == '#')
+		if (*p == 0 || *p == '#')
 			continue;
 
 		if (check_token(&p, "bind")) {
@@ -86,7 +84,23 @@ void omapsdl_config(void)
 			continue;
 		}
 		else if (check_token_eq(&p, "force_vsync")) {
-			gcfg_force_vsync = strtol(p, NULL, 0);
+			pdata->cfg_force_vsync = !!strtol(p, NULL, 0);
+			continue;
+		}
+		else if (check_token_eq(&p, "force_doublebuf")) {
+			pdata->cfg_force_doublebuf = !!strtol(p, NULL, 0);
+			continue;
+		}
+		else if (check_token_eq(&p, "force_directbuf")) {
+			pdata->cfg_force_directbuf = !!strtol(p, NULL, 0);
+			continue;
+		}
+		else if (check_token_eq(&p, "no_ts_translate")) {
+			pdata->cfg_no_ts_translate = !!strtol(p, NULL, 0);
+			continue;
+		}
+		else if (check_token_eq(&p, "ts_force_tslib")) {
+			pdata->cfg_ts_force_tslib = !!strtol(p, NULL, 0);
 			continue;
 		}
 
@@ -96,4 +110,35 @@ bad:
 	fclose(f);
 }
 
+void omapsdl_config_from_env(struct SDL_PrivateVideoData *pdata)
+{
+	const char *tmp;
+
+	tmp = getenv("SDL_OMAP_VSYNC");
+	if (tmp != NULL)
+		pdata->cfg_force_vsync = !!strtol(tmp, NULL, 0);
+	tmp = getenv("SDL_OMAP_FORCE_DOUBLEBUF");
+	if (tmp != NULL)
+		pdata->cfg_force_doublebuf = !!strtol(tmp, NULL, 0);
+	tmp = getenv("SDL_OMAP_FORCE_DIRECTBUF");
+	if (tmp != NULL)
+		pdata->cfg_force_directbuf = !!strtol(tmp, NULL, 0);
+	tmp = getenv("SDL_OMAP_NO_TS_TRANSLATE");
+	if (tmp != NULL)
+		pdata->cfg_no_ts_translate = !!strtol(tmp, NULL, 0);
+	tmp = getenv("SDL_OMAP_TS_FORCE_TSLIB");
+	if (tmp != NULL)
+		pdata->cfg_ts_force_tslib = !!strtol(tmp, NULL, 0);
+	tmp = getenv("SDL_OMAP_BORDER_CUT");
+	if (tmp != NULL) {
+		int l, r, t, b;
+		if (sscanf(tmp, "%d,%d,%d,%d", &l, &r, &t, &b) == 4
+		    && l >= 0 && r >= 0 && t >= 0 && b >= 0) {
+			pdata->border_l = l, pdata->border_r = r;
+			pdata->border_t = t, pdata->border_b = b;
+		}
+		else
+			err("border incorrectly specified, ignored");
+	}
+}