frontend: fix broken cropping

[pcsx_rearmed.git] / frontend / plat_omap.c

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index 1a725ff..4e3ea79 100644 (file)
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -14,12 +14,14 @@
 #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"
+#include "plat_omap.h"
 #include "menu.h"
 
 static struct vout_fbdev *main_fb, *layer_fb;
@@ -50,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");
@@ -83,7 +86,7 @@ static int omap_enable_layer(int enabled)
                g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 }
 
-void plat_gvideo_open(void)
+void plat_omap_gvideo_open(void)
 {
        omap_enable_layer(1);
 
@@ -91,12 +94,26 @@ void plat_gvideo_open(void)
        vout_fbdev_wait_vsync(layer_fb);
 }
 
-void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
+void *plat_gvideo_set_mode(int *w_in, int *h_in, int *bpp)
 {
+       int l = 0, r = 0, t = 0, b = 0;
+       int w = *w_in, h = *h_in;
        void *buf;
 
+       if (g_scaler == SCALE_1_1 || g_scaler == SCALE_2_2) {
+               if (w > g_menuscreen_w) {
+                       l = r = (w - g_menuscreen_w) / 2;
+                       w -= l + r;
+               }
+               if (h > g_menuscreen_h) {
+                       t = b = (h - g_menuscreen_h) / 2;
+                       h -= t + b;
+               }
+       }
+
        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);
 
@@ -145,17 +162,19 @@ void plat_video_menu_leave(void)
 
 void plat_minimize(void)
 {
-       omap_enable_layer(0);
-       xenv_minimize();
-       omap_enable_layer(1);
-}
+       int ret;
 
-void plat_step_volume(int is_up)
-{
-}
+       ret = vout_fbdev_save(layer_fb);
+       if (ret != 0) {
+               printf("minimize: layer/fb handling failed\n");
+               return;
+       }
 
-void plat_trigger_vibrate(int is_strong)
-{
+       xenv_minimize();
+
+       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)
@@ -163,7 +182,7 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp)
        return NULL;
 }
 
-void plat_init(void)
+void plat_omap_init(void)
 {
        const char *main_fb_name, *layer_fb_name;
        int fd, ret, w, h;
@@ -217,19 +236,14 @@ void plat_init(void)
                goto fail0;
        }
 
-       plat_pandora_init(); // XXX
-
        return;
 
-fail1:
-       vout_fbdev_finish(layer_fb);
 fail0:
        vout_fbdev_finish(main_fb);
        exit(1);
-
 }
 
-void plat_finish(void)
+void plat_omap_finish(void)
 {
        omap_enable_layer(0);
        vout_fbdev_finish(layer_fb);