From patchwork Mon Jan 19 20:41:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1655 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855429; bh=4tzljUunkfbR9Yv5Q2c7o9gwjfgmFJM4ghei15RDXrc=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=ljOmHBJmnUa3ExAPKA407s2XuUPUNWTA6yXTzxGlmcl/Lv3mELCkhghgGctDWNSr/ PY59qoGcozwRJVDEATa1rm3ohTF2ZVEjSpAsgbJfkHqNt+NIyAKytW0BJpir8JVJv+ 2okUgtcEQ351J7SjegFb9nHkZk2A3MuKkghOd1EXC0bsaeVb7wVxNFh8RPjqC/jQrB cczf2krhvRl1Y1TdxQ9jvgMEc0GKl6Br3Ag9SCta3pYo04AcFp2GP9vm5odoXlg1o1 pljY/ttEAvhQvkSf2YPlzjQvBmqk4wZnELepuIFD8fDTUq1il9ySMbqv3NM6T37yQ8 kkxHwYbHxcMkg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 2A1E6693BA for ; Mon, 19 Jan 2026 13:43:49 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 4jXmTtRTjAx7 for ; Mon, 19 Jan 2026 13:43:49 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855429; bh=4tzljUunkfbR9Yv5Q2c7o9gwjfgmFJM4ghei15RDXrc=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=ljOmHBJmnUa3ExAPKA407s2XuUPUNWTA6yXTzxGlmcl/Lv3mELCkhghgGctDWNSr/ PY59qoGcozwRJVDEATa1rm3ohTF2ZVEjSpAsgbJfkHqNt+NIyAKytW0BJpir8JVJv+ 2okUgtcEQ351J7SjegFb9nHkZk2A3MuKkghOd1EXC0bsaeVb7wVxNFh8RPjqC/jQrB cczf2krhvRl1Y1TdxQ9jvgMEc0GKl6Br3Ag9SCta3pYo04AcFp2GP9vm5odoXlg1o1 pljY/ttEAvhQvkSf2YPlzjQvBmqk4wZnELepuIFD8fDTUq1il9ySMbqv3NM6T37yQ8 kkxHwYbHxcMkg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 179E869504 for ; Mon, 19 Jan 2026 13:43:49 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855427; bh=g+XrMQHBCLLF7CAl6B6vPm6kp5xo0F6aSXgBfxxo4Y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tf4R6wvET03l2OOaebssH8wdMA+AGo+CUShGnLOjI7acZ155IKwmLYH+hOls7TYtT 0K0pl+ZELLNgley0TrFRQfdpMX6iJfC2fCUDIkdjiak6BwTihRLTOiCWRZsEfGFejm s/LoM8n3F0ogXgPPU4g+1qA7DJuUWDB3JTXI7nJTWYBfi2bLd4sONBLC1+Uel0/F1w FUM7ZjwigUx9ZNVs90JxO4oRr3zcUdG4Tm0X5RNNNmn7XZ7t2PSVq/g3Ryt9w1c930 eEx1tsOMhCebvc+Z6++n9pF3wy4QwdNW1s1M2z27OCQt4rB33EmwIaQMfoAlPt1609 1wrCTXAv26ylw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 03EC169504; Mon, 19 Jan 2026 13:43:47 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id obGbWID5acvF; Mon, 19 Jan 2026 13:43:46 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855422; bh=IIbdxmBraZwQggBRqP/NPC4o2LKWjiBDQlt+meak6xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nON3yDvRbt6BuA7s5dWvHcrNoOV3z+m8wdvL4RoTICuT3o1/65d62bcTRSV5ipl+M bKUw8VTTkHvRfeoC90djfTRIJJMhvPFfFi3NyuTIhrkDluqRALLFQ1YLtr7xaCH6NG Yjy9m4yA9W7MBJQPhNnyC/0t/J4Z8iXaxp8/u/SvBxfwtkiIFqBDsubjKWoT1S1K80 7lg2DNiHDsy1bfqHMnXTIkyNj7r8HtA8xYTWYNMM9N54BI4+8rgSUaoLm4p7/ijHt0 lteLsBb4jCYzyBX6WxM+cCZoo7oFXDbQpMAQRiqFaFHytmBXVZ+MvM9WYSqfAlqpMS iAqLTvFZsQXPA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id D206A693BA; Mon, 19 Jan 2026 13:43:41 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Mon, 19 Jan 2026 13:41:18 -0700 Message-ID: <20260119204130.3972647-26-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260119204130.3972647-1-sjg@u-boot.org> References: <20260119204130.3972647-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 432JQ3QZMW7C3NGTI72KV2C5VBDM5ZTR X-Message-ID-Hash: 432JQ3QZMW7C3NGTI72KV2C5VBDM5ZTR X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 25/27] expo: Mark textedits as highlightable List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Move SCENEOBJT_TEXTEDIT after SCENEOBJT_TEXTLINE in the enum so it can be highlighted like other text-input objects. Update scene_obj_type_names array to match. Signed-off-by: Simon Glass --- boot/scene.c | 2 +- include/expo.h | 2 +- test/boot/expo.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/scene.c b/boot/scene.c index 6b5c934a2e7..46bc9b64e64 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -38,9 +38,9 @@ static const char *const scene_obj_type_names[] = { "image", "text", "box", - "textedit", "menu", "textline", + "textedit", }; bool scene_chklog(const char *name) diff --git a/include/expo.h b/include/expo.h index c854d78255b..248f2363fe1 100644 --- a/include/expo.h +++ b/include/expo.h @@ -242,11 +242,11 @@ enum scene_obj_t { SCENEOBJT_IMAGE, SCENEOBJT_TEXT, SCENEOBJT_BOX, - SCENEOBJT_TEXTEDIT, /* types from here on can be highlighted */ SCENEOBJT_MENU, SCENEOBJT_TEXTLINE, + SCENEOBJT_TEXTEDIT, }; /** diff --git a/test/boot/expo.c b/test/boot/expo.c index 4febdf87cde..c8c97057d54 100644 --- a/test/boot/expo.c +++ b/test/boot/expo.c @@ -1254,7 +1254,7 @@ static int expo_scene_obj_type_name(struct unit_test_state *uts) ut_asserteq_str("textedit", scene_obj_type_name(SCENEOBJT_TEXTEDIT)); /* Test invalid type (out of range) */ - ut_asserteq_str("unknown", scene_obj_type_name(SCENEOBJT_TEXTLINE + 1)); + ut_asserteq_str("unknown", scene_obj_type_name(SCENEOBJT_TEXTEDIT + 1)); return 0; }