From: notaz Date: Sun, 16 Sep 2012 16:43:29 +0000 (+0300) Subject: minor adjustments X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=libpicofe.git;a=commitdiff_plain;h=7b0a298567dcd67b1efde214b24a18d83b8be1d1 minor adjustments --- diff --git a/config_file.c b/config_file.c index 6632aa5..a1e67ae 100644 --- a/config_file.c +++ b/config_file.c @@ -147,14 +147,14 @@ static int parse_bind_val(const char *val, int *type) return -1; } -void config_read_keys(const char *cfg) +void config_read_keys(const char *cfg_content) { char dev[256], key[128], *act; const char *p; int bind, bindtype; int dev_id; - p = cfg; + p = cfg_content; while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) { p += 10; diff --git a/menu.c b/menu.c index b2ab30e..640f9b7 100644 --- a/menu.c +++ b/menu.c @@ -38,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 */ @@ -388,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; @@ -632,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) {