From patchwork Fri May 17 12:42:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Gouders X-Patchwork-Id: 2582671 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 60546DF215 for ; Fri, 17 May 2013 12:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126Ab3EQMmM (ORCPT ); Fri, 17 May 2013 08:42:12 -0400 Received: from mx10.gouders.net ([89.244.147.155]:55639 "EHLO mx10.gouders.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753532Ab3EQMmM (ORCPT ); Fri, 17 May 2013 08:42:12 -0400 Received: from mx10.gouders.net (localhost [127.0.0.1]) by mx10.gouders.net (8.14.6/8.14.5) with ESMTP id r4HCg6LL007917; Fri, 17 May 2013 14:42:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gouders.net; s=gnet; t=1368794528; bh=nYE1Ffw91qKSeMEPfO/RmC32xweciLDQSlHiOFx0piI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F+NuyhualrufPg4eE0Wk+F1wQJNrhNuwURKNHUui8gkIB2edHKiNX1gDhsqDVMVtO crMpkUI8ZOYHeEas/5Mqg4q+S6OFBn/Jp63RvbiGMUvIdjyMraafEqWnDHKbuQjGRA mMpChsBjWTJMWwt5L69GJK857rHzVXTMuE3m3UNo= From: Dirk Gouders To: "Yann E. MORIN" Cc: linux-kbuild@vger.kernel.org Subject: [PATCH v2] mconf/nconf: mark empty menus/menuconfigs different from non-empty ones Date: Fri, 17 May 2013 14:42:06 +0200 Message-Id: <1368794526-7875-1-git-send-email-dirk@gouders.net> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368786492-23751-2-git-send-email-dirk@gouders.net> References: <1368786492-23751-2-git-send-email-dirk@gouders.net> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Submenus are sometimes empty and it would be nice if there is something that notifies us that we should not expect any content _before_ we enter a submenu. A new function menu_is_empty() was introduced and empty menus and menuconfigs are now marked by "----" as opposed to non-empty ones that are marked by "--->". This scheme was suggested by "Yann E. MORIN" . Signed-off-by: Dirk Gouders --- scripts/kconfig/lkc_proto.h | 1 + scripts/kconfig/mconf.c | 20 ++++++++++++++------ scripts/kconfig/menu.c | 16 ++++++++++++++++ scripts/kconfig/nconf.c | 30 ++++++++++++++++++++---------- 4 files changed, 51 insertions(+), 16 deletions(-) diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index ef1a738..ecdb965 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -14,6 +14,7 @@ P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); /* menu.c */ P(rootmenu,struct menu,); +P(menu_is_empty, bool, (struct menu *menu)); P(menu_is_visible, bool, (struct menu *menu)); P(menu_has_prompt, bool, (struct menu *menu)); P(menu_get_prompt,const char *,(struct menu *menu)); diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index ccb71ae..80b289c 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -48,7 +48,7 @@ static const char mconf_readme[] = N_( "----------\n" "o Use the Up/Down arrow keys (cursor keys) to highlight the item\n" " you wish to change or submenu wish to select and press .\n" -" Submenus are designated by \"--->\".\n" +" Submenus are designated by \"--->\", empty ones by \"----\".\n" "\n" " Shortcut: Press the option's highlighted letter (hotkey).\n" " Pressing a hotkey more than once will sequence\n" @@ -176,7 +176,7 @@ static const char mconf_readme[] = N_( "\n"), menu_instructions[] = N_( "Arrow keys navigate the menu. " - " selects submenus --->. " + " selects submenus ---> (or empty submenus ----). " "Highlighted letters are hotkeys. " "Pressing includes, excludes, modularizes features. " "Press to exit, for Help, for Search. " @@ -497,9 +497,14 @@ static void build_conf(struct menu *menu) item_make("%s%*c%s", menu->data ? "-->" : "++>", indent + 1, ' ', prompt); - } else - item_make(" %*c%s --->", indent + 1, ' ', prompt); - + } else { + if (menu_is_empty(menu)) + item_make(" %*c%s ----", + indent + 1, ' ', prompt); + else + item_make(" %*c%s --->", + indent + 1, ' ', prompt); + } item_set_tag('m'); item_set_data(menu); if (single_menu_mode && menu->data) @@ -630,7 +635,10 @@ static void build_conf(struct menu *menu) (sym_has_value(sym) || !sym_is_changable(sym)) ? "" : _(" (NEW)")); if (menu->prompt->type == P_MENU) { - item_add_str(" --->"); + if (menu_is_empty(menu)) + item_add_str(" ----"); + else + item_add_str(" --->"); return; } } diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index b5c7d90..6d11c8f 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -430,6 +430,22 @@ bool menu_has_prompt(struct menu *menu) return true; } +/* + * Determine if a menu is empty. + * A menu is considered empty if it contains no or only + * invisible entries. + */ +bool menu_is_empty(struct menu *menu) +{ + struct menu *child; + + for (child = menu->list; child; child = child->next) { + if (menu_is_visible(child)) + return(false); + } + return(true); +} + bool menu_is_visible(struct menu *menu) { struct menu *child; diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index dbf31ed..8b31180 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -45,8 +45,8 @@ static const char nconf_global_help[] = N_( " to remove it. You may press the key to cycle through the\n" "available options.\n" "\n" -"A trailing \"--->\" designates a submenu.\n" -"\n" +"A trailing \"--->\" designates a submenu, a trailing \"----\" an\n" +"empty submenu.\n" "\n" "Menu navigation keys\n" "----------------------------------------------------------------------\n" @@ -131,7 +131,7 @@ static const char nconf_global_help[] = N_( "\n"), menu_no_f_instructions[] = N_( "Legend: [*] built-in [ ] excluded module < > module capable.\n" -"Submenus are designated by a trailing \"--->\".\n" +"Submenus are designated by a trailing \"--->\", empty ones by \"----\".\n" "\n" "Use the following keys to navigate the menus:\n" "Move up or down with and .\n" @@ -148,7 +148,7 @@ menu_no_f_instructions[] = N_( "For help related to the current menu entry press or .\n"), menu_instructions[] = N_( "Legend: [*] built-in [ ] excluded module < > module capable.\n" -"Submenus are designated by a trailing \"--->\".\n" +"Submenus are designated by a trailing \"--->\", empty ones by \"----\".\n" "\n" "Use the following keys to navigate the menus:\n" "Move up or down with or .\n" @@ -757,11 +757,18 @@ static void build_conf(struct menu *menu) "%s%*c%s", menu->data ? "-->" : "++>", indent + 1, ' ', prompt); - } else - item_make(menu, 'm', - " %*c%s --->", - indent + 1, - ' ', prompt); + } else { + if (menu_is_empty(menu)) + item_make(menu, 'm', + " %*c%s ----", + indent + 1, + ' ', prompt); + else + item_make(menu, 'm', + " %*c%s --->", + indent + 1, + ' ', prompt); + } if (single_menu_mode && menu->data) goto conf_childs; @@ -903,7 +910,10 @@ static void build_conf(struct menu *menu) (sym_has_value(sym) || !sym_is_changable(sym)) ? "" : _(" (NEW)")); if (menu->prompt && menu->prompt->type == P_MENU) { - item_add_str(" --->"); + if (menu_is_empty(menu)) + item_add_str(" ----"); + else + item_add_str(" --->"); return; } }