X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=6126140a8c70f73607b2f00747c14f249e6d167a;hp=d5c10b93a60259ca307778451d9f9c2d534e47fc;hb=db1262095fed1b02260cc4ae4a42cdd31b8ef0a4;hpb=ab423939f0af46542bb23000e77a30976c8c2335

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index d5c10b93..6126140a 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -14,9 +14,10 @@
 #include <unistd.h>
 #include <linux/omapfb.h>
 
-#include "common/menu.h"
-#include "linux/fbdev.h"
-#include "linux/xenv.h"
+#include "libpicofe/menu.h"
+#include "libpicofe/input.h"
+#include "libpicofe/linux/fbdev.h"
+#include "libpicofe/linux/xenv.h"
 #include "plugin_lib.h"
 #include "pl_gun_ts.h"
 #include "plat.h"
@@ -51,8 +52,9 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 			perror("SETUP_PLANE");
 	}
 
-	if (mi.size < 640*512*3*3) {
-		mi.size = 640*512*3*3;
+	// upto 1024x512 (2x resolution enhancement)
+	if (mi.size < 1024*512*2 * 3) {
+		mi.size = 1024*512*2 * 3;
 		ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
 		if (ret != 0) {
 			perror("SETUP_MEM");
@@ -94,10 +96,19 @@ void plat_omap_gvideo_open(void)
 
 void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
 {
+	int l = 0, r = 0, t = 0, b = 0;
 	void *buf;
 
+	if (g_scaler == SCALE_1_1) {
+		if (*w > g_menuscreen_w)
+			l = r = (*w - g_menuscreen_w) / 2;
+		if (*h > g_menuscreen_h)
+			t = b = (*h - g_menuscreen_h) / 2;
+	}
+
 	vout_fbdev_clear(layer_fb);
-	buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, 0, 0, 0, 0, 3);
+	buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp,
+		l, r, t, b, 3);
 
 	omap_enable_layer(1);
 
@@ -146,9 +157,19 @@ void plat_video_menu_leave(void)
 
 void plat_minimize(void)
 {
-	omap_enable_layer(0);
+	int ret;
+
+	ret = vout_fbdev_save(layer_fb);
+	if (ret != 0) {
+		printf("minimize: layer/fb handling failed\n");
+		return;
+	}
+
 	xenv_minimize();
-	omap_enable_layer(1);
+
+	in_set_config_int(0, IN_CFG_BLOCKING, 0); /* flush event queue */
+	omap_enable_layer(0); /* restore layer mem */
+	vout_fbdev_restore(layer_fb);
 }
 
 void *plat_prepare_screenshot(int *w, int *h, int *bpp)