notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: readpng: fix width/height confusion
[pcsx_rearmed.git]
/
frontend
/
plat_omap.c
diff --git
a/frontend/plat_omap.c
b/frontend/plat_omap.c
index
d5c10b9
..
b01c634
100644
(file)
--- a/
frontend/plat_omap.c
+++ b/
frontend/plat_omap.c
@@
-15,6
+15,7
@@
#include <linux/omapfb.h>
#include "common/menu.h"
#include <linux/omapfb.h>
#include "common/menu.h"
+#include "common/input.h"
#include "linux/fbdev.h"
#include "linux/xenv.h"
#include "plugin_lib.h"
#include "linux/fbdev.h"
#include "linux/xenv.h"
#include "plugin_lib.h"
@@
-94,10
+95,19
@@
void plat_omap_gvideo_open(void)
void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
{
void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
{
+ int l = 0, r = 0, t = 0, b = 0;
void *buf;
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);
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);
omap_enable_layer(1);
@@
-146,9
+156,19
@@
void plat_video_menu_leave(void)
void plat_minimize(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();
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)
}
void *plat_prepare_screenshot(int *w, int *h, int *bpp)