| 1 |
commit: d9051ae17b0d522a4f8ffd203a2b0e7a65b88d88 |
| 2 |
Author: Sven Eden <sven.eden <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Mon Mar 4 17:58:00 2013 +0000 |
| 4 |
Commit: Sven Eden <sven.eden <AT> gmx <DOT> de> |
| 5 |
CommitDate: Mon Mar 4 17:58:00 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=d9051ae1 |
| 7 |
|
| 8 |
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. |
| 9 |
|
| 10 |
--- |
| 11 |
ufed-curses-globals.c | 15 ++++++++------- |
| 12 |
ufed-curses.c | 22 +++++++++++++--------- |
| 13 |
2 files changed, 21 insertions(+), 16 deletions(-) |
| 14 |
|
| 15 |
diff --git a/ufed-curses-globals.c b/ufed-curses-globals.c |
| 16 |
index dc9a38a..ad9b66d 100644 |
| 17 |
--- a/ufed-curses-globals.c |
| 18 |
+++ b/ufed-curses-globals.c |
| 19 |
@@ -16,12 +16,13 @@ eScope e_scope = eScope_all; |
| 20 |
eState e_state = eState_all; |
| 21 |
char* fayt = NULL; |
| 22 |
sListStats listStats = { 0, 0, 0, 0, 0, 0 }; |
| 23 |
+// windows: top, left, height width |
| 24 |
sWindow window[wCount] = { |
| 25 |
- { NULL, 0, 0, 5, 0 }, /* Top --- Top ---- */ |
| 26 |
- { NULL, 5, 0, -8, 3 }, /* Left L+------+S|R */ |
| 27 |
- { NULL, 5, 3, -9, -6 }, /* List E| |c|i */ |
| 28 |
- { NULL, -4, 3, 1, -6 }, /* Input F| List |r|g */ |
| 29 |
- { NULL, 5, -3, -8, 1 }, /* Scrollbar T|______|B|h */ |
| 30 |
- { NULL, 5, -2, -8, 2 }, /* Right |+Input-+r|t */ |
| 31 |
- { NULL, -3, 0, 3, 0 }, /* Bottom ---Bottom--- */ |
| 32 |
+ { NULL, 0, 0, 4, 0 }, /* Top --- Top ---- */ |
| 33 |
+ { NULL, 4, 0, -8, 3 }, /* Left L+------+S|R */ |
| 34 |
+ { NULL, 4, 3, -9, -6 }, /* List E| |c|i */ |
| 35 |
+ { NULL, -5, 3, 1, -6 }, /* Input F| List |r|g */ |
| 36 |
+ { NULL, 4, -3, -8, 1 }, /* Scrollbar T|______|B|h */ |
| 37 |
+ { NULL, 4, -2, -8, 2 }, /* Right |+Input-+r|t */ |
| 38 |
+ { NULL, -4, 0, 4, 0 }, /* Bottom ---Bottom--- */ |
| 39 |
}; |
| 40 |
|
| 41 |
diff --git a/ufed-curses.c b/ufed-curses.c |
| 42 |
index fc262c8..cf97d0c 100644 |
| 43 |
--- a/ufed-curses.c |
| 44 |
+++ b/ufed-curses.c |
| 45 |
@@ -133,9 +133,12 @@ void drawBottom(bool withSep) |
| 46 |
waddch (w, ACS_VLINE); // Left vline on line 1 |
| 47 |
whline (w, ' ', bWidth - 2); // Blank line (filled with keys later) |
| 48 |
mvwaddch(w, 1, bWidth - 1, ACS_VLINE); // Right vline on line 1 |
| 49 |
- mvwaddch(w, 2, 0, ACS_LLCORNER); // lower left corner on line 2 |
| 50 |
+ waddch (w, ACS_VLINE); // Left vline on line 2 |
| 51 |
+ whline (w, ' ', bWidth - 2); // Blank line (filled with keys later) |
| 52 |
+ mvwaddch(w, 2, bWidth - 1, ACS_VLINE); // Right vline on line 2 |
| 53 |
+ mvwaddch(w, 3, 0, ACS_LLCORNER); // lower left corner on line 3 |
| 54 |
whline (w, ACS_HLINE, bWidth - 2); // bottom line |
| 55 |
- mvwaddch(w, 2, bWidth - 1, ACS_LRCORNER); // lower right corner on line 2 |
| 56 |
+ mvwaddch(w, 3, bWidth - 1, ACS_LRCORNER); // lower right corner on line 3 |
| 57 |
|
| 58 |
if (keys) { |
| 59 |
const sKey* key = keys; |
| 60 |
@@ -330,12 +333,13 @@ void drawTop(bool withSep) |
| 61 |
sprintf(buf, "%-*.*s", wWidth(Top), wWidth(Top), "Gentoo USE flags editor " PACKAGE_VERSION); |
| 62 |
mvwaddstr(w, 0, 0, buf); |
| 63 |
|
| 64 |
- whline(w, ACS_HLINE, wWidth(Top)); |
| 65 |
+ /// REMOVEME: Stop wasting space |
| 66 |
+ //whline(w, ACS_HLINE, wWidth(Top)); |
| 67 |
|
| 68 |
wattrset(w, COLOR_PAIR(2) | A_BOLD); |
| 69 |
- mvwaddch(w, 2, 0, ACS_ULCORNER); |
| 70 |
+ mvwaddch(w, 1, 0, ACS_ULCORNER); |
| 71 |
whline(w, ACS_HLINE, wWidth(Top)-2); |
| 72 |
- mvwaddch(w, 2, wWidth(Top)-1, ACS_URCORNER); |
| 73 |
+ mvwaddch(w, 1, wWidth(Top)-1, ACS_URCORNER); |
| 74 |
|
| 75 |
waddch(w, ACS_VLINE); |
| 76 |
wattrset(w, COLOR_PAIR(3)); |
| 77 |
@@ -354,11 +358,11 @@ void drawTop(bool withSep) |
| 78 |
waddch(w, ACS_ULCORNER); |
| 79 |
whline(w, ACS_HLINE, wWidth(Top)-6); |
| 80 |
if (withSep) { |
| 81 |
- mvwaddch(w, 4, minwidth + 3, ACS_TTEE); // Before state |
| 82 |
- mvwaddch(w, 4, minwidth + 7, ACS_TTEE); // Between state and scope |
| 83 |
- mvwaddch(w, 4, minwidth + 10, ACS_TTEE); // After scope |
| 84 |
+ mvwaddch(w, 3, minwidth + 3, ACS_TTEE); // Before state |
| 85 |
+ mvwaddch(w, 3, minwidth + 7, ACS_TTEE); // Between state and scope |
| 86 |
+ mvwaddch(w, 3, minwidth + 10, ACS_TTEE); // After scope |
| 87 |
} |
| 88 |
- mvwaddch(w, 4, wWidth(Top)-3, ACS_URCORNER); |
| 89 |
+ mvwaddch(w, 3, wWidth(Top)-3, ACS_URCORNER); |
| 90 |
waddch(w, ' '); |
| 91 |
wattrset(w, COLOR_PAIR(2) | A_BOLD); |
| 92 |
waddch(w, ACS_VLINE); |
Archives