From: notaz <notasas@gmail.com>
Date: Sun, 10 Dec 2023 21:53:51 +0000 (+0200)
Subject: standalone: allow scaler to cut off the letterbox
X-Git-Tag: r24l~25
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=292e3f526a26e8c9696f82dd958899fd620fa7b3;p=pcsx_rearmed.git

standalone: allow scaler to cut off the letterbox

notaz/pcsx_rearmed#286
---

diff --git a/frontend/menu.c b/frontend/menu.c
index 7622c4c1..6705b639 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1285,19 +1285,41 @@ static const char h_scanline_l[]  = "Scanline brightness, 0-100%";
 
 static int menu_loop_cscaler(int id, int keys)
 {
+	void *saved_layer = NULL;
+	size_t saved_layer_size = 0;
+	int was_layer_clipped = 0;
 	unsigned int inp;
 
+	if (!pl_vout_buf)
+		return -1;
+
 	g_scaler = SCALE_CUSTOM;
+	saved_layer_size = last_vout_w * last_vout_h * last_vout_bpp / 8;
+	saved_layer = malloc(saved_layer_size);
+	if (saved_layer)
+		memcpy(saved_layer, pl_vout_buf, saved_layer_size);
 
 	plat_gvideo_open(Config.PsxType);
 
+	menu_draw_begin(0, 1);
+	memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
+	menu_draw_end();
+
 	for (;;)
 	{
-		menu_draw_begin(0, 1);
-		memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
-		text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y);
-		text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move",	g_layer_w, g_layer_h);
-		menu_draw_end();
+		if (saved_layer && last_vout_bpp == 16) {
+			int top_x = max(0, -g_layer_x * last_vout_h / 800) + 1;
+			int top_y = max(0, -g_layer_y * last_vout_h / 480) + 1;
+			char text[128];
+			memcpy(pl_vout_buf, saved_layer, saved_layer_size);
+			snprintf(text, sizeof(text), "%d,%d %dx%d",
+				g_layer_x, g_layer_y, g_layer_w, g_layer_h);
+			basic_text_out16_nf(pl_vout_buf, last_vout_w,
+				top_x, top_y, text);
+			basic_text_out16_nf(pl_vout_buf, last_vout_w, 2,
+				last_vout_h - 20, "d-pad: resize, R+d-pad: move");
+			pl_vout_buf = plat_gvideo_flip();
+		}
 
 		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
 				|PBTN_R|PBTN_MOK|PBTN_MBACK, NULL, 40);
@@ -1315,22 +1337,30 @@ static int menu_loop_cscaler(int id, int keys)
 			break;
 
 		if (inp & (PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT)) {
-			if (g_layer_x < 0)   g_layer_x = 0;
-			if (g_layer_x > 640) g_layer_x = 640;
-			if (g_layer_y < 0)   g_layer_y = 0;
-			if (g_layer_y > 420) g_layer_y = 420;
-			if (g_layer_w < 160) g_layer_w = 160;
-			if (g_layer_h < 60)  g_layer_h = 60;
-			if (g_layer_x + g_layer_w > 800)
-				g_layer_w = 800 - g_layer_x;
-			if (g_layer_y + g_layer_h > 480)
-				g_layer_h = 480 - g_layer_y;
+			int layer_clipped = 0;
+			g_layer_x = max(-320, min(g_layer_x, 640));
+			g_layer_y = max(-240, min(g_layer_y, 400));
+			g_layer_w = max(160, g_layer_w);
+			g_layer_h = max( 60, g_layer_h);
+			if (g_layer_x < 0 || g_layer_x + g_layer_w > 800)
+				layer_clipped = 1;
+			if (g_layer_w > 800+400)
+				g_layer_w = 800+400;
+			if (g_layer_y < 0 || g_layer_y + g_layer_h > 480)
+				layer_clipped = 1;
+			if (g_layer_h > 480+360)
+				g_layer_h = 480+360;
 			// resize the layer
 			plat_gvideo_open(Config.PsxType);
+			if (layer_clipped || was_layer_clipped)
+				pl_vout_buf = plat_gvideo_set_mode(&last_vout_w,
+					&last_vout_h, &last_vout_bpp);
+			was_layer_clipped = layer_clipped;
 		}
 	}
 
 	plat_gvideo_close();
+	free(saved_layer);
 
 	return 0;
 }
diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index c4bff313..2dab7a16 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -79,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)
@@ -101,15 +111,25 @@ void *plat_gvideo_set_mode(int *w_in, int *h_in, int *bpp)
 	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;
 
 	buf = vout_fbdev_resize(layer_fb, w, h, *bpp,
 		l, r, t, b, 3);
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 159da702..43216c67 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -227,12 +227,12 @@ static void update_layer_size(int w, int h)
 		break;
 	}
 
-	g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
-	g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
-	if (g_layer_x < 0) g_layer_x = 0;
-	if (g_layer_y < 0) g_layer_y = 0;
-	if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
-	if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h;
+	if (g_scaler != SCALE_CUSTOM) {
+		g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
+		g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
+	}
+	if (g_layer_w > g_menuscreen_w * 2) g_layer_w = g_menuscreen_w * 2;
+	if (g_layer_h > g_menuscreen_h * 2) g_layer_h = g_menuscreen_h * 2;
 }
 
 // XXX: this is platform specific really