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 B0D981381F3 for ; Wed, 11 Sep 2013 06:04:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 130FAE0C5E; Wed, 11 Sep 2013 06:04:13 +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 3D346E0C7C for ; Wed, 11 Sep 2013 06:04:12 +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 A35D433EC3B for ; Wed, 11 Sep 2013 06:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 590C9E546D for ; Wed, 11 Sep 2013 06:04:08 +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: <1378845788.34427f9210ac25157b70327d3aa8c478ec223a70.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: ufed-curses-help.c X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: 34427f9210ac25157b70327d3aa8c478ec223a70 X-VCS-Branch: master Date: Wed, 11 Sep 2013 06:04:08 +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: 252daab0-1cd4-47dd-a147-a4fae60a89f7 X-Archives-Hash: 4d1edc501ec75867f400ab94551e99e1 commit: 34427f9210ac25157b70327d3aa8c478ec223a70 Author: Sven Eden gmx net> AuthorDate: Tue Sep 10 20:43:08 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Tue Sep 10 20:43:08 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=34427f92 Changed the help page to support the new sKey layout --- ufed-curses-help.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ufed-curses-help.c b/ufed-curses-help.c index 8fce938..a7781c5 100644 --- a/ufed-curses-help.c +++ b/ufed-curses-help.c @@ -289,12 +289,6 @@ static void free_lines(void) } } -#define key(x) x, sizeof(x)-1 -static const sKey keys[] = { - { '\033', key("Back (Esc)"), 0 }, - { '\0', key(""), 0 } -}; -#undef key static int drawline(sFlag* line, bool highlight) { @@ -341,6 +335,11 @@ static int callback(sFlag** curr, int key) void help(void) { + sKey keys[] = { + MAKE_KEY('\033', "Esc", "Back", "", "", NULL, 0), + MAKE_KEY('\0', "", "", "", "", NULL, 0) + }; + if ( ((int)helpheight != wHeight(List)) || ((int)helpwidth != wWidth(List)) ) { if(lines!=NULL)