colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootstd: Support setting a theme for the menu

Browse Source 
Allow a theme to be set. For now this is very simple, just a default font
size to use for all elements.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-01-06 08:52:42 -06:00
committed by Tom Rini
parent d985f1dbdd
commit e64c29521c
5 changed files with 139 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
test/boot/bootflow.c
View File

@@ -13,6 +13,7 @@
#include <bootstd.h>
#include <cli.h>
#include <dm.h>
#include <expo.h>
#ifdef CONFIG_SANDBOX
#include <asm/test.h>
#endif
@@ -21,6 +22,8 @@
#include <test/suites.h>
#include <test/ut.h>
#include "bootstd_common.h"
#include "../../boot/bootflow_internal.h"
#include "../../boot/scene_internal.h"
DECLARE_GLOBAL_DATA_PTR;
@@ -469,14 +472,18 @@ static int bootflow_cmd_boot(struct unit_test_state *uts)
}
BOOTSTD_TEST(bootflow_cmd_boot, UT_TESTF_DM | UT_TESTF_SCAN_FDT);
/* Check 'bootflow menu' to select a bootflow */
static int bootflow_cmd_menu(struct unit_test_state *uts)
/**
* prep_mmc4_bootdev() - Set up the mmc4 bootdev so we can access a fake Armbian
*
* @uts: Unit test state
* Returns 0 on success, -ve on failure
*/
static int prep_mmc4_bootdev(struct unit_test_state *uts)
{
static const char *order[] = {"mmc2", "mmc1", "mmc4", NULL};
struct udevice *dev, *bootstd;
struct bootstd_priv *std;
const char **old_order;
char prev[3];
ofnode node;
/* Enable the mmc4 node since we need a second bootflow */
@@ -500,6 +507,16 @@ static int bootflow_cmd_menu(struct unit_test_state *uts)
/* Restore the order used by the device tree */
std->bootdev_order = old_order;
return 0;
}
/* Check 'bootflow menu' to select a bootflow */
static int bootflow_cmd_menu(struct unit_test_state *uts)
{
char prev[3];
ut_assertok(prep_mmc4_bootdev(uts));
/* Add keypresses to move to and select the second one in the list */
prev[0] = CTL_CH('n');
prev[1] = '\r';
@@ -513,3 +530,63 @@ static int bootflow_cmd_menu(struct unit_test_state *uts)
return 0;
}
BOOTSTD_TEST(bootflow_cmd_menu, UT_TESTF_DM | UT_TESTF_SCAN_FDT);
/**
* check_font() - Check that the font size for an item matches expectations
*
* @uts: Unit test state
* @scn: Scene containing the text object
* @id: ID of the text object
* Returns 0 on success, -ve on failure
*/
static int check_font(struct unit_test_state *uts, struct scene *scn, uint id,
int font_size)
{
struct scene_obj_txt *txt;
txt = scene_obj_find(scn, id, SCENEOBJT_TEXT);
ut_assertnonnull(txt);
ut_asserteq(font_size, txt->font_size);
return 0;
}
/* Check themes work with a bootflow menu */
static int bootflow_menu_theme(struct unit_test_state *uts)
{
const int font_size = 30;
struct scene *scn;
struct expo *exp;
ofnode node;
int i;
ut_assertok(prep_mmc4_bootdev(uts));
ut_assertok(bootflow_menu_new(&exp));
node = ofnode_path("/bootstd/theme");
ut_assert(ofnode_valid(node));
ut_assertok(bootflow_menu_apply_theme(exp, node));
scn = expo_lookup_scene_id(exp, MAIN);
ut_assertnonnull(scn);
/*
* Check that the txt objects have the correct font size from the
* device tree node: bootstd/theme
*
* Check both menu items, since there are two bootflows
*/
ut_assertok(check_font(uts, scn, OBJ_PROMPT, font_size));
ut_assertok(check_font(uts, scn, OBJ_POINTER, font_size));
for (i = 0; i < 2; i++) {
ut_assertok(check_font(uts, scn, ITEM_DESC + i, font_size));
ut_assertok(check_font(uts, scn, ITEM_KEY + i, font_size));
ut_assertok(check_font(uts, scn, ITEM_LABEL + i, font_size));
}
expo_destroy(exp);
return 0;
}
BOOTSTD_TEST(bootflow_menu_theme, UT_TESTF_DM | UT_TESTF_SCAN_FDT);