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

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

commit:     e4bd16c64a35ed62e23388201c9e03edbcd4e1df
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Fri Feb  1 10:39:48 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> 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: