From b8966ec4ee3c9d035850ff49aaf5485081fe0d20 Mon Sep 17 00:00:00 2001 From: Jaakko Heinonen Date: Tue, 29 Jan 2002 11:58:13 +0000 Subject: [PATCH] fixes --- ChangeLog | 1 + estr.c | 11 ++++++----- list.c | 8 ++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 779e241..d1e5cc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 0.4.16-cvs - use strcoll instead of strcmp for sorting entries + - html filter fix - bugfixes 0.4.15 diff --git a/estr.c b/estr.c index 1939af0..93c2290 100644 --- a/estr.c +++ b/estr.c @@ -81,13 +81,13 @@ wenter_string(WINDOW *win, const int maxlen, const int flags) str = MALLOC(size); for( ;; ) { /* main loop */ - if(flags & ESTR_DONT_WRAP && x+i>COLS-2) { + if(flags & ESTR_DONT_WRAP && x+i > COLS-2) { mvwaddnstr(win, y, x, str+(1+x+i-COLS), COLS-x-1); wmove(win, y, COLS-1); - wclrtoeol(win); } else wmove(win, y, x + i); + wclrtoeol(win); wrefresh(win); switch( (ch = getch()) ) { @@ -103,6 +103,9 @@ wenter_string(WINDOW *win, const int maxlen, const int flags) case CANCEL_KEY: free(str); return NULL; + case XCTRL('u'): + i = 0; + break; #ifdef USE_FILESEL case TAB_KEY: if( ! (flags & ESTR_USE_FILESEL) ) @@ -118,10 +121,8 @@ wenter_string(WINDOW *win, const int maxlen, const int flags) continue; str[i++] = ch; waddch(win,ch); - if( i + 1 > size ) + if( i + 1 >= size ) str = REALLOC( str, size *= 2 ); - if( maxlen > 0 && i > maxlen) - break; } out: if( i >= 0 && str != NULL ) diff --git a/list.c b/list.c index 67c7c3d..5bb6753 100644 --- a/list.c +++ b/list.c @@ -283,8 +283,12 @@ void highlight_line(WINDOW *win, int line) { wstandout(win); - -#ifdef mvwchgat + + /* + * this is a tricky one + */ +#if 0 +/*#ifdef mvwchgat*/ mvwchgat(win, line, 0, -1, A_STANDOUT, 0, NULL); #else /* -- 2.39.2