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

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

commit:     f6dac0f1edf81203fa1e226fa7c4f5ca5e70f544
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Sun Jan 20 11:12:18 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Sun Jan 20 11:12:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=f6dac0f1

Changed mask toggle key from Tab to F5. Added F6 key to toggle packag list display order (left or right of the description)

---
 ufed-curses-checklist.c |   26 +++++++++++++++++---------
 ufed-curses.c           |    9 ++++++++-
 ufed-curses.h           |    3 ++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index 89d8a4a..b0b8ff1 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -33,11 +33,14 @@ static char *lineBuf = NULL;
 
 #define mkKey(x) x, sizeof(x)-1
 static const struct key keys[] = {
-	{ '?',    mkKey("Help (?)")            },
-	{ '\n',   mkKey("Save (Return/Enter)") },
-	{ '\033', mkKey("Cancel (Esc)")        },
-	{ '\t',   mkKey("Toggle Masked (Tab)") },
-	{ '\0',   mkKey("")                    }
+	{ '?',      mkKey("Help (?)")            },
+	{ '\n',     mkKey("Save (Return/Enter)") },
+	{ '\033',   mkKey("Cancel (Esc)")        },
+	{ KEY_F(5), mkKey("Toggle (F5: Mask")    },
+	{ KEY_F(6), mkKey("F6: Pkg")             },
+//	{ KEY_F(7), mkKey("F7: Local")           },
+//	{ KEY_F(8), mkKey("F8: Installed)")      },
+	{ '\0',     mkKey("")                    }
 };
 #undef mkKey
 
@@ -47,8 +50,9 @@ static void free_flags(void);
 
 
 /* external members */
-enum mask showMasked = show_unmasked; //!< Set whether to show masked, unmasked or both flags
-int firstNormalY = -1; //!< y of first not masked flag
+enum mask  showMasked = show_unmasked; //!< Set whether to show masked, unmasked or both flags
+enum order pkgOrder   = pkgs_left;     //!< Set whether to display package lists left or right of the description
+int firstNormalY      = -1;            //!< y of first not masked flag
 
 
 /* static functions */
@@ -326,8 +330,12 @@ static void drawflag(struct item *item, bool highlight) {
 
 			// Assemble description line:
 			memset(desc, 0, maxDescWidth * sizeof(char));
-			if (flag->pkgs[idx])
-				sprintf(desc, "(%s) %s", flag->pkgs[idx], flag->descr[idx]);
+			if (flag->pkgs[idx]) {
+				if (pkgs_left == pkgOrder)
+					sprintf(desc, "(%s) %s", flag->pkgs[idx], flag->descr[idx]);
+				else
+					sprintf(desc, "%s (%s)", flag->descr[idx], flag->pkgs[idx]);
+			}
 			else
 				sprintf(desc, "%s", flag->descr[idx]);
 

diff --git a/ufed-curses.c b/ufed-curses.c
index e885d75..63797e9 100644
--- a/ufed-curses.c
+++ b/ufed-curses.c
@@ -27,6 +27,7 @@ static struct item *items, *currentitem;
 /* external members */
 int topy, minwidth;
 extern enum mask showMasked;
+extern enum order pkgOrder;
 extern int firstNormalY;
 
 /* internal prototypes */
@@ -590,7 +591,7 @@ int maineventloop(
 					}
 					break;
 
-				case '\t':
+				case KEY_F(5):
 					if      (show_masked   == showMasked) showMasked = show_unmasked;
 					else if (show_both     == showMasked) showMasked = show_masked;
 					else if (show_unmasked == showMasked) showMasked = show_both;
@@ -599,6 +600,12 @@ int maineventloop(
 					draw();
 					break;
 
+				case KEY_F(6):
+					if (pkgs_left == pkgOrder) pkgOrder = pkgs_right;
+					else                       pkgOrder = pkgs_left;
+					draw();
+					break;
+
 				case KEY_BTAB:
 					if      (show_masked   == showMasked) showMasked = show_both;
 					else if (show_both     == showMasked) showMasked = show_unmasked;

diff --git a/ufed-curses.h b/ufed-curses.h
index bae8847..a608f33 100644
--- a/ufed-curses.h
+++ b/ufed-curses.h
@@ -29,6 +29,7 @@
 
 enum win { Top, Left, List, Input, Scrollbar, Right, Bottom, wCount };
 enum mask { show_unmasked, show_both, show_masked };
+enum order { pkgs_left, pkgs_right };
 
 struct window {
 	WINDOW *win;
@@ -43,7 +44,7 @@ struct item {
 };
 
 struct key {
-	char key;
+	int key;
 	const char *descr;
 	size_t length;
 };