Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

expo: Plumb in textline to cedit

Browse source 
Support textlines in the configuration editor.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-10-01 19:13:37 -06:00 • committed by Tom Rini
parent 8579cb010d
commit fe55366047
1 changed files with 59 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
boot/cedit.c
View file

@ -81,6 +81,12 @@ int cedit_arange(struct expo *exp, struct video_priv *vpriv, uint scene_id)
scene_menu_arrange(scn, (struct scene_obj_menu *)obj); scene_menu_arrange(scn, (struct scene_obj_menu *)obj);
y += 50; y += 50;
break; break;
case SCENEOBJT_TEXTLINE:
scene_obj_set_pos(scn, obj->id, 50, y);
scene_textline_arrange(scn,
(struct scene_obj_textline *)obj);
y += 50;
break;
} }
} }
@ -295,17 +301,27 @@ static int h_write_settings(struct scene_obj *obj, void *vpriv)
{ {
struct cedit_iter_priv *priv = vpriv; struct cedit_iter_priv *priv = vpriv;
struct abuf *buf = priv->buf; struct abuf *buf = priv->buf;
int ret;
switch (obj->type) { switch (obj->type) {
case SCENEOBJT_NONE: case SCENEOBJT_NONE:
case SCENEOBJT_IMAGE: case SCENEOBJT_IMAGE:
case SCENEOBJT_TEXT: case SCENEOBJT_TEXT:
break; break;
case SCENEOBJT_TEXTLINE: {
const struct scene_obj_textline *tline;
tline = (struct scene_obj_textline *)obj;
ret = write_dt_string(buf, obj->name, abuf_data(&tline->buf));
if (ret)
return log_msg_ret("wr2", ret);
break;
}
case SCENEOBJT_MENU: { case SCENEOBJT_MENU: {
const struct scene_obj_menu *menu; const struct scene_obj_menu *menu;
const char *str; const char *str;
char name[80]; char name[80];
int ret, i; int i;
/* write the ID of the current item */ /* write the ID of the current item */
menu = (struct scene_obj_menu *)obj; menu = (struct scene_obj_menu *)obj;
@ -394,6 +410,19 @@ static int h_read_settings(struct scene_obj *obj, void *vpriv)
case SCENEOBJT_IMAGE: case SCENEOBJT_IMAGE:
case SCENEOBJT_TEXT: case SCENEOBJT_TEXT:
break; break;
case SCENEOBJT_TEXTLINE: {
const struct scene_obj_textline *tline;
const char *val;
int len;
tline = (struct scene_obj_textline *)obj;
val = ofnode_read_prop(node, obj->name, &len);
if (len >= tline->max_chars)
return log_msg_ret("str", -ENOSPC);
strcpy(abuf_data(&tline->buf), val);
break;
}
case SCENEOBJT_MENU: { case SCENEOBJT_MENU: {
struct scene_obj_menu *menu; struct scene_obj_menu *menu;
uint val; uint val;
@ -472,6 +501,20 @@ static int h_write_settings_env(struct scene_obj *obj, void *vpriv)
if (ret) if (ret)
return log_msg_ret("st2", ret); return log_msg_ret("st2", ret);
break; break;
case SCENEOBJT_TEXTLINE: {
const struct scene_obj_textline *tline;
tline = (struct scene_obj_textline *)obj;
str = abuf_data(&tline->buf);
ret = env_set(var, str);
if (ret)
return log_msg_ret("set", ret);
if (priv->verbose)
printf("%s=%s\n", var, str);
break;
}
} }
return 0; return 0;
@ -521,6 +564,21 @@ static int h_read_settings_env(struct scene_obj *obj, void *vpriv)
*/ */
menu->cur_item_id = val; menu->cur_item_id = val;
break; break;
case SCENEOBJT_TEXTLINE: {
const struct scene_obj_textline *tline;
const char *value;
tline = (struct scene_obj_textline *)obj;
value = env_get(var);
if (value && strlen(value) >= tline->max_chars)
return log_msg_ret("str", -ENOSPC);
if (!value)
value = "";
if (priv->verbose)
printf("%s=%s\n", var, value);
strcpy(abuf_data(&tline->buf), value);
break;
}
} }
return 0; return 0;