[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     9c30fd54d7f7d47c85607a1955aa4ddb1a8b89c7
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Sun Feb  3 14:29:35 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Sun Feb  3 14:29:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=9c30fd54

Moved function key detection and handling to flags callback() function. It is no longer possible to toggle filters while reading the help screen now.

---
 ufed-curses-checklist.c |   53 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index ac6c60f..a58d60c 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -39,14 +39,6 @@ static const sKey keys[] = {
 static void free_flags(void);
 
 
-/* external members */
-eMask      e_mask    = eMask_unmasked;
-eOrder     e_order   = eOrder_left;
-eScope     e_scope   = eScope_all;
-eState     e_state   = eState_all;
-sListStats listStats = { 0, 0, 0, 0, 0, 0 };
-extern int bottomline, minwidth;
-
 /* static functions */
 static char *getline(FILE *fp)
 {
@@ -427,6 +419,51 @@ static int callback(sFlag** curr, int key)
 			wmove(wLst, (*curr)->currline, 2);
 			wrefresh(wLst);
 			break;
+		case KEY_F(5):
+			if      (eMask_masked   == e_mask) e_mask = eMask_unmasked;
+			else if (eMask_unmasked == e_mask) e_mask = eMask_both;
+			else                               e_mask = eMask_masked;
+
+			if ( !isFlagLegal(*curr)
+			  && !setNextItem(1, true)
+			  && !setPrevItem(1, true) )
+				resetDisplay(true);
+			else
+				draw(true);
+
+			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(*curr)
+			  && !setNextItem(1, true)
+			  && !setPrevItem(1, true) )
+				resetDisplay(true);
+			else
+				draw(true);
+			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(*curr)
+			  && !setNextItem(1, true)
+			  && !setPrevItem(1, true) )
+				resetDisplay(true);
+			else
+				draw(true);
+			break;
+
+		case KEY_F(8):
+			if (eOrder_left == e_order) e_order = eOrder_right;
+			else                        e_order = eOrder_left;
+			drawFlags();
+			break;
 #ifdef NCURSES_MOUSE_VERSION
 		case KEY_MOUSE:
 			// Masked flags can be turned off, nothing else