X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=menu.c;h=bf5c8641e1805d538c4ddb9bee53b2bc1facc561;hb=2b27288eb44ef9247d2a948a207d3ac9b835421a;hp=3796f45bcee7563295c3de2b6e8c296ea9708b3e;hpb=8a0998fb31e440f7f7566510128049142bc3ad74;p=libpicofe.git

diff --git a/menu.c b/menu.c
index 3796f45..bf5c864 100644
--- a/menu.c
+++ b/menu.c
@@ -31,10 +31,11 @@ void *g_menuscreen_ptr;
 void *g_menubg_src_ptr;
 void *g_menubg_ptr;
 
-#if !MSCREEN_SIZE_FIXED
 int g_menuscreen_w;
 int g_menuscreen_h;
-#endif
+int g_menuscreen_pp;
+
+int g_autostateld_opt;
 
 static unsigned char *menu_font_data = NULL;
 static int menu_text_color = 0xfffe; // default to white
@@ -53,11 +54,17 @@ static int g_menu_filter_off;
 static int g_border_style;
 static int border_left, border_right, border_top, border_bottom;
 
+void menuscreen_memset_lines(unsigned short *dst, int c, int l)
+{
+	for (; l > 0; l--, dst += g_menuscreen_pp)
+		memset(dst, c, g_menuscreen_w * 2);
+}
+
 // draws text to current bbp16 screen
 static void text_out16_(int x, int y, const char *text, int color)
 {
 	int i, lh, tr, tg, tb, len;
-	unsigned short *dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;
+	unsigned short *dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_pp;
 	tr = (color & 0xf800) >> 8;
 	tg = (color & 0x07e0) >> 3;
 	tb = (color & 0x001f) << 3;
@@ -86,7 +93,7 @@ static void text_out16_(int x, int y, const char *text, int color)
 		unsigned short *dst = dest;
 		int u, l;
 
-		for (l = 0; l < lh; l++, dst += g_menuscreen_w - me_mfont_w)
+		for (l = 0; l < lh; l++, dst += g_menuscreen_pp - me_mfont_w)
 		{
 			for (u = me_mfont_w / 2; u > 0; u--, src++)
 			{
@@ -159,7 +166,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
 			break;
 
 		src = fontdata6x8[c];
-		dst = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;
+		dst = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_pp;
 
 		while (h--)
 		{
@@ -174,7 +181,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
 						dst += multiplier;
 				}
 
-				dst += g_menuscreen_w - me_sfont_w;
+				dst += g_menuscreen_pp - me_sfont_w;
 			}
 			src++;
 		}
@@ -207,13 +214,13 @@ static void menu_draw_selection(int x, int y, int w)
 	if (menu_sel_color < 0) return; // no selection hilight
 
 	if (y > 0) y--;
-	dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w + me_mfont_w * 2 - 2;
+	dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_pp + me_mfont_w * 2 - 2;
 	for (h = me_mfont_h + 1; h > 0; h--)
 	{
 		dst = dest;
 		for (i = w - (me_mfont_w * 2 - 2); i > 0; i--)
 			*dst++ = menu_sel_color;
-		dest += g_menuscreen_w;
+		dest += g_menuscreen_pp;
 	}
 }
 
@@ -239,7 +246,7 @@ static char tolower_simple(char c)
 
 void menu_init_base(void)
 {
-	int i, c, l;
+	int i, c, l, pos;
 	unsigned char *fd, *fds;
 	char buff[256];
 	FILE *f;
@@ -252,7 +259,7 @@ void menu_init_base(void)
 		return;
 
 	// generate default 8x10 font from fontdata8x8
-	for (c = 0, fd = menu_font_data; c < 256; c++)
+	for (c = 0, fd = menu_font_data; c < 128; c++)
 	{
 		for (l = 0; l < 8; l++)
 		{
@@ -294,17 +301,18 @@ void menu_init_base(void)
 	}
 
 	// load custom font and selector (stored as 1st symbol in font table)
-	emu_make_path(buff, "skin/font.png", sizeof(buff));
+	pos = plat_get_skin_dir(buff, sizeof(buff));
+	strcpy(buff + pos, "font.png");
 	readpng(menu_font_data, buff, READPNG_FONT,
 		MENU_X2 ? 256 : 128, MENU_X2 ? 320 : 160);
 	// default selector symbol is '>'
 	memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,
 		me_mfont_w * me_mfont_h / 2);
-	emu_make_path(buff, "skin/selector.png", sizeof(buff));
+	strcpy(buff + pos, "selector.png");
 	readpng(menu_font_data, buff, READPNG_SELECTOR, me_mfont_w, me_mfont_h);
 
 	// load custom colors
-	emu_make_path(buff, "skin/skin.txt", sizeof(buff));
+	strcpy(buff + pos, "skin.txt");
 	f = fopen(buff, "r");
 	if (f != NULL)
 	{
@@ -380,10 +388,10 @@ static void menu_darken_text_bg(void)
 		ymax = g_menuscreen_h - 1;
 
 	for (x = xmin; x <= xmax; x++)
-		screen[y * g_menuscreen_w + x] = 0xa514;
+		screen[y * g_menuscreen_pp + x] = 0xa514;
 	for (y++; y < ymax; y++)
 	{
-		ls = y * g_menuscreen_w;
+		ls = y * g_menuscreen_pp;
 		screen[ls + xmin] = 0xffff;
 		for (x = xmin + 1; x < xmax; x++)
 		{
@@ -393,7 +401,7 @@ static void menu_darken_text_bg(void)
 		}
 		screen[ls + xmax] = 0xffff;
 	}
-	ls = y * g_menuscreen_w;
+	ls = y * g_menuscreen_pp;
 	for (x = xmin; x <= xmax; x++)
 		screen[ls + x] = 0xffff;
 }
@@ -410,6 +418,8 @@ static void menu_reset_borders(void)
 
 static void menu_draw_begin(int need_bg, int no_borders)
 {
+	int y;
+
 	plat_video_menu_begin();
 
 	menu_reset_borders();
@@ -417,12 +427,14 @@ static void menu_draw_begin(int need_bg, int no_borders)
 
 	if (need_bg) {
 		if (g_border_style && no_borders) {
-			menu_darken_bg(g_menuscreen_ptr, g_menubg_ptr,
-				g_menuscreen_w * g_menuscreen_h, 1);
+			for (y = 0; y < g_menuscreen_h; y++)
+				menu_darken_bg((short *)g_menuscreen_ptr + g_menuscreen_pp * y,
+					g_menubg_ptr + g_menuscreen_w * y, g_menuscreen_w, 1);
 		}
 		else {
-			memcpy(g_menuscreen_ptr, g_menubg_ptr,
-				g_menuscreen_w * g_menuscreen_h * 2);
+			for (y = 0; y < g_menuscreen_h; y++)
+				memcpy((short *)g_menuscreen_ptr + g_menuscreen_pp * y,
+					g_menubg_ptr + g_menuscreen_w * y, g_menuscreen_w * 2);
 		}
 	}
 }
@@ -870,8 +882,8 @@ static void draw_dirlist(char *curdir, struct dirent **namelist,
 //	if (!rom_loaded)
 //		menu_darken_bg(gp2x_screen, 320*240, 0);
 
-	darken_ptr = (short *)g_menuscreen_ptr + g_menuscreen_w * max_cnt/2 * me_sfont_h;
-	menu_darken_bg(darken_ptr, darken_ptr, g_menuscreen_w * me_sfont_h * 8 / 10, 0);
+	darken_ptr = (short *)g_menuscreen_ptr + g_menuscreen_pp * max_cnt/2 * me_sfont_h;
+	menu_darken_bg(darken_ptr, darken_ptr, g_menuscreen_pp * me_sfont_h * 8 / 10, 0);
 
 	x = 5 + me_mfont_w + 1;
 	if (start - 2 >= 0)
@@ -892,16 +904,22 @@ static void draw_dirlist(char *curdir, struct dirent **namelist,
 
 	if (show_help) {
 		darken_ptr = (short *)g_menuscreen_ptr
-			+ g_menuscreen_w * (g_menuscreen_h - me_sfont_h * 5 / 2);
+			+ g_menuscreen_pp * (g_menuscreen_h - me_sfont_h * 5 / 2);
 		menu_darken_bg(darken_ptr, darken_ptr,
-			g_menuscreen_w * (me_sfont_h * 5 / 2), 1);
+			g_menuscreen_pp * (me_sfont_h * 5 / 2), 1);
 
 		snprintf(buff, sizeof(buff), "%s - select, %s - back",
 			in_get_key_name(-1, -PBTN_MOK), in_get_key_name(-1, -PBTN_MBACK));
-		smalltext_out16(x, g_menuscreen_h - me_sfont_h * 2 - 2, buff, 0xe78c);
+		smalltext_out16(x, g_menuscreen_h - me_sfont_h * 3 - 2, buff, 0xe78c);
+
 		snprintf(buff, sizeof(buff), g_menu_filter_off ?
 			 "%s - hide unknown files" : "%s - show all files",
 			in_get_key_name(-1, -PBTN_MA3));
+		smalltext_out16(x, g_menuscreen_h - me_sfont_h * 2 - 2, buff, 0xe78c);
+
+		snprintf(buff, sizeof(buff), g_autostateld_opt ?
+			 "%s - autoload save is ON" : "%s - autoload save is OFF",
+			in_get_key_name(-1, -PBTN_MA2));
 		smalltext_out16(x, g_menuscreen_h - me_sfont_h * 1 - 2, buff, 0xe78c);
 	}
 
@@ -922,24 +940,33 @@ static int scandir_cmp(const void *p1, const void *p2)
 	return alphasort(d1, d2);
 }
 
+static const char **filter_exts_internal;
+
 static int scandir_filter(const struct dirent *ent)
 {
+	const char **filter = filter_exts_internal;
 	const char *ext;
 	int i;
 
-	if (ent == NULL || ent->d_name == NULL)
+	if (ent == NULL)
 		return 0;
 
-	if (ent->d_type == DT_DIR)
+	switch (ent->d_type) {
+	case DT_DIR:
 		return 1;
+	case DT_LNK:
+	case DT_UNKNOWN:
+		// could be a dir, deal with it later..
+		return 1;
+	}
 
 	ext = strrchr(ent->d_name, '.');
 	if (ext == NULL)
 		return 0;
 
 	ext++;
-	for (i = 0; i < array_size(filter_exts); i++)
-		if (strcasecmp(ext, filter_exts[i]) == 0)
+	for (i = 0; filter[i] != NULL; i++)
+		if (strcasecmp(ext, filter[i]) == 0)
 			return 1;
 
 	return 0;
@@ -950,9 +977,11 @@ static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)
 	int i;
 
 	sel++;
-	for (i = sel + 1; i != sel; i++) {
+	for (i = sel + 1; ; i++) {
 		if (i >= len)
 			i = 1;
+		if (i == sel)
+			break;
 
 		if (tolower_simple(namelist[i]->d_name[0]) == c)
 			break;
@@ -961,31 +990,36 @@ static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)
 	return i - 1;
 }
 
-static char *menu_loop_romsel(char *curr_path, int len,
+static const char *menu_loop_romsel(char *curr_path, int len,
+	const char **filter_exts,
 	int (*extra_filter)(struct dirent **namelist, int count,
 			    const char *basedir))
 {
-	static char rom_fname_reload[256]; // used for return
+	static char rom_fname_reload[256]; // used for scratch and return
 	char sel_fname[256];
 	int (*filter)(const struct dirent *);
 	struct dirent **namelist = NULL;
 	int n = 0, inp = 0, sel = 0, show_help = 0;
 	char *curr_path_restore = NULL;
-	char *ret = NULL;
+	const char *ret = NULL;
+	int changed;
 	char cinp;
+	int r, i;
 
+	filter_exts_internal = filter_exts;
 	sel_fname[0] = 0;
 
 	// is this a dir or a full path?
 	if (!plat_is_dir(curr_path)) {
-		char *p = curr_path + strlen(curr_path) - 1;
-		for (; p > curr_path && *p != '/'; p--)
-			;
-		*p = 0;
-		curr_path_restore = p;
-		snprintf(sel_fname, sizeof(sel_fname), "%s", p + 1);
+		char *p = strrchr(curr_path, '/');
+		if (p != NULL) {
+			*p = 0;
+			curr_path_restore = p;
+			snprintf(sel_fname, sizeof(sel_fname), "%s", p + 1);
+		}
 
-		show_help = 2;
+		if (rom_fname_reload[0] == 0)
+			show_help = 2;
 	}
 
 rescan:
@@ -1017,14 +1051,40 @@ rescan:
 		}
 	}
 
+	// try to resolve DT_UNKNOWN and symlinks
+	changed = 0;
+	for (i = 0; i < n; i++) {
+		struct stat st;
+
+		if (namelist[i]->d_type == DT_REG || namelist[i]->d_type == DT_DIR)
+			continue;
+
+		snprintf(rom_fname_reload, sizeof(rom_fname_reload),
+			"%s/%s", curr_path, namelist[i]->d_name);
+		r = stat(rom_fname_reload, &st);
+		if (r == 0)
+		{
+			if (S_ISREG(st.st_mode)) {
+				namelist[i]->d_type = DT_REG;
+				changed = 1;
+			}
+			else if (S_ISDIR(st.st_mode)) {
+				namelist[i]->d_type = DT_DIR;
+				changed = 1;
+			}
+		}
+	}
+
 	if (!g_menu_filter_off && extra_filter != NULL)
 		n = extra_filter(namelist, n, curr_path);
 
+	if (n > 1 && changed)
+		qsort(namelist, n, sizeof(namelist[0]), scandir_cmp);
+
 	// try to find selected file
 	// note: we don't show '.' so sel is namelist index - 1
 	sel = 0;
 	if (sel_fname[0] != 0) {
-		int i;
 		for (i = 1; i < n; i++) {
 			char *dname = namelist[i]->d_name;
 			if (dname[0] == sel_fname[0] && strcmp(dname, sel_fname) == 0) {
@@ -1045,22 +1105,21 @@ rescan:
 		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
 			| PBTN_L|PBTN_R|PBTN_MA2|PBTN_MA3|PBTN_MOK|PBTN_MBACK
 			| PBTN_MENU|PBTN_CHAR, &cinp, 33);
-		if (inp & PBTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }
-		if (inp & PBTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }
-		if (inp & PBTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }
-		if (inp & PBTN_L)     { sel-=24; if (sel < 0)   sel = 0; }
-		if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }
-		if (inp & PBTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }
-		if (inp & PBTN_CHAR)  sel = dirent_seek_char(namelist, n, sel, cinp);
 		if (inp & PBTN_MA3)   {
 			g_menu_filter_off = !g_menu_filter_off;
 			snprintf(sel_fname, sizeof(sel_fname), "%s",
 				namelist[sel+1]->d_name);
 			goto rescan;
 		}
+		if (inp & PBTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }
+		if (inp & PBTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }
+		if (inp & PBTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }
+		if (inp & PBTN_L)     { sel-=24; if (sel < 0)   sel = 0; }
+		if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }
+		if (inp & PBTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }
+
 		if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))
 		{
-			again:
 			if (namelist[sel+1]->d_type == DT_REG)
 			{
 				snprintf(rom_fname_reload, sizeof(rom_fname_reload),
@@ -1096,27 +1155,20 @@ rescan:
 					strcat(newdir, "/");
 					strcat(newdir, namelist[sel+1]->d_name);
 				}
-				ret = menu_loop_romsel(newdir, newlen, extra_filter);
+				ret = menu_loop_romsel(newdir, newlen, filter_exts, extra_filter);
 				free(newdir);
 				break;
 			}
-			else
-			{
-				// unknown file type, happens on NTFS mounts. Try to guess.
-				FILE *tstf; int tmp;
-				snprintf(rom_fname_reload, sizeof(rom_fname_reload),
-					"%s/%s", curr_path, namelist[sel+1]->d_name);
-				tstf = fopen(rom_fname_reload, "rb");
-				if (tstf != NULL)
-				{
-					if (fread(&tmp, 1, 1, tstf) > 0 || ferror(tstf) == 0)
-						namelist[sel+1]->d_type = DT_REG;
-					else	namelist[sel+1]->d_type = DT_DIR;
-					fclose(tstf);
-					goto again;
-				}
-			}
 		}
+		else if (inp & PBTN_MA2) {
+			g_autostateld_opt = !g_autostateld_opt;
+			show_help = 3;
+		}
+		else if (inp & PBTN_CHAR) {
+			// must be last
+			sel = dirent_seek_char(namelist, n, sel, cinp);
+		}
+
 		if (inp & PBTN_MBACK)
 			break;
 
@@ -1340,7 +1392,8 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
 	y = (g_menuscreen_h - 4 * me_mfont_h) / 2 - (2 + opt_cnt) * me_mfont_h / 2;
 	if (x < me_mfont_w * 2)
 		x = me_mfont_w * 2;
-
+	if (y < 0)
+		y = 0;
 	menu_draw_begin(1, 0);
 	if (player_idx >= 0)
 		text_out16(x, y, "Player %i controls", player_idx + 1);
@@ -1466,6 +1519,10 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 			in_unbind_all(bind_dev_id, opts[sel].mask << mask_shift, bindtype);
 
 		in_bind_key(bind_dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);
+
+		// make sure bind change is displayed
+		if (dev_id != -1)
+			dev_id = bind_dev_id;
 	}
 }