devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

puzzles: adapt frontend to upstream changes

Browse source 
Change-Id: Idd911ac4ac6c2efa3c6b064be6058979d7a15447
This commit is contained in:
Franklin Wei 2017-10-23 17:41:11 -04:00
parent ef1306764e
commit a644489ccf
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
apps/plugins/puzzles/rockbox.c
View file

@ -873,7 +873,7 @@ void frontend_default_color(frontend *fe, float *out)
*out++ = BG_B; *out++ = BG_B;
} }
void fatal(char *fmt, ...) void fatal(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -970,7 +970,7 @@ static void int_chooser(config_item *cfgs, int idx, int val)
config_item *cfg = cfgs + idx; config_item *cfg = cfgs + idx;
int old_val = val; int old_val = val;
rb->snprintf(cfg->sval, MAX_STRLEN, "%d", val); rb->snprintf(cfg->u.string.sval, MAX_STRLEN, "%d", val);
rb->lcd_clear_display(); rb->lcd_clear_display();
@ -1002,7 +1002,7 @@ static void int_chooser(config_item *cfgs, int idx, int val)
if(val != old_val) if(val != old_val)
rb->splash(HZ, "Canceled."); rb->splash(HZ, "Canceled.");
val = old_val; val = old_val;
rb->snprintf(cfg->sval, MAX_STRLEN, "%d", val); rb->snprintf(cfg->u.string.sval, MAX_STRLEN, "%d", val);
rb->lcd_scroll_stop(); rb->lcd_scroll_stop();
return; return;
} }
@ -1016,7 +1016,7 @@ static void int_chooser(config_item *cfgs, int idx, int val)
for(int i = 0; i < CHOOSER_MAX_INCR; ++i) for(int i = 0; i < CHOOSER_MAX_INCR; ++i)
{ {
val += d; val += d;
rb->snprintf(cfg->sval, MAX_STRLEN, "%d", val); rb->snprintf(cfg->u.string.sval, MAX_STRLEN, "%d", val);
ret = midend_set_config(me, CFG_SETTINGS, cfgs); ret = midend_set_config(me, CFG_SETTINGS, cfgs);
if(!ret) if(!ret)
{ {
@ -1037,7 +1037,7 @@ static void int_chooser(config_item *cfgs, int idx, int val)
/* reset value */ /* reset value */
val -= d * CHOOSER_MAX_INCR; val -= d * CHOOSER_MAX_INCR;
rb->snprintf(cfg->sval, MAX_STRLEN, "%d", val); rb->snprintf(cfg->u.string.sval, MAX_STRLEN, "%d", val);
assert(!midend_set_config(me, CFG_SETTINGS, cfgs)); assert(!midend_set_config(me, CFG_SETTINGS, cfgs));
} }
} }
@ -1058,14 +1058,14 @@ static bool do_configure_item(config_item *cfgs, int idx)
rb->lcd_set_foreground(LCD_WHITE); rb->lcd_set_foreground(LCD_WHITE);
rb->lcd_set_background(LCD_BLACK); rb->lcd_set_background(LCD_BLACK);
if(is_integer(cfg->sval)) if(is_integer(cfg->u.string.sval))
{ {
int val = atoi(cfg->sval); int val = atoi(cfg->u.string.sval);
/* we now free the original string and give int_chooser() /* we now free the original string and give int_chooser()
* a clean buffer to work with */ * a clean buffer to work with */
sfree(cfg->sval); sfree(cfg->u.string.sval);
cfg->sval = newstr; cfg->u.string.sval = newstr;
int_chooser(cfgs, idx, val); int_chooser(cfgs, idx, val);
@ -1075,32 +1075,32 @@ static bool do_configure_item(config_item *cfgs, int idx)
return true; return true;
} }
rb->strlcpy(newstr, cfg->sval, MAX_STRLEN); rb->strlcpy(newstr, cfg->u.string.sval, MAX_STRLEN);
if(rb->kbd_input(newstr, MAX_STRLEN) < 0) if(rb->kbd_input(newstr, MAX_STRLEN) < 0)
{ {
sfree(newstr); sfree(newstr);
return false; return false;
} }
sfree(cfg->sval); sfree(cfg->u.string.sval);
cfg->sval = newstr; cfg->u.string.sval = newstr;
return true; return true;
} }
case C_BOOLEAN: case C_BOOLEAN:
{ {
bool res = cfg->ival != 0; bool res = cfg->u.boolean.bval != 0;
rb->set_bool(cfg->name, &res); rb->set_bool(cfg->name, &res);
/* seems to reset backdrop */ /* seems to reset backdrop */
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
cfg->ival = res; cfg->u.boolean.bval = res;
break; break;
} }
case C_CHOICES: case C_CHOICES:
{ {
int sel = list_choose(cfg->sval, cfg->name, cfg->ival); int sel = list_choose(cfg->u.choices.choicenames, cfg->name, cfg->u.choices.selected);
if(sel >= 0) if(sel >= 0)
cfg->ival = sel; cfg->u.choices.selected = sel;
break; break;
} }
default: default:
@ -1172,7 +1172,7 @@ static bool config_menu(void)
char *old_str = NULL; char *old_str = NULL;
if(old.type == C_STRING) if(old.type == C_STRING)
old_str = dupstr(old.sval); old_str = dupstr(old.u.string.sval);
bool freed_str = do_configure_item(config, pos); bool freed_str = do_configure_item(config, pos);
char *err = midend_set_config(me, CFG_SETTINGS, config); char *err = midend_set_config(me, CFG_SETTINGS, config);
@ -1185,7 +1185,7 @@ static bool config_menu(void)
memcpy(config + pos, &old, sizeof(old)); memcpy(config + pos, &old, sizeof(old));
if(old.type == C_STRING && freed_str) if(old.type == C_STRING && freed_str)
config[pos].sval = old_str; config[pos].u.string.sval = old_str;
} }
else else
{ {