cdrom: change pause timing again

[pcsx_rearmed.git] / frontend / plat_omap.c

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index d5c10b9..699e197 100644 (file)
--- 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");
@@ -77,11 +79,21 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 
 static int omap_enable_layer(int enabled)
 {
+       int x = g_layer_x, y = g_layer_y;
+       int w = g_layer_w, h = g_layer_h;
+
+       // it's not allowed for the layer to be partially offscreen,
+       // instead it is faked by plat_gvideo_set_mode()
+       if (x < 0) { w += x; x = 0; }
+       if (y < 0) { h += y; y = 0; }
+       if (x + w > 800) w = 800 - x;
+       if (y + h > 480) h = 480 - y;
+
        if (enabled)
-               pl_set_gun_rect(g_layer_x, g_layer_y, g_layer_w, g_layer_h);
+               pl_set_gun_rect(x, y, w, h);
 
-       return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), enabled,
-               g_layer_x, g_layer_y, g_layer_w, g_layer_h);
+       return omap_setup_layer_(vout_fbdev_get_fd(layer_fb),
+               enabled, x, y, w, h);
 }
 
 void plat_omap_gvideo_open(void)
@@ -92,12 +104,37 @@ void plat_omap_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;
+               if (h > g_menuscreen_h)
+                       t = b = (h - g_menuscreen_h) / 2;
+       }
+       else if (g_scaler == SCALE_CUSTOM) {
+               int right = g_layer_x + g_layer_w;
+               int bottom = g_layer_y + g_layer_h;
+               if (g_layer_x < 0)
+                       l = -g_layer_x * w / g_menuscreen_w;
+               if (g_layer_y < 0)
+                       t = -g_layer_y * h / g_menuscreen_h;
+               if (right > g_menuscreen_w)
+                       r = (right - g_menuscreen_w) * w / g_menuscreen_w;
+               if (bottom > g_menuscreen_h)
+                       b = (bottom - g_menuscreen_h) * h / g_menuscreen_h;
+       }
+       w -= l + r;
+       h -= t + b;
+
+       buf = vout_fbdev_resize(layer_fb, w, h, *bpp,
+               l, r, t, b, 3, 1);
+
        vout_fbdev_clear(layer_fb);
-       buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, 0, 0, 0, 0, 3);
 
        omap_enable_layer(1);
 
@@ -117,9 +154,10 @@ void plat_gvideo_close(void)
 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);
+               g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 3, 0);
        if (g_menuscreen_ptr == NULL)
                fprintf(stderr, "warning: vout_fbdev_resize failed\n");
+       vout_fbdev_clear(main_fb);
 
        xenv_update(NULL, NULL, NULL, NULL);
 }
@@ -137,18 +175,28 @@ void plat_video_menu_leave(void)
 {
        /* have to get rid of panning so that plugins that
         * use fb0 and don't ever pan can work. */
-       vout_fbdev_clear(main_fb);
        g_menuscreen_ptr = vout_fbdev_resize(main_fb,
-               g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 1);
+               g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 1, 0);
        if (g_menuscreen_ptr == NULL)
                fprintf(stderr, "warning: vout_fbdev_resize failed\n");
+       vout_fbdev_clear(main_fb);
 }
 
 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)
@@ -196,7 +244,7 @@ void plat_omap_init(void)
                exit(1);
        }
 
-       g_menuscreen_w = w;
+       g_menuscreen_w = g_menuscreen_pp = w;
        g_menuscreen_h = h;
        g_menuscreen_ptr = vout_fbdev_flip(main_fb);
        pl_rearmed_cbs.screen_w = w;