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)
void *buf;
if (g_scaler == SCALE_1_1 || g_scaler == SCALE_2_2) {
- if (w > g_menuscreen_w) {
+ if (w > g_menuscreen_w)
l = r = (w - g_menuscreen_w) / 2;
- w -= l + r;
- }
- if (h > g_menuscreen_h) {
+ if (h > g_menuscreen_h)
t = b = (h - g_menuscreen_h) / 2;
- h -= t + b;
- }
}
+ 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;
- vout_fbdev_clear(layer_fb);
buf = vout_fbdev_resize(layer_fb, w, h, *bpp,
- l, r, t, b, 3);
+ l, r, t, b, 3, 1);
+
+ vout_fbdev_clear(layer_fb);
omap_enable_layer(1);
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);
}
{
/* 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)
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;