X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=45e9d5db6058d88d49dbd7ae3b9bdbcb7fbdf8a1;hp=2f734464c71f2e1b1ecf776047899b3d27b17d64;hb=65092fd8a8191ea66f980cbed9310ebdb5a13dcc;hpb=17a54a4a45daf9eed7665c520301691d4f2b08f3

diff --git a/frontend/menu.c b/frontend/menu.c
index 2f734464..45e9d5db 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -65,6 +65,7 @@ typedef enum
 enum {
 	SCALE_1_1,
 	SCALE_4_3,
+	SCALE_4_3v2,
 	SCALE_FULLSCREEN,
 	SCALE_CUSTOM,
 };
@@ -231,7 +232,7 @@ static const struct {
 	CE_CONFIG_VAL(Cpu),
 	CE_CONFIG_VAL(CdrReschedule),
 	CE_INTVAL(region),
-	CE_INTVAL(scaling),
+	CE_INTVAL_V(scaling, 2),
 	CE_INTVAL(g_layer_x),
 	CE_INTVAL(g_layer_y),
 	CE_INTVAL(g_layer_w),
@@ -606,6 +607,18 @@ static void apply_lcdrate(int pal)
 	old = pal;
 }
 
+static int get_bat_capacity(void)
+{
+	FILE *f;
+	int ret = 0;
+	f = fopen("/sys/class/power_supply/bq27500-0/capacity", "r");
+	if (f) {
+		fscanf(f, "%d", &ret);
+		fclose(f);
+	}
+	return ret;
+}
+
 static menu_entry e_menu_gfx_options[];
 
 static void pnd_menu_init(void)
@@ -1003,7 +1016,7 @@ static int menu_loop_keyconfig(int id, int keys)
 
 // ------------ gfx options menu ------------
 
-static const char *men_scaler[] = { "1x1", "scaled 4:3", "fullscreen", "custom", NULL };
+static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL };
 static const char h_cscaler[]   = "Displays the scaler layer, you can resize it\n"
 				  "using d-pad or move it using R+d-pad";
 static const char *men_dummy[] = { NULL };
@@ -1468,13 +1481,25 @@ void OnFile_Exit();
 
 static void draw_frame_main(void)
 {
+	struct tm *tmp;
+	time_t ltime;
+	char ltime_s[16];
+	char buff[64];
+
 	if (CdromId[0] != 0) {
-		char buff[64];
 		snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)",
 			 get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC",
 			 Config.HLE ? "HLE" : "BIOS");
 		smalltext_out16(4, 1, buff, 0x105f);
 	}
+
+	if (ready_to_go) {
+		ltime = time(NULL);
+		tmp = localtime(&ltime);
+		strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp);
+		snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, get_bat_capacity());
+		smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f);
+	}
 }
 
 static void draw_frame_credits(void)
@@ -1957,14 +1982,53 @@ void menu_init(void)
 
 void menu_notify_mode_change(int w, int h, int bpp)
 {
+	float mult;
+	int imult;
+
 	last_psx_w = w;
 	last_psx_h = h;
 	last_psx_bpp = bpp;
 
-	if (scaling == SCALE_1_1) {
-		g_layer_x = 800/2 - w/2;  g_layer_y = 480/2 - h/2;
+	switch (scaling) {
+	case SCALE_1_1:
 		g_layer_w = w; g_layer_h = h;
+		break;
+
+	case SCALE_4_3:
+		mult = 240.0f / (float)h * 4.0f / 3.0f;
+		if (h > 256)
+			mult *= 2.0f;
+		g_layer_w = mult * (float)g_menuscreen_h;
+		g_layer_h = g_menuscreen_h;
+		printf("  -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+		break;
+
+	case SCALE_4_3v2:
+		// 4:3 that prefers integer scaling
+		imult = g_menuscreen_h / h;
+		g_layer_w = w * imult;
+		g_layer_h = h * imult;
+		mult = (float)g_layer_w / (float)g_layer_h;
+		if (mult < 1.25f || mult > 1.666f)
+			g_layer_w = 4.0f/3.0f * (float)g_layer_h;
+		printf("  -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+		break;
+
+	case SCALE_FULLSCREEN:
+		g_layer_w = g_menuscreen_w;
+		g_layer_h = g_menuscreen_h;
+		break;
+
+	default:
+		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_w = g_menuscreen_h;
 }
 
 static void menu_leave_emu(void)
@@ -2000,21 +2064,7 @@ void menu_prepare_emu(void)
 
 	plat_video_menu_leave();
 
-	switch (scaling) {
-	case SCALE_1_1:
-		menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp);
-		break;
-	case SCALE_4_3:
-		g_layer_x = 80;  g_layer_y = 0;
-		g_layer_w = 640; g_layer_h = 480;
-		break;
-	case SCALE_FULLSCREEN:
-		g_layer_x = 0;   g_layer_y = 0;
-		g_layer_w = 800; g_layer_h = 480;
-		break;
-	case SCALE_CUSTOM:
-		break;
-	}
+	menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp);
 
 	psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
 	if (psxCpu != prev_cpu)