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

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

commit:     d9051ae17b0d522a4f8ffd203a2b0e7a65b88d88
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Mon Mar  4 17:58:00 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Mon Mar  4 17:58:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=d9051ae1

Removed one superfluous drawn line from the top, so the bottom can have one extra lines to display the new display and filter toggle keys.

---
 ufed-curses-globals.c |   15 ++++++++-------
 ufed-curses.c         |   22 +++++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ufed-curses-globals.c b/ufed-curses-globals.c
index dc9a38a..ad9b66d 100644
--- a/ufed-curses-globals.c
+++ b/ufed-curses-globals.c
@@ -16,12 +16,13 @@ eScope     e_scope        = eScope_all;
 eState     e_state        = eState_all;
 char*      fayt           = NULL;
 sListStats listStats      = { 0, 0, 0, 0, 0, 0 };
+// windows: top, left, height width
 sWindow    window[wCount] = {
-	{ NULL,  0,  0,  5,  0 }, /* Top       --- Top ---- */
-	{ NULL,  5,  0, -8,  3 }, /* Left      L+------+S|R */
-	{ NULL,  5,  3, -9, -6 }, /* List      E|      |c|i */
-	{ NULL, -4,  3,  1, -6 }, /* Input     F| List |r|g */
-	{ NULL,  5, -3, -8,  1 }, /* Scrollbar T|______|B|h */
-	{ NULL,  5, -2, -8,  2 }, /* Right     |+Input-+r|t */
-	{ NULL, -3,  0,  3,  0 }, /* Bottom    ---Bottom--- */
+	{ NULL,  0,  0,   4,  0 }, /* Top       --- Top ---- */
+	{ NULL,  4,  0,  -8,  3 }, /* Left      L+------+S|R */
+	{ NULL,  4,  3,  -9, -6 }, /* List      E|      |c|i */
+	{ NULL, -5,  3,   1, -6 }, /* Input     F| List |r|g */
+	{ NULL,  4, -3,  -8,  1 }, /* Scrollbar T|______|B|h */
+	{ NULL,  4, -2,  -8,  2 }, /* Right     |+Input-+r|t */
+	{ NULL, -4,  0,   4,  0 }, /* Bottom    ---Bottom--- */
 };

diff --git a/ufed-curses.c b/ufed-curses.c
index fc262c8..cf97d0c 100644
--- a/ufed-curses.c
+++ b/ufed-curses.c
@@ -133,9 +133,12 @@ void drawBottom(bool withSep)
 	waddch  (w, ACS_VLINE);                   // Left vline on line 1
 	whline  (w, ' ', bWidth - 2);             // Blank line (filled with keys later)
 	mvwaddch(w, 1, bWidth - 1, ACS_VLINE);    // Right vline on line 1
-	mvwaddch(w, 2, 0, ACS_LLCORNER);          // lower left corner on line 2
+	waddch  (w, ACS_VLINE);                   // Left vline on line 2
+	whline  (w, ' ', bWidth - 2);             // Blank line (filled with keys later)
+	mvwaddch(w, 2, bWidth - 1, ACS_VLINE);    // Right vline on line 2
+	mvwaddch(w, 3, 0, ACS_LLCORNER);          // lower left corner on line 3
 	whline  (w, ACS_HLINE, bWidth - 2);       // bottom line
-	mvwaddch(w, 2, bWidth - 1, ACS_LRCORNER); // lower right corner on line 2
+	mvwaddch(w, 3, bWidth - 1, ACS_LRCORNER); // lower right corner on line 3
 
 	if (keys) {
 		const sKey* key = keys;
@@ -330,12 +333,13 @@ void drawTop(bool withSep)
 	sprintf(buf, "%-*.*s", wWidth(Top), wWidth(Top), "Gentoo USE flags editor " PACKAGE_VERSION);
 	mvwaddstr(w, 0, 0, buf);
 
-	whline(w, ACS_HLINE, wWidth(Top));
+	/// REMOVEME: Stop wasting space
+	//whline(w, ACS_HLINE, wWidth(Top));
 
 	wattrset(w, COLOR_PAIR(2) | A_BOLD);
-	mvwaddch(w, 2, 0, ACS_ULCORNER);
+	mvwaddch(w, 1, 0, ACS_ULCORNER);
 	whline(w, ACS_HLINE, wWidth(Top)-2);
-	mvwaddch(w, 2, wWidth(Top)-1, ACS_URCORNER);
+	mvwaddch(w, 1, wWidth(Top)-1, ACS_URCORNER);
 
 	waddch(w, ACS_VLINE);
 	wattrset(w, COLOR_PAIR(3));
@@ -354,11 +358,11 @@ void drawTop(bool withSep)
 	waddch(w, ACS_ULCORNER);
 	whline(w, ACS_HLINE, wWidth(Top)-6);
 	if (withSep) {
-		mvwaddch(w, 4, minwidth + 3, ACS_TTEE); // Before state
-		mvwaddch(w, 4, minwidth + 7, ACS_TTEE); // Between state and scope
-		mvwaddch(w, 4, minwidth + 10, ACS_TTEE); // After scope
+		mvwaddch(w, 3, minwidth + 3, ACS_TTEE); // Before state
+		mvwaddch(w, 3, minwidth + 7, ACS_TTEE); // Between state and scope
+		mvwaddch(w, 3, minwidth + 10, ACS_TTEE); // After scope
 	}
-	mvwaddch(w, 4, wWidth(Top)-3, ACS_URCORNER);
+	mvwaddch(w, 3, wWidth(Top)-3, ACS_URCORNER);
 	waddch(w, ' ');
 	wattrset(w, COLOR_PAIR(2) | A_BOLD);
 	waddch(w, ACS_VLINE);