diff options
| author |   Sven Eden <yamakuzure@gmx.net> | 2013-09-18 22:03:56 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2013-09-18 22:03:56 +0200 |
| commit | 4b9ab8907b572bed58978b92c142d20c230ed3e2 (patch) | |
| tree | 8e3a052edf3b503f800cc8725143598c9c9c0893 | |
| parent | findFlagStart() Fixed another potential endless loop (diff) | |
| download | ufed-4b9ab8907b572bed58978b92c142d20c230ed3e2.tar.gz ufed-4b9ab8907b572bed58978b92c142d20c230ed3e2.tar.bz2 ufed-4b9ab8907b572bed58978b92c142d20c230ed3e2.zip | |
Enabled F11 key to toggle line wrapping and fixed a possible segfault.
| -rw-r--r-- | ufed-curses-checklist.c | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c index 8a3e9e1..c1c39e6 100644 --- a/ufed-curses-checklist.c +++ b/ufed-curses-checklist.c @@ -200,8 +200,10 @@ static int drawflag(sFlag* flag, bool highlight) bool wrapFirst = true; // The first part, pkg or desc // Get the starting description/wrapped line of the flag - if ((line < 0) - && (0 == (usedY = findFlagStart(flag, &idx, &wrapPart, &line, &wrapFirst))) ) + usedY = findFlagStart(flag, &idx, &wrapPart, &line, &wrapFirst); + + // findFlagStart returns -1 if the flag is out of the screen + if (0 > usedY) return 0; // Window values (aka shortcuts) @@ -448,17 +450,21 @@ static int callback(sFlag** curr, int key) drawFlags(); break; case KEY_LEFT: - if(descriptionleft > 0) - descriptionleft -= min(descriptionleft, (wWidth(List) - minwidth) * 2 / 3); - drawflag(*curr, TRUE); - wmove(wLst, (*curr)->currline, 2); - wrefresh(wLst); + if (eWrap_normal == e_wrap) { + if(descriptionleft > 0) + descriptionleft -= min(descriptionleft, (wWidth(List) - minwidth) * 2 / 3); + drawflag(*curr, TRUE); + wmove(wLst, (*curr)->currline, 2); + wrefresh(wLst); + } break; case KEY_RIGHT: - descriptionleft += (wWidth(List) - minwidth) * 2 / 3; - drawflag(*curr, TRUE); - wmove(wLst, (*curr)->currline, 2); - wrefresh(wLst); + if (eWrap_normal == e_wrap) { + descriptionleft += (wWidth(List) - minwidth) * 2 / 3; + drawflag(*curr, TRUE); + wmove(wLst, (*curr)->currline, 2); + wrefresh(wLst); + } break; case KEY_F(5): @@ -523,6 +529,15 @@ static int callback(sFlag** curr, int key) draw(true); break; + case KEY_F(11): + if (eWrap_normal == e_wrap) { + e_wrap = eWrap_wrap; + descriptionleft = 0; + } else + e_wrap = eWrap_normal; + draw(true); + break; + #ifdef NCURSES_MOUSE_VERSION case KEY_MOUSE: // Masked flags can be turned off, nothing else @@ -624,8 +639,13 @@ static int findFlagStart(sFlag* flag, int* index, sWrap** wrap, int* line, bool* int flagHeight = getFlagHeight(flag); // Will recalculate wrap parts if needed sWrap* wrapPart = NULL; - if ( (*line < 0) && (-(*line) < flagHeight) ){ + if (*line < 0) { + + // Only do anything if the flag can reach the screen: + if (-(*line) >= flagHeight) + return -1; + // Now loop until the screen is entered (line == 0) while (*line < 0) { if (isDescLegal(flag, *index)) { if (eWrap_normal == e_wrap) { |