X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=53609b5b9c3184ad0c7b6dd95ce7c0fd8afce792;hb=8e39affbf1cd8a2a5ff5c9991650d54fdcea4997;hp=125e5ca07d400910353918d43b840b410b69d187;hpb=fdb93a08e305b8755260144807e4d45106a9cb9f;p=apps%2Fmadmutt.git diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index 125e5ca..53609b5 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -11,30 +11,17 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_LANGINFO_YESEXPR -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#elif defined(HAVE_IOCTL_H) +# include #endif +#include -#include -#include -#include -#include - +#include #include #include @@ -56,29 +43,23 @@ static event_t *KeyEvent; void mutt_refresh (void) { - /* don't refresh when we are waiting for a child. */ - if (option (OPTKEEPQUIET)) - return; + /* don't refresh when we are waiting for a child. */ + if (option (OPTKEEPQUIET)) + return; - /* don't refresh in the middle of macros unless necessary */ - if (UngetCount && !option (OPTFORCEREFRESH)) - return; + /* don't refresh in the middle of macros unless necessary */ + if (UngetCount && !option (OPTFORCEREFRESH)) + return; - /* else */ - refresh (); + /* else */ + wrefresh (stdscr); } -/* Make sure that the next refresh does a full refresh. This could be - optmized by not doing it at all if DISPLAY is set as this might - indicate that a GUI based pinentry was used. Having an option to - customize this is of course the Mutt way. */ void mutt_need_hard_redraw (void) { - if (!getenv ("DISPLAY")) { keypad (stdscr, TRUE); clearok (stdscr, TRUE); set_option (OPTNEEDREDRAW); - } } event_t mutt_getch (void) @@ -92,7 +73,7 @@ event_t mutt_getch (void) SigInt = 0; mutt_allow_interrupt (1); - ch = getch (); + ch = wgetch (stdscr); mutt_allow_interrupt (0); if (SigInt) @@ -101,15 +82,6 @@ event_t mutt_getch (void) if (ch == ERR) return err; - if ((ch & 0x80) && option (OPTMETAKEY)) { - /* send ALT-x as ESC-x */ - ch &= ~0x80; - mutt_ungetch (ch, 0); - ret.ch = '\033'; - ret.op = 0; - return ret; - } - ret.ch = ch; ret.op = 0; return (ch == ctrl ('G') ? err : ret); @@ -125,14 +97,12 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen, do { CLEARLINE (LINES - 1); - addstr (field); + waddstr (stdscr, field); mutt_refresh (); getyx (stdscr, y, x); - ret = - _mutt_enter_string (buf, buflen, y, x, complete, multiple, files, - numfiles, es); - } - while (ret == 1); + ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files, + numfiles, es); + } while (ret == 1); CLEARLINE (LINES - 1); mutt_free_enter_state (&es); @@ -157,12 +127,12 @@ void mutt_clear_error (void) CLEARLINE (LINES - 1); } -void mutt_edit_file (const char *editor, const char *data) +void mutt_edit_file(const char *data) { char cmd[LONG_STRING]; mutt_endwin (NULL); - mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data); + m_quotefile_fmt(cmd, sizeof (cmd), mod_core.editor, data); if (mutt_system (cmd) == -1) mutt_error (_("Error running \"%s\"!"), cmd); keypad (stdscr, TRUE); @@ -172,12 +142,10 @@ void mutt_edit_file (const char *editor, const char *data) int mutt_yesorno (const char *msg, int def) { event_t ch; - char *yes = _("yes"); - char *no = _("no"); + const char *yes = _("yes"); + const char *no = _("no"); char *answer_string; ssize_t answer_string_len; - -#ifdef HAVE_LANGINFO_YESEXPR char *expr; regex_t reyes; regex_t reno; @@ -191,7 +159,6 @@ int mutt_yesorno (const char *msg, int def) !regcomp (&reyes, expr, REG_NOSUB | REG_EXTENDED); reno_ok = (expr = nl_langinfo (NOEXPR)) && expr[0] == '^' && !regcomp (&reno, expr, REG_NOSUB | REG_EXTENDED); -#endif CLEARLINE (LINES - 1); @@ -205,7 +172,7 @@ int mutt_yesorno (const char *msg, int def) snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no, def == M_YES ? no : yes); answer_string_len = m_strlen(answer_string); - printw ("%.*s%s", COLS - answer_string_len, msg, answer_string); + wprintw (stdscr, "%.*s%s", COLS - answer_string_len, msg, answer_string); p_delete(&answer_string); for (;;) { @@ -218,20 +185,14 @@ int mutt_yesorno (const char *msg, int def) break; } -#ifdef HAVE_LANGINFO_YESEXPR answer[0] = ch.ch; if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes) -#else - if (tolower (ch.ch) == *yes) -#endif { def = M_YES; break; } else if ( -#ifdef HAVE_LANGINFO_YESEXPR reno_ok ? (regexec (&reno, answer, 0, 0, 0) == 0) : -#endif (tolower (ch.ch) == *no)) { def = M_NO; break; @@ -240,15 +201,13 @@ int mutt_yesorno (const char *msg, int def) } } -#ifdef HAVE_LANGINFO_YESEXPR if (reyes_ok) regfree (&reyes); if (reno_ok) regfree (&reno); -#endif if (def != -1) { - addstr ((char *) (def == M_YES ? yes : no)); + waddstr (stdscr, (char *) (def == M_YES ? yes : no)); mutt_refresh (); } return (def); @@ -260,7 +219,7 @@ void mutt_query_exit (void) mutt_flushinp (); curs_set (1); if (Timeout) - timeout (-1); /* restore blocking operation */ + wtimeout (stdscr, -1); /* restore blocking operation */ if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) { mutt_endwin (NULL); exit (1); @@ -286,8 +245,8 @@ void mutt_curses_error (const char *fmt, ...) if (!option (OPTKEEPQUIET)) { BEEP (); SETCOLOR (MT_COLOR_ERROR); - mvaddstr (LINES - 1, 0, Errorbuf); - clrtoeol (); + mvwaddstr (stdscr, LINES - 1, 0, Errorbuf); + wclrtoeol (stdscr); SETCOLOR (MT_COLOR_NORMAL); mutt_refresh (); } @@ -296,7 +255,7 @@ void mutt_curses_error (const char *fmt, ...) } void mutt_progress_bar (progress_t* progress, long pos) { - char posstr[SHORT_STRING]; + char posstr[STRING]; if (!pos) { if (!NetInc) @@ -338,8 +297,8 @@ void mutt_curses_message (const char *fmt, ...) if (!option (OPTKEEPQUIET)) { SETCOLOR (MT_COLOR_MESSAGE); - mvaddstr (LINES - 1, 0, Errorbuf); - clrtoeol (); + mvwaddstr (stdscr, LINES - 1, 0, Errorbuf); + wclrtoeol (stdscr); SETCOLOR (MT_COLOR_NORMAL); mutt_refresh (); } @@ -354,7 +313,7 @@ void mutt_show_error (void) SETCOLOR (option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE); CLEARLINE (LINES - 1); - addstr (Errorbuf); + waddstr (stdscr, Errorbuf); SETCOLOR (MT_COLOR_NORMAL); } @@ -363,7 +322,7 @@ void mutt_endwin (const char *msg) if (!option (OPTNOCURSES)) { CLEARLINE (LINES - 1); - attrset (A_NORMAL); + wattrset (stdscr, A_NORMAL); mutt_refresh (); endwin (); } @@ -408,41 +367,17 @@ int mutt_any_key_to_continue (const char *s) return (ch); } -int mutt_do_pager (const char *banner, - const char *tempfile, int do_color, pager_t * info) -{ - int rc; - - if (!Pager || m_strcmp(Pager, "builtin") == 0) - rc = mutt_pager (banner, tempfile, do_color, info); - else { - char cmd[STRING]; - - mutt_endwin (NULL); - mutt_expand_file_fmt (cmd, sizeof (cmd), Pager, tempfile); - if (mutt_system (cmd) == -1) { - mutt_error (_("Error running \"%s\"!"), cmd); - rc = -1; - } - else - rc = 0; - mutt_unlink (tempfile); - } - - return rc; -} - int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen, int *redraw, int buffy, int multiple, char ***files, int *numfiles) { event_t ch; - mvaddstr (LINES - 1, 0, (char *) prompt); - addstr (_(" ('?' for list): ")); + mvwaddstr (stdscr, LINES - 1, 0, (char *) prompt); + waddstr (stdscr, _(" ('?' for list): ")); if (buf[0]) - addstr (buf); - clrtoeol (); + waddstr (stdscr, buf); + wclrtoeol (stdscr); mutt_refresh (); ch = mutt_getch (); @@ -453,14 +388,14 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen, else if (ch.ch == '?') { mutt_refresh (); buf[0] = 0; - _mutt_select_file (buf, blen, M_SEL_FOLDER | (multiple ? M_SEL_MULTI : 0), - files, numfiles); + mutt_select_file (buf, blen, M_SEL_FOLDER | (multiple ? M_SEL_MULTI : 0), + files, numfiles); *redraw = REDRAW_FULL; } else { char *pc = p_new(char, m_strlen(prompt) + 3); - sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */ + sprintf(pc, "%s: ", prompt); mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0); if (_mutt_get_field (pc, buf, blen, (buffy ? M_EFILE : M_FILE) | M_CLEAR, multiple, files, @@ -493,7 +428,6 @@ void mutt_flushinp (void) flushinp (); } -#if (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET)) /* The argument can take 3 values: * -1: restore the value of the last call * 0: make the cursor invisible @@ -513,16 +447,15 @@ void mutt_curs_set (int cursor) curs_set (2); /* cvvis */ } } -#endif -int mutt_multi_choice (char *prompt, char *letters) +int mutt_multi_choice (const char *prompt, const char *letters) { event_t ch; int choice; char *p; - mvaddstr (LINES - 1, 0, prompt); - clrtoeol (); + mvwaddstr (stdscr, LINES - 1, 0, prompt); + wclrtoeol (stdscr); for (;;) { mutt_refresh (); ch = mutt_getch (); @@ -564,9 +497,27 @@ int mutt_addwch (wchar_t wc) (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1) return -1; /* ERR */ else - return addstr (buf); + return waddstr (stdscr, buf); } +ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n) +{ + if (n == 0) + return m_strcpy(s, len, "0K"); + + if (n < 10189) /* 0.1K - 9.9K */ + return snprintf(s, len, "%3.1fK", (n < 103) ? 0.1 : n / 1024.0); + + if (n < 1023949) /* 10K - 999K */ + /* 51 is magic which causes 10189/10240 to be rounded up to 10 */ + return snprintf(s, len, "%ldK", (n + 51) / 1024); + + if (n < 10433332) /* 1.0M - 9.9M */ + return snprintf(s, len, "%3.1fM", n / 1048576.0); + + /* (10433332 + 52428) / 1048576 = 10 */ + return snprintf (s, len, "%ldM", (n + 52428) / 1048576); +} /* * This formats a string, a bit like @@ -599,7 +550,7 @@ void mutt_format_string (char *dest, ssize_t destlen, if (arboreal && wc < M_TREE_MAX) w = 1; /* hack */ else { - if (!IsWPrint (wc)) + if (!iswprint(wc)) wc = '?'; w = wcwidth (wc); } @@ -608,7 +559,7 @@ void mutt_format_string (char *dest, ssize_t destlen, break; min_width -= w; max_width -= w; - strncpy (p, scratch, k2); + m_strncpy(p, destlen, scratch, k2); p += k2; destlen -= k2; } @@ -674,7 +625,7 @@ void mutt_format_s_tree (char *dest, ssize_t destlen, /* * mutt_paddstr (n, s) is almost equivalent to - * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), addstr (bigbuf) + * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), waddstr (stdscr, bigbuf) */ void mutt_paddstr (int n, const char *s) @@ -691,46 +642,50 @@ void mutt_paddstr (int n, const char *s) k = (k == -1) ? 1 : len; wc = CharsetReplacement; } - if (!IsWPrint (wc)) + if (!iswprint(wc)) wc = '?'; w = wcwidth (wc); if (w >= 0) { if (w > n) break; - addnstr ((char *) s, k); + waddnstr (stdscr, (char *) s, k); n -= w; } } while (n-- > 0) - addch (' '); + waddch (stdscr, ' '); } -/* - * mutt_strwidth is like m_strlenexcept that it returns the width - * refering to the number of characters cells. - */ - -int mutt_strwidth (const char *s) +/* this routine should be called after receiving SIGWINCH */ +void mutt_resize_screen (void) { - wchar_t wc; - int w; - ssize_t k, n; - mbstate_t mbstate; - - if (!s) - return 0; - - n = m_strlen(s); - - p_clear(&mbstate, 1); - for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) { - if (k == -1 || k == -2) { - k = (k == -1) ? 1 : n; - wc = CharsetReplacement; + char *cp; + int fd; + struct winsize w; + + int rows, cols; + + rows = -1; + cols = -1; + if ((fd = open ("/dev/tty", O_RDONLY)) != -1) { + if (ioctl (fd, TIOCGWINSZ, &w) != -1) { + rows = w.ws_row; + cols = w.ws_col; } - if (!IsWPrint (wc)) - wc = '?'; - w += wcwidth (wc); + close (fd); + } + if (rows <= 0) { + if ((cp = getenv ("LINES")) != NULL) { + rows = atoi (cp); + } + else + rows = 24; + } + if (cols <= 0) { + if ((cp = getenv ("COLUMNS")) != NULL) + cols = atoi (cp); + else + cols = 80; } - return w; + resizeterm (rows, cols); }