From patchwork Fri Jan 20 08:43:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 644638 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp663571pvb; Fri, 20 Jan 2023 00:42:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXvV9VV3S3ezOLn0CV6XC+r6OrcD5flSVHMvOvBg26aL2LXLCM/bhSQXDurifOxfMXrB0Wj5 X-Received: by 2002:a05:6870:7909:b0:142:9258:b78d with SMTP id hg9-20020a056870790900b001429258b78dmr7076288oab.12.1674204163514; Fri, 20 Jan 2023 00:42:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674204163; cv=none; d=google.com; s=arc-20160816; b=ZWSMyF1QMHOJAWri9Tf33EVK+7bH9jOPSGvgK8J23HHv5PhJtgwRBEd/DvoPiiys04 E/ewroZ4ZixiEUgzoUg5l+6jNuWNIUhZLQRsQ/cT3B6MX2D6lptXzBhapnGY5WVxs81o 4LYUQXieImVoGkPI37XoN9nkq/gs3olv9RTBdYlmsBUgN1GWveZUMhHC8wf+Sm1rcdve gKFfxuST/IMlPsW5vcpSoTPYeDyEuvLl8BlHud9nedk+963Ojl4KUXkuY5ATbsQmwtuu jvQKQOSIBB6NNRIND/24VmLfi5MTuVA3jiVFkPQAh5Vv6MrmEfqYkIQRjncADTa8kh97 YRZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=l9hoDhLbABLTWsvu3D6NPkwUy9Kh9cYkUj00ZgWRqis=; b=FtJm8sN1gxUWLJJSll0JSfNFf5COHqxgtGlizpZeiPZAVwg7h5inOW1qUQD9l2VcnA U7nst0zwGbmTcNp4KvoLw5oth+jrd/G5mxIPWNKErHavZXk1AnzjjjwpykveGbYQDQT/ yLeduIcw3G6UU2/iVKO5qMS4zQSgGVDHjTRwrmhU4pJ36ODa1sP8E+Xr1fXpt4VcT0o9 y+FSnJkM9m0jdfk/a37jM2mDRcZS/xgyS+J/IuRIagrY8XsDODORFdSKhJvBbbCBbH8o 7Nroap2Ze3oEcSMd3vUCMw/dRs1MBmpKDW94Nw6zghocBbghu5OgfYc8yMNuU7bwIu2+ qCeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hwnBgJ3g; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id g1-20020a0568080dc100b00359fd80c73asi33967814oic.60.2023.01.20.00.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 00:42:43 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hwnBgJ3g; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 210C0856D6; Fri, 20 Jan 2023 09:42:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="hwnBgJ3g"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CAF2E853D1; Fri, 20 Jan 2023 09:41:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2D0A08569D for ; Fri, 20 Jan 2023 09:41:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=masahisa.kojima@linaro.org Received: by mail-pj1-x1036.google.com with SMTP id x2-20020a17090a46c200b002295ca9855aso8402221pjg.2 for ; Fri, 20 Jan 2023 00:41:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=l9hoDhLbABLTWsvu3D6NPkwUy9Kh9cYkUj00ZgWRqis=; b=hwnBgJ3gAjkPi4HP4JvdLjirjTKqk/dsMnZzLlzPEezJy6hnBRLGQ0gvsEPFWZDSDG K75nXqUrWdlEvNmHH9/GGemeizssOInnVgZnagf4cGMYJsJRzz34tnBuHHKh7bdFA1/3 DDbQn1vb1oqi4cw2hlHT9WZIBlW/p1B8s0q0jt0VXXxt895+wqYRCRVjJtYoMiRF3GzJ +87AhXljuQllDQrSQ1AHBG0j5ZFmxWf79Dx6m/VBM8l/JCOBeAqJtWdNEX15OJUmTiqo RtLOoTj+0eKgQsSk6x3LBjyjrjkAekuL3F8GEsQSaUTD5mylWyb94XkW3ez9CkyfQvwW cEww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l9hoDhLbABLTWsvu3D6NPkwUy9Kh9cYkUj00ZgWRqis=; b=lmj9UDWLxGHfU9WQm82P8HKbDcVW5JvaaQzaNnPvjPm+S/TmvRsHrQtvyTK1tJfvWU /NG7uGHkbiJxVeXCt3dLuGU5E5kMdTS9YiCyEPN6CcN3Uxx8WotoPqPeNyNmzzFAYcQb jd5Yby46nLE5Rz8FQypAFyoTMHHHxt3q8EpcUS1A4f1Dj9l6avnG/3pYTuZIhD0zldeR Rd4gQf+uy1PsaQNIXXLCwDTcsT6u2wf66MsaG8LmW6HLqaUsUzq7MD1EGCk6f2yZdQ/4 IIoB360AxmABVhyJnk87oEXbWAukYWxL5Vlyym+cmqyOdmbmhZtBZVwWzLkeBIabelgc 8xVw== X-Gm-Message-State: AFqh2kqE6H8pNqmu+FqB8iu1MkajSmkXxa5pAso0yqqs5Ja2nrRFUTs0 QOqqvlmruuJQdookGzHCSPbt3tbXP+Xbvrrx X-Received: by 2002:a05:6a20:d68b:b0:b8:5134:a36b with SMTP id it11-20020a056a20d68b00b000b85134a36bmr15348548pzb.21.1674204103359; Fri, 20 Jan 2023 00:41:43 -0800 (PST) Received: from localhost.localdomain ([240d:1a:cf7:5800:82fa:5bff:fe4b:26b1]) by smtp.gmail.com with ESMTPSA id m12-20020a634c4c000000b0047063eb4098sm21652195pgl.37.2023.01.20.00.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 00:41:42 -0800 (PST) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Masahisa Kojima Subject: [PATCH v4 3/4] eficonfig: add vertical scroll support Date: Fri, 20 Jan 2023 17:43:57 +0900 Message-Id: <20230120084358.5919-4-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230120084358.5919-1-masahisa.kojima@linaro.org> References: <20230120084358.5919-1-masahisa.kojima@linaro.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The current eficonfig menu does not support vertical scroll, so it can not display the menu entries greater than the console row size. This commit add the vertial scroll support. The console size is retrieved by SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode() service, then calculates the row size for menu entry by subtracting menu header and description row size from the console row size. "start" and "end" are added in the efimenu structure. "start" keeps the menu entry index at the top, "end" keeps the bottom menu entry index. item_data_print() menu function only draws the menu entry between "start" and "end". Signed-off-by: Masahisa Kojima --- No update since v3 Changes in v3: - modify "reverse" local variable type to bool Changes in v2: - add comment when the user key press is not valid - add const qualifier to eficonfig_change_boot_order_desc cmd/eficonfig.c | 79 ++++++++++++++++++++++++++++++++++++-------- include/efi_config.h | 4 +++ include/efi_loader.h | 1 + 3 files changed, 70 insertions(+), 14 deletions(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 01bd1b05bc..5692b332c7 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -30,8 +30,13 @@ static const char *eficonfig_change_boot_order_desc = " Press SPACE to activate or deactivate the entry\n" " Select [Save] to complete, ESC/CTRL+C to quit"; +static struct efi_simple_text_output_protocol *cout; +static int avail_row; + #define EFICONFIG_DESCRIPTION_MAX 32 #define EFICONFIG_OPTIONAL_DATA_MAX 64 +#define EFICONFIG_MENU_HEADER_ROW_NUM 3 +#define EFICONFIG_MENU_DESC_ROW_NUM 5 /** * struct eficonfig_filepath_info - structure to be used to store file path @@ -157,18 +162,16 @@ void eficonfig_print_entry(void *data) struct eficonfig_entry *entry = data; bool reverse = (entry->efi_menu->active == entry->num); - /* TODO: support scroll or page for many entries */ + if (entry->efi_menu->start > entry->num || entry->efi_menu->end < entry->num) + return; - /* - * Move cursor to line where the entry will be drawn (entry->num) - * First 3 lines(menu header) + 1 empty line - */ - printf(ANSI_CURSOR_POSITION, entry->num + 4, 7); + printf(ANSI_CURSOR_POSITION, (entry->num - entry->efi_menu->start) + + EFICONFIG_MENU_HEADER_ROW_NUM + 1, 7); if (reverse) puts(ANSI_COLOR_REVERSE); - printf("%s", entry->title); + printf(ANSI_CLEAR_LINE "%s", entry->title); if (reverse) puts(ANSI_COLOR_RESET); @@ -191,8 +194,8 @@ void eficonfig_display_statusline(struct menu *m) ANSI_CURSOR_POSITION ANSI_CLEAR_LINE ANSI_CURSOR_POSITION "%s" ANSI_CLEAR_LINE_TO_END, - 1, 1, entry->efi_menu->menu_header, entry->efi_menu->count + 5, 1, - entry->efi_menu->count + 6, 1, entry->efi_menu->menu_desc); + 1, 1, entry->efi_menu->menu_header, avail_row + 4, 1, + avail_row + 5, 1, entry->efi_menu->menu_desc); } /** @@ -216,13 +219,23 @@ char *eficonfig_choice_entry(void *data) switch (key) { case BKEY_UP: - if (efi_menu->active > 0) + if (efi_menu->active > 0) { --efi_menu->active; + if (efi_menu->start > efi_menu->active) { + efi_menu->start--; + efi_menu->end--; + } + } /* no menu key selected, regenerate menu */ return NULL; case BKEY_DOWN: - if (efi_menu->active < efi_menu->count - 1) + if (efi_menu->active < efi_menu->count - 1) { ++efi_menu->active; + if (efi_menu->end < efi_menu->active) { + efi_menu->start++; + efi_menu->end++; + } + } /* no menu key selected, regenerate menu */ return NULL; case BKEY_SELECT: @@ -402,6 +415,8 @@ efi_status_t eficonfig_process_common(struct efimenu *efi_menu, efi_menu->delay = -1; efi_menu->active = 0; + efi_menu->start = 0; + efi_menu->end = avail_row - 1; if (menu_header) { efi_menu->menu_header = strdup(menu_header); @@ -1868,7 +1883,11 @@ static void eficonfig_print_change_boot_order_entry(void *data) struct eficonfig_entry *entry = data; bool reverse = (entry->efi_menu->active == entry->num); - printf(ANSI_CURSOR_POSITION, entry->num + 4, 7); + if (entry->efi_menu->start > entry->num || entry->efi_menu->end < entry->num) + return; + + printf(ANSI_CURSOR_POSITION ANSI_CLEAR_LINE, + (entry->num - entry->efi_menu->start) + EFICONFIG_MENU_HEADER_ROW_NUM + 1, 7); if (reverse) puts(ANSI_COLOR_REVERSE); @@ -1920,8 +1939,13 @@ char *eficonfig_choice_change_boot_order(void *data) } fallthrough; case BKEY_UP: - if (efi_menu->active > 0) + if (efi_menu->active > 0) { --efi_menu->active; + if (efi_menu->start > efi_menu->active) { + efi_menu->start--; + efi_menu->end--; + } + } return NULL; case BKEY_MINUS: if (efi_menu->active < efi_menu->count - 3) { @@ -1937,11 +1961,20 @@ char *eficonfig_choice_change_boot_order(void *data) list_add(&entry->list, &tmp->list); ++efi_menu->active; + if (efi_menu->end < efi_menu->active) { + efi_menu->start++; + efi_menu->end++; + } } return NULL; case BKEY_DOWN: - if (efi_menu->active < efi_menu->count - 1) + if (efi_menu->active < efi_menu->count - 1) { ++efi_menu->active; + if (efi_menu->end < efi_menu->active) { + efi_menu->start++; + efi_menu->end++; + } + } return NULL; case BKEY_SELECT: /* "Save" */ @@ -2590,6 +2623,7 @@ static efi_status_t eficonfig_init(void) efi_status_t ret = EFI_SUCCESS; static bool init; struct efi_handler *handler; + unsigned long columns, rows; if (!init) { ret = efi_search_protocol(efi_root, &efi_guid_text_input_protocol, &handler); @@ -2600,6 +2634,23 @@ static efi_status_t eficonfig_init(void) EFI_OPEN_PROTOCOL_GET_PROTOCOL); if (ret != EFI_SUCCESS) return ret; + ret = efi_search_protocol(efi_root, &efi_guid_text_output_protocol, &handler); + if (ret != EFI_SUCCESS) + return ret; + + ret = efi_protocol_open(handler, (void **)&cout, efi_root, NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL); + if (ret != EFI_SUCCESS) + return ret; + + cout->query_mode(cout, cout->mode->mode, &columns, &rows); + avail_row = rows - (EFICONFIG_MENU_HEADER_ROW_NUM + + EFICONFIG_MENU_DESC_ROW_NUM); + if (avail_row <= 0) { + eficonfig_print_msg("Console size is too small!"); + return EFI_INVALID_PARAMETER; + } + /* TODO: Should we check the minimum column size? */ } init = true; diff --git a/include/efi_config.h b/include/efi_config.h index cec5715f84..6a104e4b1d 100644 --- a/include/efi_config.h +++ b/include/efi_config.h @@ -49,6 +49,8 @@ struct eficonfig_entry { * @menu_header: menu header string * @menu_desc: menu description string * @list: menu entry list structure + * @start: top menu index to draw + * @end: bottom menu index to draw */ struct efimenu { int delay; @@ -57,6 +59,8 @@ struct efimenu { char *menu_header; const char *menu_desc; struct list_head list; + int start; + int end; }; /** diff --git a/include/efi_loader.h b/include/efi_loader.h index f9e427f090..4560b0d04c 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -328,6 +328,7 @@ extern const efi_guid_t efi_esrt_guid; extern const efi_guid_t smbios_guid; /*GUID of console */ extern const efi_guid_t efi_guid_text_input_protocol; +extern const efi_guid_t efi_guid_text_output_protocol; extern char __efi_runtime_start[], __efi_runtime_stop[]; extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[];