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

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

commit:     7cd5b2871ee53ac2c9d1470f95fba7b537ded7c1
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Tue Feb 12 07:18:50 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Tue Feb 12 07:18:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=7cd5b287

Removed the warping of the beginning and end of the list. Further added the missing column separators on blank lines and move the cursor to the display end after drawing the flags.

---
 ufed-curses.c |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ufed-curses.c b/ufed-curses.c
index cd94da9..6d80c8f 100644
--- a/ufed-curses.c
+++ b/ufed-curses.c
@@ -165,7 +165,9 @@ void drawBottom(bool withSep)
 
 
 void drawFlags() {
-	int lHeight = wHeight(List);
+	WINDOW* wLst    = win(List);
+	int     lHeight = wHeight(List);
+	int     lWidth  = wWidth(List);
 
 	/* this method must not be called if the current
 	 * item is not valid.
@@ -220,18 +222,19 @@ void drawFlags() {
 			 * flag list, but not the end of the display.
 			 */
 			if(flag == flags) {
-				int lWidth = wWidth(List);
-				char buf[lWidth];
-				memset(buf, ' ', lWidth);
-				buf[lWidth] = '\0';
-				wmove(win(List), line, 0);
-				wattrset(win(List), COLOR_PAIR(3));
-				while(line++ < lHeight)
-					waddstr(win(List), buf);
+				wattrset(wLst, COLOR_PAIR(3));
+				while(line < lHeight) {
+					mvwhline(wLst, line, 0, ' ', lWidth);
+					mvwaddch(wLst, line, minwidth,     ACS_VLINE); // Before state
+					mvwaddch(wLst, line, minwidth + 4, ACS_VLINE); // Between state and scope
+					mvwaddch(wLst, line, minwidth + 7, ACS_VLINE); // After scope
+					++line;
+				}
 			}
 		} else
 			dispEnd = flag->listline + flag->ndesc;
 	}
+	wmove(wLst, lHeight - 1, lWidth - 1);
 	wnoutrefresh(win(List));
 }
 
@@ -779,7 +782,7 @@ bool setNextItem(int count, bool strict)
 		return false;
 	}
 
-	while (result && (skipped < count)) {
+	while (result && (skipped < count) && (curr->next != flags)) {
 		lastFlag = curr;
 		lastTop  = topline;
 		fHeight  = getFlagHeight(curr);
@@ -849,7 +852,7 @@ bool setPrevItem(int count, bool strict)
 		return false;
 	}
 
-	while (result && (skipped < count)) {
+	while (result && (skipped < count) && (curr != flags)) {
 		lastFlag = curr;
 		lastTop  = topline;
 		curr     = curr->prev;