X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=menu.c;h=1b429c8e65a686e4e0e1f483883cc0236e4747b8;hb=14fa485ef29d946407fe79f8d7c65afa6ae1fb08;hp=63a9943388886f1f8fe45ee626dd3b1a574e03e0;hpb=675d1d368c75ef01523108f3180090a9ed12edf4;p=libpicofe.git

diff --git a/menu.c b/menu.c
index 63a9943..1b429c8 100644
--- a/menu.c
+++ b/menu.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 
@@ -37,7 +38,7 @@ int g_menuscreen_h;
 #endif
 
 static unsigned char *menu_font_data = NULL;
-static int menu_text_color = 0xffff; // default to white
+static int menu_text_color = 0xfffe; // default to white
 static int menu_sel_color = -1; // disabled
 
 /* note: these might become non-constant in future */
@@ -387,7 +388,7 @@ static void menu_darken_text_bg(void)
 		for (x = xmin + 1; x < xmax; x++)
 		{
 			unsigned int p = screen[ls + x];
-			if (p != 0xffff)
+			if (p != menu_text_color)
 				screen[ls + x] = ((p&0xf79e)>>1) - ((p&0xc618)>>3);
 		}
 		screen[ls + xmax] = 0xffff;
@@ -631,6 +632,8 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 		y += me_mfont_h;
 	}
 
+	menu_separation();
+
 	/* display help or message if we have one */
 	h = (g_menuscreen_h - h) / 2; // bottom area height
 	if (menu_error_msg[0] != 0) {
@@ -1304,7 +1307,7 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
 	if (dev_id < 0)
 		dev_name = "(all devices)";
 	else
-		dev_name = in_get_dev_name(dev_id, 1, 1);
+		dev_name = in_get_dev_name(dev_id, 0, 1);
 	w = strlen(dev_name) * me_mfont_w;
 	if (w < 30 * me_mfont_w)
 		w = 30 * me_mfont_w;
@@ -1367,7 +1370,7 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 				for (i = 0, dev_id--; i < IN_MAX_DEVS + 1; i++, dev_id--) {
 					if (dev_id < -1)
 						dev_id = IN_MAX_DEVS - 1;
-					if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)
+					if (dev_id == -1 || in_get_dev_name(dev_id, 0, 0) != NULL)
 						break;
 				}
 				continue;
@@ -1375,7 +1378,7 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 				for (i = 0, dev_id++; i < IN_MAX_DEVS; i++, dev_id++) {
 					if (dev_id >= IN_MAX_DEVS)
 						dev_id = -1;
-					if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)
+					if (dev_id == -1 || in_get_dev_name(dev_id, 0, 0) != NULL)
 						break;
 				}
 				continue;