From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CE206198005 for ; Tue, 5 Mar 2013 16:50:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 726E8E06BF; Tue, 5 Mar 2013 16:50:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1DEEE06B5 for ; Tue, 5 Mar 2013 16:50:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D180633DF2F for ; Tue, 5 Mar 2013 16:49:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 317ACE42C6 for ; Tue, 5 Mar 2013 16:49:58 +0000 (UTC) From: "Sven Eden" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Eden" Message-ID: <1362419910.489db58cb8a16b89650624a3a70b43eb008b8a4c.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: ufed-curses-checklist.c ufed-curses-help.c ufed-curses-types.h X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: 489db58cb8a16b89650624a3a70b43eb008b8a4c X-VCS-Branch: master Date: Tue, 5 Mar 2013 16:49:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b987b1f4-9f76-44af-a042-9ba66186be43 X-Archives-Hash: b743d4f717e82188ababd82bdcf61198 commit: 489db58cb8a16b89650624a3a70b43eb008b8a4c Author: Sven Eden gmx de> AuthorDate: Mon Mar 4 17:58:30 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Mon Mar 4 17:58:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=489db58c Added a new member "row" to the sKey struct to add information about in which row a key is to be displayed. --- ufed-curses-checklist.c | 18 +++++++++--------- ufed-curses-help.c | 8 ++++---- ufed-curses-types.h | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c index 7e0f018..2118c9c 100644 --- a/ufed-curses-checklist.c +++ b/ufed-curses-checklist.c @@ -20,15 +20,15 @@ static sFlag* flags = NULL; #define mkKey(x) x, sizeof(x)-1 static const sKey keys[] = { - { '?', mkKey("Help (?)") }, - { '\n', mkKey("Save (Enter)") }, - { '\033', mkKey("Cancel (Esc)") }, - { -1, mkKey("Toggle :") }, - { KEY_F(5), mkKey("Local/Global (F5)") }, - { KEY_F(6), mkKey("Installed (F6)") }, - { KEY_F(7), mkKey("Masked/Forced (F7)") }, - { KEY_F(9), mkKey("Pkg/Desc Order (F9)") }, - { '\0', mkKey("") } + { '?', mkKey("Help (?)"), 0 }, + { '\n', mkKey("Save (Enter)"), 0 }, + { '\033', mkKey("Cancel (Esc)"), 0 }, + { -1, mkKey("Toggle :"), 1 }, + { KEY_F(5), mkKey("Local/Global (F5)"), 1 }, + { KEY_F(6), mkKey("Installed (F6)"), 1 }, + { KEY_F(7), mkKey("Masked/Forced (F7)"), 1 }, + { KEY_F(9), mkKey("Pkg/Desc Order (F9)"), 1 }, + { '\0', mkKey(""), 0 } }; #undef mkKey diff --git a/ufed-curses-help.c b/ufed-curses-help.c index 572ccec..7a9115d 100644 --- a/ufed-curses-help.c +++ b/ufed-curses-help.c @@ -283,12 +283,12 @@ static void free_lines(void) } } -static const sKey keys[] = { #define key(x) x, sizeof(x)-1 - { '\033', key("Back (Esc)") }, - { '\0', key("") } -#undef key +static const sKey keys[] = { + { '\033', key("Back (Esc)"), 0 }, + { '\0', key(""), 0 } }; +#undef key static int drawline(sFlag* line, bool highlight) { diff --git a/ufed-curses-types.h b/ufed-curses-types.h index 7eb7991..af7deec 100644 --- a/ufed-curses-types.h +++ b/ufed-curses-types.h @@ -148,6 +148,7 @@ typedef struct sKey_ { int key; //!< curses key or -1 if no key shall be used const char *descr; //!< Help text to display size_t length; //!< length of the description + int row; //!< On which row this key is to be displayed, 0 or 1 } sKey;