X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=menu.c;h=c145f26a3290d45d6f223192b505e41e8949397a;hb=21082d0b2b9910727770674cef9b68b9e97a3155;hp=470ca3dd8cdae656fd1f2a3a1bbedc95487813b4;hpb=c52e6628cdf9c53e9143e903ab793bf59987a0ea;p=libpicofe.git

diff --git a/menu.c b/menu.c
index 470ca3d..c145f26 100644
--- a/menu.c
+++ b/menu.c
@@ -252,7 +252,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++)
 		{
@@ -937,11 +937,17 @@ static int scandir_filter(const struct dirent *ent)
 	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)
@@ -978,14 +984,16 @@ static const char *menu_loop_romsel(char *curr_path, int len,
 	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;
 	const char *ret = NULL;
+	int changed;
 	char cinp;
+	int r, i;
 
 	filter_exts_internal = filter_exts;
 	sel_fname[0] = 0;
@@ -1032,14 +1040,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) {
@@ -1075,7 +1109,6 @@ rescan:
 
 		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),
@@ -1115,22 +1148,6 @@ rescan:
 				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;
@@ -1364,7 +1381,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);
@@ -1490,6 +1508,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;
 	}
 }