Insets are handled inconsistently at present, since menus use them to offset the label text, whereas textlines don't. This is done because menus need the margin to be visible when opened. However this causes an alignment issue when menus and textlines appear in the same cedit. Remove the offsets from menus and compensate by adjusting the bounding boxes used for highlighting and the opened menu. Line up menu items and textlines vertically and add a style option for textlines to control how much padding is added. Add a test to check the positions of objects in a cedit, since this is more direct than the rendering tests. Add style information so that the impact can be seen. Signed-off-by: Simon Glass <sjg@chromium.org>
379 lines
7.2 KiB
C
379 lines
7.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Implementation of a expo, a collection of scenes providing menu options
|
|
*
|
|
* Copyright 2022 Google LLC
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*/
|
|
|
|
#define LOG_CATEGORY LOGC_EXPO
|
|
|
|
#include <dm.h>
|
|
#include <expo.h>
|
|
#include <log.h>
|
|
#include <malloc.h>
|
|
#include <menu.h>
|
|
#include <video.h>
|
|
#include <watchdog.h>
|
|
#include <linux/delay.h>
|
|
#include "scene_internal.h"
|
|
|
|
int expo_new(const char *name, void *priv, struct expo **expp)
|
|
{
|
|
struct expo *exp;
|
|
|
|
exp = calloc(1, sizeof(struct expo));
|
|
if (!exp)
|
|
return log_msg_ret("expo", -ENOMEM);
|
|
exp->name = strdup(name);
|
|
if (!exp->name) {
|
|
free(exp);
|
|
return log_msg_ret("name", -ENOMEM);
|
|
}
|
|
exp->priv = priv;
|
|
INIT_LIST_HEAD(&exp->scene_head);
|
|
INIT_LIST_HEAD(&exp->str_head);
|
|
exp->next_id = EXPOID_BASE_ID;
|
|
cli_ch_init(&exp->cch);
|
|
|
|
*expp = exp;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void estr_destroy(struct expo_string *estr)
|
|
{
|
|
free(estr);
|
|
}
|
|
|
|
void expo_destroy(struct expo *exp)
|
|
{
|
|
struct scene *scn, *next;
|
|
struct expo_string *estr, *enext;
|
|
|
|
list_for_each_entry_safe(scn, next, &exp->scene_head, sibling)
|
|
scene_destroy(scn);
|
|
|
|
list_for_each_entry_safe(estr, enext, &exp->str_head, sibling)
|
|
estr_destroy(estr);
|
|
|
|
free(exp->name);
|
|
free(exp);
|
|
}
|
|
|
|
uint resolve_id(struct expo *exp, uint id)
|
|
{
|
|
log_debug("resolve id %d\n", id);
|
|
if (!id)
|
|
id = exp->next_id++;
|
|
else if (id >= exp->next_id)
|
|
exp->next_id = id + 1;
|
|
|
|
return id;
|
|
}
|
|
|
|
void expo_set_dynamic_start(struct expo *exp, uint dyn_start)
|
|
{
|
|
exp->next_id = dyn_start;
|
|
}
|
|
|
|
int expo_str(struct expo *exp, const char *name, uint id, const char *str)
|
|
{
|
|
struct expo_string *estr;
|
|
|
|
estr = calloc(1, sizeof(struct expo_string));
|
|
if (!estr)
|
|
return log_msg_ret("obj", -ENOMEM);
|
|
|
|
estr->id = resolve_id(exp, id);
|
|
abuf_init_const(&estr->buf, str, strlen(str) + 1);
|
|
list_add_tail(&estr->sibling, &exp->str_head);
|
|
|
|
return estr->id;
|
|
}
|
|
|
|
const char *expo_get_str(struct expo *exp, uint id)
|
|
{
|
|
struct expo_string *estr;
|
|
|
|
list_for_each_entry(estr, &exp->str_head, sibling) {
|
|
if (estr->id == id)
|
|
return estr->buf.data;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
int expo_edit_str(struct expo *exp, uint id, struct abuf *orig,
|
|
struct abuf **copyp)
|
|
{
|
|
struct expo_string *estr;
|
|
struct abuf old;
|
|
|
|
list_for_each_entry(estr, &exp->str_head, sibling) {
|
|
if (estr->id == id) {
|
|
old = estr->buf;
|
|
if (!abuf_copy(&old, &estr->buf))
|
|
return -ENOMEM;
|
|
*copyp = &estr->buf;
|
|
if (orig)
|
|
*orig = old;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return -ENOENT;
|
|
}
|
|
|
|
int expo_set_display(struct expo *exp, struct udevice *dev)
|
|
{
|
|
struct udevice *cons;
|
|
int ret;
|
|
|
|
ret = device_find_first_child_by_uclass(dev, UCLASS_VIDEO_CONSOLE,
|
|
&cons);
|
|
if (ret)
|
|
return log_msg_ret("con", ret);
|
|
|
|
exp->display = dev;
|
|
exp->cons = cons;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int expo_calc_dims(struct expo *exp)
|
|
{
|
|
struct scene *scn;
|
|
int ret;
|
|
|
|
if (!exp->cons)
|
|
return log_msg_ret("dim", -ENOTSUPP);
|
|
|
|
list_for_each_entry(scn, &exp->scene_head, sibling) {
|
|
ret = scene_calc_dims(scn);
|
|
if (ret)
|
|
return log_msg_ret("scn", ret);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void expo_set_text_mode(struct expo *exp, bool text_mode)
|
|
{
|
|
exp->text_mode = text_mode;
|
|
}
|
|
|
|
struct scene *expo_lookup_scene_id(struct expo *exp, uint scene_id)
|
|
{
|
|
struct scene *scn;
|
|
|
|
list_for_each_entry(scn, &exp->scene_head, sibling) {
|
|
if (scn->id == scene_id)
|
|
return scn;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
int expo_set_scene_id(struct expo *exp, uint scene_id)
|
|
{
|
|
struct scene *scn;
|
|
|
|
scn = expo_lookup_scene_id(exp, scene_id);
|
|
if (!scn)
|
|
return log_msg_ret("id", -ENOENT);
|
|
|
|
exp->scene_id = scene_id;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int expo_first_scene_id(struct expo *exp)
|
|
{
|
|
struct scene *scn;
|
|
|
|
if (list_empty(&exp->scene_head))
|
|
return -ENOENT;
|
|
|
|
scn = list_first_entry(&exp->scene_head, struct scene, sibling);
|
|
|
|
return scn->id;
|
|
}
|
|
|
|
int expo_arrange(struct expo *exp)
|
|
{
|
|
struct scene *scn;
|
|
int ret;
|
|
|
|
if (!exp->scene_id)
|
|
return 0;
|
|
|
|
scn = expo_lookup_scene_id(exp, exp->scene_id);
|
|
if (!scn)
|
|
return log_msg_ret("scn", -ENOENT);
|
|
|
|
ret = scene_arrange(scn);
|
|
if (ret)
|
|
return log_msg_ret("ear", ret);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int expo_render(struct expo *exp)
|
|
{
|
|
struct udevice *dev = exp->display;
|
|
struct video_priv *vid_priv = dev_get_uclass_priv(dev);
|
|
struct scene *scn = NULL;
|
|
enum colour_idx back;
|
|
u32 colour;
|
|
int ret;
|
|
|
|
back = vid_priv->white_on_black ? VID_BLACK : VID_WHITE;
|
|
colour = video_index_to_colour(vid_priv, back);
|
|
ret = video_fill(dev, colour);
|
|
if (ret)
|
|
return log_msg_ret("fill", ret);
|
|
|
|
if (exp->scene_id) {
|
|
scn = expo_lookup_scene_id(exp, exp->scene_id);
|
|
if (!scn)
|
|
return log_msg_ret("scn", -ENOENT);
|
|
|
|
ret = scene_render(scn);
|
|
if (ret)
|
|
return log_msg_ret("ren", ret);
|
|
}
|
|
|
|
video_sync(dev, true);
|
|
|
|
return scn ? 0 : -ECHILD;
|
|
}
|
|
|
|
int expo_send_key(struct expo *exp, int key)
|
|
{
|
|
struct scene *scn = NULL;
|
|
|
|
if (exp->scene_id) {
|
|
int ret;
|
|
|
|
scn = expo_lookup_scene_id(exp, exp->scene_id);
|
|
if (!scn)
|
|
return log_msg_ret("scn", -ENOENT);
|
|
|
|
ret = scene_send_key(scn, key, &exp->action);
|
|
if (ret)
|
|
return log_msg_ret("key", ret);
|
|
|
|
/* arrange it to get any changes */
|
|
ret = scene_arrange(scn);
|
|
if (ret)
|
|
return log_msg_ret("arr", ret);
|
|
}
|
|
|
|
return scn ? 0 : -ECHILD;
|
|
}
|
|
|
|
int expo_action_get(struct expo *exp, struct expo_action *act)
|
|
{
|
|
*act = exp->action;
|
|
exp->action.type = EXPOACT_NONE;
|
|
|
|
return act->type == EXPOACT_NONE ? -EAGAIN : 0;
|
|
}
|
|
|
|
int expo_apply_theme(struct expo *exp)
|
|
{
|
|
struct expo_theme *theme = &exp->theme;
|
|
struct scene *scn;
|
|
|
|
if (exp->display)
|
|
video_set_white_on_black(exp->display, theme->white_on_black);
|
|
|
|
list_for_each_entry(scn, &exp->scene_head, sibling) {
|
|
int ret;
|
|
|
|
ret = scene_apply_theme(scn, theme);
|
|
if (ret)
|
|
return log_msg_ret("asn", ret);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int expo_setup_theme(struct expo *exp, ofnode node)
|
|
{
|
|
struct expo_theme *theme = &exp->theme;
|
|
int ret;
|
|
|
|
log_debug("Applying theme %s\n", ofnode_get_name(node));
|
|
|
|
memset(theme, '\0', sizeof(struct expo_theme));
|
|
ofnode_read_u32(node, "font-size", &theme->font_size);
|
|
ofnode_read_u32(node, "menu-inset", &theme->menu_inset);
|
|
ofnode_read_u32(node, "menuitem-gap-y", &theme->menuitem_gap_y);
|
|
ofnode_read_u32(node, "menu-title-margin-x",
|
|
&theme->menu_title_margin_x);
|
|
ofnode_read_u32(node, "textline-label-margin-x",
|
|
&theme->textline_label_margin_x);
|
|
theme->white_on_black = ofnode_read_bool(node, "white-on-black");
|
|
|
|
ret = expo_apply_theme(exp);
|
|
if (ret)
|
|
return log_msg_ret("asn", ret);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int expo_iter_scene_objs(struct expo *exp, expo_scene_obj_iterator iter,
|
|
void *priv)
|
|
{
|
|
struct scene *scn;
|
|
int ret;
|
|
|
|
list_for_each_entry(scn, &exp->scene_head, sibling) {
|
|
ret = scene_iter_objs(scn, iter, priv);
|
|
if (ret)
|
|
return log_msg_ret("wr", ret);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int expo_poll(struct expo *exp, struct expo_action *act)
|
|
{
|
|
int ichar, key, ret;
|
|
|
|
ichar = cli_ch_process(&exp->cch, 0);
|
|
if (!ichar) {
|
|
int i;
|
|
|
|
for (i = 0; i < 10 && !ichar && !tstc(); i++) {
|
|
schedule();
|
|
mdelay(2);
|
|
ichar = cli_ch_process(&exp->cch, -ETIMEDOUT);
|
|
}
|
|
while (!ichar && tstc()) {
|
|
ichar = getchar();
|
|
ichar = cli_ch_process(&exp->cch, ichar);
|
|
}
|
|
}
|
|
|
|
key = 0;
|
|
if (ichar) {
|
|
key = bootmenu_conv_key(ichar);
|
|
if (key == BKEY_NONE || key >= BKEY_FIRST_EXTRA)
|
|
key = ichar;
|
|
}
|
|
if (!key)
|
|
return -EAGAIN;
|
|
|
|
ret = expo_send_key(exp, key);
|
|
if (ret)
|
|
return log_msg_ret("epk", ret);
|
|
ret = expo_action_get(exp, act);
|
|
if (ret)
|
|
return log_msg_ret("eag", ret);
|
|
|
|
return 0;
|
|
}
|