frontend: fix broken cropping

[pcsx_rearmed.git] / frontend / plat_omap.c

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index 65478cb..4e3ea79 100644 (file)
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010
+ * (C) Gražvydas "notaz" Ignotas, 2010-2012
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -14,20 +14,17 @@
 #include <unistd.h>
 #include <linux/omapfb.h>
 
-#include "common/menu.h"
-#include "linux/fbdev.h"
-#include "linux/oshide.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 "omap.h"
 #include "plat.h"
+#include "plat_omap.h"
+#include "menu.h"
 
-
-static struct vout_fbdev *main_fb;
-int g_layer_x = 80, g_layer_y = 0;
-int g_layer_w = 640, g_layer_h = 480;
-
-struct vout_fbdev *layer_fb;
+static struct vout_fbdev *main_fb, *layer_fb;
 
 static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 {
@@ -55,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");
@@ -79,7 +77,7 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
        return 0;
 }
 
-int omap_enable_layer(int enabled)
+static int omap_enable_layer(int enabled)
 {
        if (enabled)
                pl_set_gun_rect(g_layer_x, g_layer_y, g_layer_w, g_layer_h);
@@ -88,12 +86,58 @@ int omap_enable_layer(int enabled)
                g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 }
 
+void plat_omap_gvideo_open(void)
+{
+       omap_enable_layer(1);
+
+       // try to align redraws to vsync
+       vout_fbdev_wait_vsync(layer_fb);
+}
+
+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,
+               l, r, t, b, 3);
+
+       omap_enable_layer(1);
+
+       return buf;
+}
+
+void *plat_gvideo_flip(void)
+{
+       return vout_fbdev_flip(layer_fb);
+}
+
+void plat_gvideo_close(void)
+{
+       omap_enable_layer(0);
+}
+
 void plat_video_menu_enter(int is_rom_loaded)
 {
        g_menuscreen_ptr = vout_fbdev_resize(main_fb,
                g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 3);
        if (g_menuscreen_ptr == NULL)
                fprintf(stderr, "warning: vout_fbdev_resize failed\n");
+
+       xenv_update(NULL, NULL, NULL, NULL);
 }
 
 void plat_video_menu_begin(void)
@@ -116,10 +160,31 @@ void plat_video_menu_leave(void)
                fprintf(stderr, "warning: vout_fbdev_resize failed\n");
 }
 
-void plat_init(void)
+void plat_minimize(void)
+{
+       int ret;
+
+       ret = vout_fbdev_save(layer_fb);
+       if (ret != 0) {
+               printf("minimize: layer/fb handling failed\n");
+               return;
+       }
+
+       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)
+{
+       return NULL;
+}
+
+void plat_omap_init(void)
 {
        const char *main_fb_name, *layer_fb_name;
-       void *temp_frame;
        int fd, ret, w, h;
 
        main_fb_name = getenv("FBDEV_MAIN");
@@ -138,6 +203,9 @@ void plat_init(void)
                exit(1);
        }
 
+       g_layer_x = 80, g_layer_y = 0;
+       g_layer_w = 640, g_layer_h = 480;
+
        ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h);
        close(fd);
        if (ret != 0) {
@@ -145,7 +213,7 @@ void plat_init(void)
                exit(1);
        }
 
-       oshide_init();
+       xenv_init(NULL, "PCSX-ReARMed");
 
        w = h = 0;
        main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2);
@@ -157,40 +225,29 @@ void plat_init(void)
        g_menuscreen_w = w;
        g_menuscreen_h = h;
        g_menuscreen_ptr = vout_fbdev_flip(main_fb);
+       pl_rearmed_cbs.screen_w = w;
+       pl_rearmed_cbs.screen_h = h;
 
        w = 640;
-       h = 512; // ??
+       h = 512;
        layer_fb = vout_fbdev_init(layer_fb_name, &w, &h, 16, 3);
        if (layer_fb == NULL) {
                fprintf(stderr, "couldn't init fb: %s\n", layer_fb_name);
                goto fail0;
        }
 
-       temp_frame = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
-       if (temp_frame == NULL) {
-               fprintf(stderr, "OOM\n");
-               goto fail1;
-       }
-       g_menubg_ptr = temp_frame;
-
-       // hmh
-       plat_rescan_inputs();
-
        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);
        vout_fbdev_finish(main_fb);
-       oshide_finish();
+       xenv_finish();
 }