X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Fmenu.c;h=22a66ead0a6f14dbbabb0244a195383c634bef27;hp=5f97730a94032898e0e2d040583730f19c41aa54;hb=131f0d940d328ff884503b9979f9936a36c7f0b7;hpb=3c70c47bb2fa50066c4c3b23813253e03b8751fe

diff --git a/frontend/common/menu.c b/frontend/common/menu.c
index 5f97730a..22a66ead 100644
--- a/frontend/common/menu.c
+++ b/frontend/common/menu.c
@@ -1,7 +1,12 @@
-// (c) Copyright 2006-2010 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2006-2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ * See the COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -341,26 +346,6 @@ static void menu_darken_bg(void *dst, void *src, int pixels, int darker)
 	}
 }
 
-static void menu_enter(int is_rom_loaded)
-{
-	if (is_rom_loaded)
-	{
-		// darken the active framebuffer
-		menu_darken_bg(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 1);
-	}
-	else
-	{
-		char buff[256];
-
-		// should really only happen once, on startup..
-		emu_make_path(buff, "skin/background.png", sizeof(buff));
-		if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0)
-			memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
-	}
-
-	plat_video_menu_enter(is_rom_loaded);
-}
-
 static int me_id2offset(const menu_entry *ent, menu_id id)
 {
 	int i;
@@ -461,8 +446,11 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 		h = g_menuscreen_h;
 	}
 
-	x = g_menuscreen_w  / 2 - w / 2;
+	x = g_menuscreen_w / 2 - w / 2;
 	y = g_menuscreen_h / 2 - h / 2;
+#ifdef MENU_ALIGN_LEFT
+	if (x > 12) x = 12;
+#endif
 
 	/* draw */
 	menu_draw_begin(1);
@@ -511,7 +499,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 				len = strlen(names[i]);
 				if (len > 10)
 					offs = 10 - len - 2;
-				if (i == *(int *)ent->var) {
+				if (i == *(unsigned char *)ent->var) {
 					text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", names[i]);
 					break;
 				}
@@ -670,7 +658,7 @@ static void draw_menu_credits(void (*draw_more)(void))
 		p++;
 	}
 
-	x = g_menuscreen_w  / 2 - w * me_mfont_w / 2;
+	x = g_menuscreen_w / 2 - w * me_mfont_w / 2;
 	y = g_menuscreen_h / 2 - h * me_mfont_h / 2;
 	if (x < 0) x = 0;
 	if (y < 0) y = 0;
@@ -729,22 +717,6 @@ static void do_delete(const char *fpath, const char *fname)
 
 // -------------- ROM selector --------------
 
-// rrrr rggg gggb bbbb
-static unsigned short file2color(const char *fname)
-{
-	const char *ext = fname + strlen(fname) - 3;
-	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };
-	static const char *other_exts[] = { "gmv", "pat" };
-	int i;
-
-	if (ext < fname) ext = fname;
-	for (i = 0; i < array_size(rom_exts); i++)
-		if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; // FIXME: mk defines
-	for (i = 0; i < array_size(other_exts); i++)
-		if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;
-	return 0xffff;
-}
-
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 {
 	int max_cnt, start, i, x, pos;
@@ -773,7 +745,7 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 			smalltext_out16(x, pos * me_sfont_h, "/", 0xfff6);
 			smalltext_out16(x + me_sfont_w, pos * me_sfont_h, namelist[i+1]->d_name, 0xfff6);
 		} else {
-			unsigned short color = file2color(namelist[i+1]->d_name);
+			unsigned short color = fname2color(namelist[i+1]->d_name);
 			smalltext_out16(x, pos * me_sfont_h, namelist[i+1]->d_name, color);
 		}
 	}
@@ -982,6 +954,10 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
 	if (x < 0) x = 0;
 	y = g_menuscreen_h / 2 - h / 2;
 	if (y < 0) y = 0;
+#ifdef MENU_ALIGN_LEFT
+	if (x > 12 + me_mfont_w * 2)
+		x = 12 + me_mfont_w * 2;
+#endif
 
 	menu_draw_begin(1);