These coordinates are the top left values, so rename them to x0 and y0
in preparation for changing the width and height to x1 and y1
Signed-off-by: Simon Glass <s...@chromium.org>
---
boot/scene.c | 24 ++++++++++----------
boot/scene_menu.c | 8 +++----
boot/scene_textline.c | 16 ++++++-------
include/expo.h | 8 +++----
test/boot/expo.c | 52 +++++++++++++++++++++----------------------
5 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/boot/scene.c b/boot/scene.c
index fbc6f783257..75b1e4faba5 100644
--- a/boot/scene.c
+++ b/boot/scene.c
@@ -211,8 +211,8 @@ int scene_obj_set_pos(struct scene *scn, uint id, int x,
int y)
obj = scene_obj_find(scn, id, SCENEOBJT_NONE);
if (!obj)
return log_msg_ret("find", -ENOENT);
- obj->bbox.x = x;
- obj->bbox.y = y;
+ obj->bbox.x0 = x;
+ obj->bbox.y0 = y;
return 0;
}
@@ -369,8 +369,8 @@ static int scene_obj_render(struct scene_obj *obj, bool
text_mode)
struct udevice *cons = text_mode ? NULL : exp->cons;
int x, y, ret;
- x = obj->bbox.x;
- y = obj->bbox.y;
+ x = obj->bbox.x0;
+ y = obj->bbox.y0;
switch (obj->type) {
case SCENEOBJT_NONE:
@@ -916,15 +916,15 @@ int scene_bbox_union(struct scene *scn, uint id, int
inset,
if (!obj)
return log_msg_ret("obj", -ENOENT);
if (bbox->valid) {
- bbox->x0 = min(bbox->x0, obj->bbox.x - inset);
- bbox->y0 = min(bbox->y0, obj->bbox.y);
- bbox->x1 = max(bbox->x1, obj->bbox.x + obj->bbox.w + inset);
- bbox->y1 = max(bbox->y1, obj->bbox.y + obj->bbox.h);
+ bbox->x0 = min(bbox->x0, obj->bbox.x0 - inset);
+ bbox->y0 = min(bbox->y0, obj->bbox.y0);
+ bbox->x1 = max(bbox->x1, obj->bbox.x0 + obj->bbox.w + inset);
+ bbox->y1 = max(bbox->y1, obj->bbox.y0 + obj->bbox.h);
} else {
- bbox->x0 = obj->bbox.x - inset;
- bbox->y0 = obj->bbox.y;
- bbox->x1 = obj->bbox.x + obj->bbox.w + inset;
- bbox->y1 = obj->bbox.y + obj->bbox.h;
+ bbox->x0 = obj->bbox.x0 - inset;
+ bbox->y0 = obj->bbox.y0;
+ bbox->x1 = obj->bbox.x0 + obj->bbox.w + inset;
+ bbox->y1 = obj->bbox.y0 + obj->bbox.h;
bbox->valid = true;
}
diff --git a/boot/scene_menu.c b/boot/scene_menu.c
index f0a060a6356..00bbf9a3849 100644
--- a/boot/scene_menu.c
+++ b/boot/scene_menu.c
@@ -102,7 +102,7 @@ static int update_pointers(struct scene_obj_menu *menu,
uint id, bool point)
label = scene_obj_find(scn, item->label_id, SCENEOBJT_NONE);
ret = scene_obj_set_pos(scn, menu->pointer_id,
- menu->obj.bbox.x + 200, label->bbox.y);
+ menu->obj.bbox.x0 + 200,
label->bbox.y0);
if (ret < 0)
return log_msg_ret("ptr", ret);
}
@@ -198,12 +198,12 @@ int scene_menu_arrange(struct scene *scn, struct
expo_arrange_info *arr,
int x, y;
int ret;
- x = menu->obj.bbox.x;
- y = menu->obj.bbox.y;
+ x = menu->obj.bbox.x0;
+ y = menu->obj.bbox.y0;
if (menu->title_id) {
int width;
- ret = scene_obj_set_pos(scn, menu->title_id, menu->obj.bbox.x,
y);
+ ret = scene_obj_set_pos(scn, menu->title_id, menu->obj.bbox.x0,
y);
if (ret < 0)
return log_msg_ret("tit", ret);
diff --git a/boot/scene_textline.c b/boot/scene_textline.c
index 4467bc4abcf..2ffeffeb5f5 100644
--- a/boot/scene_textline.c
+++ b/boot/scene_textline.c
@@ -95,16 +95,16 @@ int scene_textline_arrange(struct scene *scn, struct
expo_arrange_info *arr,
int x, y;
int ret;
- x = tline->obj.bbox.x;
- y = tline->obj.bbox.y;
+ x = tline->obj.bbox.x0;
+ y = tline->obj.bbox.y0;
if (tline->label_id) {
- ret = scene_obj_set_pos(scn, tline->label_id, tline->obj.bbox.x,
- y);
+ ret = scene_obj_set_pos(scn, tline->label_id,
+ tline->obj.bbox.x0, y);
if (ret < 0)
return log_msg_ret("tit", ret);
ret = scene_obj_set_pos(scn, tline->edit_id,
- tline->obj.bbox.x + 200, y);
+ tline->obj.bbox.x0 + 200, y);
if (ret < 0)
return log_msg_ret("tit", ret);
@@ -198,8 +198,8 @@ int scene_textline_render_deps(struct scene *scn,
if (ret)
return log_msg_ret("sav", ret);
- vidconsole_set_cursor_visible(cons, true, txt->obj.bbox.x,
- txt->obj.bbox.y, scn->cls.num);
+ vidconsole_set_cursor_visible(cons, true, txt->obj.bbox.x0,
+ txt->obj.bbox.y0, scn->cls.num);
}
return 0;
@@ -220,7 +220,7 @@ int scene_textline_open(struct scene *scn, struct
scene_obj_textline *tline)
if (!txt)
return log_msg_ret("cur", -ENOENT);
- vidconsole_set_cursor_pos(cons, txt->obj.bbox.x, txt->obj.bbox.y);
+ vidconsole_set_cursor_pos(cons, txt->obj.bbox.x0, txt->obj.bbox.y0);
vidconsole_entry_start(cons);
cli_cread_init(&scn->cls, abuf_data(&tline->buf), tline->max_chars);
scn->cls.insert = true;
diff --git a/include/expo.h b/include/expo.h
index 42e934e3ff2..84dc77f771e 100644
--- a/include/expo.h
+++ b/include/expo.h
@@ -194,14 +194,14 @@ enum scene_obj_t {
/**
* struct scene_obj_bbox - Dimensions of an object
*
- * @x: x position, in pixels from left side
- * @y: y position, in pixels from top
+ * @x0: x position, in pixels from left side
+ * @y0: y position, in pixels from top
* @w: width, in pixels
* @h: height, in pixels
*/
struct scene_obj_bbox {
- int x;
- int y;
+ int x0;
+ int y0;
int w;
int h;
};
diff --git a/test/boot/expo.c b/test/boot/expo.c
index 77b956bdf06..9c940825278 100644
--- a/test/boot/expo.c
+++ b/test/boot/expo.c
@@ -270,8 +270,8 @@ static int expo_object_attr(struct unit_test_state *uts)
ut_assert(id > 0);
ut_assertok(scene_obj_set_pos(scn, OBJ_LOGO, 123, 456));
- ut_asserteq(123, img->obj.bbox.x);
- ut_asserteq(456, img->obj.bbox.y);
+ ut_asserteq(123, img->obj.bbox.x0);
+ ut_asserteq(456, img->obj.bbox.y0);
ut_asserteq(-ENOENT, scene_obj_set_pos(scn, OBJ_TEXT2, 0, 0));
@@ -360,8 +360,8 @@ static int expo_object_menu(struct unit_test_state *uts)
ut_asserteq(0, menu->pointer_id);
ut_assertok(scene_obj_set_pos(scn, OBJ_MENU, 50, 400));
- ut_asserteq(50, menu->obj.bbox.x);
- ut_asserteq(400, menu->obj.bbox.y);
+ ut_asserteq(50, menu->obj.bbox.x0);
+ ut_asserteq(400, menu->obj.bbox.y0);
id = scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
"Main Menu", &tit);
@@ -407,24 +407,24 @@ static int expo_object_menu(struct unit_test_state *uts)
ut_asserteq(id, menu->cur_item_id);
/* the title should be at the top */
- ut_asserteq(menu->obj.bbox.x, tit->obj.bbox.x);
- ut_asserteq(menu->obj.bbox.y, tit->obj.bbox.y);
+ ut_asserteq(menu->obj.bbox.x0, tit->obj.bbox.x0);
+ ut_asserteq(menu->obj.bbox.y0, tit->obj.bbox.y0);
/* the first item should be next */
- ut_asserteq(menu->obj.bbox.x, name1->obj.bbox.x);
- ut_asserteq(menu->obj.bbox.y + 32, name1->obj.bbox.y);
+ ut_asserteq(menu->obj.bbox.x0, name1->obj.bbox.x0);
+ ut_asserteq(menu->obj.bbox.y0 + 32, name1->obj.bbox.y0);
- ut_asserteq(menu->obj.bbox.x + 230, key1->obj.bbox.x);
- ut_asserteq(menu->obj.bbox.y + 32, key1->obj.bbox.y);
+ ut_asserteq(menu->obj.bbox.x0 + 230, key1->obj.bbox.x0);
+ ut_asserteq(menu->obj.bbox.y0 + 32, key1->obj.bbox.y0);
- ut_asserteq(menu->obj.bbox.x + 200, ptr->obj.bbox.x);
- ut_asserteq(menu->obj.bbox.y + 32, ptr->obj.bbox.y);
+ ut_asserteq(menu->obj.bbox.x0 + 200, ptr->obj.bbox.x0);
+ ut_asserteq(menu->obj.bbox.y0 + 32, ptr->obj.bbox.y0);
- ut_asserteq(menu->obj.bbox.x + 280, desc1->obj.bbox.x);
- ut_asserteq(menu->obj.bbox.y + 32, desc1->obj.bbox.y);
+ ut_asserteq(menu->obj.bbox.x0 + 280, desc1->obj.bbox.x0);
+ ut_asserteq(menu->obj.bbox.y0 + 32, desc1->obj.bbox.y0);
- ut_asserteq(-4, prev1->obj.bbox.x);
- ut_asserteq(menu->obj.bbox.y + 32, prev1->obj.bbox.y);
+ ut_asserteq(-4, prev1->obj.bbox.x0);
+ ut_asserteq(menu->obj.bbox.y0 + 32, prev1->obj.bbox.y0);
ut_asserteq(true, prev1->obj.flags & SCENEOF_HIDE);
/* check iterating through scene items */
@@ -548,39 +548,39 @@ static int expo_render_image(struct unit_test_state *uts)
/* check dimensions of text */
obj = scene_obj_find(scn, OBJ_TEXT, SCENEOBJT_NONE);
ut_assertnonnull(obj);
- ut_asserteq(400, obj->bbox.x);
- ut_asserteq(100, obj->bbox.y);
+ ut_asserteq(400, obj->bbox.x0);
+ ut_asserteq(100, obj->bbox.y0);
ut_asserteq(126, obj->bbox.w);
ut_asserteq(40, obj->bbox.h);
/* check dimensions of image */
obj = scene_obj_find(scn, OBJ_LOGO, SCENEOBJT_NONE);
ut_assertnonnull(obj);
- ut_asserteq(50, obj->bbox.x);
- ut_asserteq(20, obj->bbox.y);
+ ut_asserteq(50, obj->bbox.x0);
+ ut_asserteq(20, obj->bbox.y0);
ut_asserteq(160, obj->bbox.w);
ut_asserteq(160, obj->bbox.h);
/* check dimensions of menu labels - both should be the same width */
obj = scene_obj_find(scn, ITEM1_LABEL, SCENEOBJT_NONE);
ut_assertnonnull(obj);
- ut_asserteq(50, obj->bbox.x);
- ut_asserteq(436, obj->bbox.y);
+ ut_asserteq(50, obj->bbox.x0);
+ ut_asserteq(436, obj->bbox.y0);
ut_asserteq(29, obj->bbox.w);
ut_asserteq(18, obj->bbox.h);
obj = scene_obj_find(scn, ITEM2_LABEL, SCENEOBJT_NONE);
ut_assertnonnull(obj);
- ut_asserteq(50, obj->bbox.x);
- ut_asserteq(454, obj->bbox.y);
+ ut_asserteq(50, obj->bbox.x0);
+ ut_asserteq(454, obj->bbox.y0);
ut_asserteq(29, obj->bbox.w);
ut_asserteq(18, obj->bbox.h);
/* check dimensions of menu */
obj = scene_obj_find(scn, OBJ_MENU, SCENEOBJT_NONE);
ut_assertnonnull(obj);
- ut_asserteq(50, obj->bbox.x);
- ut_asserteq(400, obj->bbox.y);
+ ut_asserteq(50, obj->bbox.x0);
+ ut_asserteq(400, obj->bbox.y0);
ut_asserteq(160, obj->bbox.w);
ut_asserteq(160, obj->bbox.h);
--
2.43.0
