minor adjustments

This commit is contained in:
notaz 2012-09-16 19:43:29 +03:00 committed by Grazvydas Ignotas
parent a085ae5ef1
commit 7b0a298567
2 changed files with 6 additions and 4 deletions

View file

@ -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;

6
menu.c
View file

@ -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) {