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 7FA4F1387C2 for ; Fri, 1 Feb 2013 10:50:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 242E521C05A; Fri, 1 Feb 2013 10:50:05 +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 A102B21C05A for ; Fri, 1 Feb 2013 10:49:59 +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 71A7D33DCBE for ; Fri, 1 Feb 2013 10:49:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 70E07E4089 for ; Fri, 1 Feb 2013 10:49:50 +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: <1359715188.e4bd16c64a35ed62e23388201c9e03edbcd4e1df.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: ufed-curses-checklist.c ufed-curses.c X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: e4bd16c64a35ed62e23388201c9e03edbcd4e1df X-VCS-Branch: master Date: Fri, 1 Feb 2013 10:49:50 +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: 54625d69-ff92-4c3b-98b7-9a61dc81a572 X-Archives-Hash: b698927d34a3d27003d0207bcb0703b5 commit: e4bd16c64a35ed62e23388201c9e03edbcd4e1df Author: Sven Eden gmx de> AuthorDate: Fri Feb 1 10:39:48 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Fri Feb 1 10:39:48 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=e4bd16c6 Reorganized filter toggling finally enabling local/global and installed/not-installed filter. The toggle no longer leads to a list reset, the display stays where it is. --- ufed-curses-checklist.c | 6 ++-- ufed-curses.c | 48 +++++++++++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c index 5950796..d9f3067 100644 --- a/ufed-curses-checklist.c +++ b/ufed-curses-checklist.c @@ -26,9 +26,9 @@ static const sKey keys[] = { { '\033', mkKey("Cancel (Esc)") }, { -1, mkKey("Display (") }, { KEY_F(5), mkKey("Mask (F5)") }, - { KEY_F(6), mkKey("Order (F6)") }, -// { KEY_F(7), mkKey("Local/Global (F7)") }, -// { KEY_F(8), mkKey("Installed (F8)") }, + { KEY_F(6), mkKey("Local/Global (F7)") }, + { KEY_F(7), mkKey("Installed (F8)") }, + { KEY_F(8), mkKey("Order (F6)") }, { -1, mkKey(")") }, { '\0', mkKey("") } }; diff --git a/ufed-curses.c b/ufed-curses.c index 2808055..d14cd38 100644 --- a/ufed-curses.c +++ b/ufed-curses.c @@ -703,28 +703,48 @@ int maineventloop( if (eMask_masked == e_mask) e_mask = eMask_unmasked; else if (eMask_unmasked == e_mask) e_mask = eMask_both; else e_mask = eMask_masked; - resetDisplay(withSep); + + if ( !isFlagLegal(currentflag) + && !setNextItem(1, true) + && !setPrevItem(1, true) ) + resetDisplay(withSep); + else + draw(withSep); + break; case KEY_F(6): + if (eScope_local == e_scope) e_scope = eScope_all; + else if (eScope_global == e_scope) e_scope = eScope_local; + else e_scope = eScope_global; + + if ( !isFlagLegal(currentflag) + && !setNextItem(1, true) + && !setPrevItem(1, true) ) + resetDisplay(withSep); + else + draw(withSep); + break; + + case KEY_F(7): + if (eState_installed == e_state) e_state = eState_notinstalled; + else if (eState_notinstalled == e_state) e_state = eState_all; + else e_state = eState_installed; + + if ( !isFlagLegal(currentflag) + && !setNextItem(1, true) + && !setPrevItem(1, true) ) + resetDisplay(withSep); + else + draw(withSep); + break; + + case KEY_F(8): if (eOrder_left == e_order) e_order = eOrder_right; else e_order = eOrder_left; drawFlags(); break; -// case KEY_F(7): -// if (eScope_local == e_scope) e_scope = eScope_all; -// else if (eScope_global == e_scope) e_scope = eScope_local; -// else if (eScope_all == e_scope) e_scope = eScope_global; -// resetDisplay(); -// break; -// -// case KEY_F(8): -// if (eState_installed == e_state) e_state = eState_notinstalled; -// else if (eState_notinstalled == e_state) e_state = eState_all; -// else if (eState_all == e_state) e_state = eState_installed; -// resetDisplay(); -// break; #ifdef KEY_RESIZE case KEY_RESIZE: