X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=c99a635734a1e47c94ff2e26ef05bcd3b189cff3;hp=e618301b377bfb89c108c0f9d797a14052394333;hb=0a19973a356fb85d0b1e2a2f02820a3e5071f402;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7;ds=sidebyside diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index e618301..c99a635 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -11,45 +11,30 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" +#include + +#include +#ifdef HAVE_LANGINFO_YESEXPR +#include #endif -#include -#include -#include -#include +#include +#include -#include -#include +#include "curses.h" +#include "menu.h" +#include "enter.h" #include "mutt.h" -#include "mutt_menu.h" #include "pager.h" -#include "mbyte.h" - -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_LANGINFO_YESEXPR -#include -#endif +#include "charset.h" /* not possible to unget more than one char under some curses libs, and it * is impossible to unget function keys in SLang, so roll our own input * buffering routines. */ -size_t UngetCount = 0; -static size_t UngetBufLen = 0; +ssize_t UngetCount = 0; +static ssize_t UngetBufLen = 0; static event_t *KeyEvent; void mutt_refresh (void) @@ -90,12 +75,7 @@ event_t mutt_getch (void) SigInt = 0; mutt_allow_interrupt (1); -#ifdef KEY_RESIZE - /* ncurses 4.2 sends this when the screen is resized */ - ch = KEY_RESIZE; - while (ch == KEY_RESIZE) -#endif /* KEY_RESIZE */ - ch = getch (); + ch = getch (); mutt_allow_interrupt (0); if (SigInt) @@ -118,7 +98,7 @@ event_t mutt_getch (void) return (ch == ctrl ('G') ? err : ret); } -int _mutt_get_field ( const char *field, char *buf, size_t buflen, +int _mutt_get_field ( const char *field, char *buf, ssize_t buflen, int complete, int multiple, char ***files, int *numfiles) { int ret; @@ -131,18 +111,16 @@ int _mutt_get_field ( const char *field, char *buf, size_t buflen, addstr (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); return (ret); } -int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags) +int mutt_get_field_unbuffered (char *msg, char *buf, ssize_t buflen, int flags) { int rc; @@ -165,7 +143,7 @@ void mutt_edit_file (const char *editor, 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), editor, data); if (mutt_system (cmd) == -1) mutt_error (_("Error running \"%s\"!"), cmd); keypad (stdscr, TRUE); @@ -178,7 +156,7 @@ int mutt_yesorno (const char *msg, int def) char *yes = _("yes"); char *no = _("no"); char *answer_string; - size_t answer_string_len; + ssize_t answer_string_len; #ifdef HAVE_LANGINFO_YESEXPR char *expr; @@ -223,11 +201,11 @@ int mutt_yesorno (const char *msg, int def) #ifdef HAVE_LANGINFO_YESEXPR answer[0] = ch.ch; - if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : + if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes) #else - if ( + if (tolower (ch.ch) == *yes) #endif - (tolower (ch.ch) == *yes)) { + { def = M_YES; break; } @@ -238,8 +216,7 @@ int mutt_yesorno (const char *msg, int def) (tolower (ch.ch) == *no)) { def = M_NO; break; - } - else { + } else { BEEP (); } } @@ -283,7 +260,6 @@ void mutt_curses_error (const char *fmt, ...) vsnprintf (Errorbuf, sizeof (Errorbuf), fmt, ap); va_end (ap); - debug_print (1, ("%s\n", Errorbuf)); mutt_format_string (TmpErrorbuf, sizeof (TmpErrorbuf), 0, COLS - 2, 0, 0, Errorbuf, sizeof (Errorbuf), 0); snprintf (Errorbuf, sizeof (Errorbuf), "%s", TmpErrorbuf); /* overkill */ @@ -301,7 +277,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) @@ -382,8 +358,6 @@ void mutt_endwin (const char *msg) void _mutt_perror (const char *s, const char* filename, int line) { char *p = strerror (errno); - - debug_print (1, ("%s: %s (errno = %d)\n", s, p ? p : "unknown error", errno)); mutt_error ("%s: %s (errno = %d) from %s:%i", s, p ? p : _("unknown error"), errno, filename, line); } @@ -426,7 +400,7 @@ int mutt_do_pager (const char *banner, char cmd[STRING]; mutt_endwin (NULL); - mutt_expand_file_fmt (cmd, sizeof (cmd), Pager, tempfile); + m_quotefile_fmt(cmd, sizeof (cmd), Pager, tempfile); if (mutt_system (cmd) == -1) { mutt_error (_("Error running \"%s\"!"), cmd); rc = -1; @@ -439,7 +413,7 @@ int mutt_do_pager (const char *banner, return rc; } -int _mutt_enter_fname (const char *prompt, char *buf, size_t blen, +int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen, int *redraw, int buffy, int multiple, char ***files, int *numfiles) { @@ -467,7 +441,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen, 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, @@ -564,16 +538,34 @@ int mutt_addwch (wchar_t wc) { char buf[MB_LEN_MAX * 2]; mbstate_t mbstate; - size_t n1, n2; + ssize_t n1, n2; p_clear(&mbstate, 1); - if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) || - (n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1)) + if ((n1 = wcrtomb(buf, wc, &mbstate)) == -1 || + (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1) return -1; /* ERR */ else return addstr (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 @@ -601,12 +593,12 @@ void mutt_format_string (char *dest, ssize_t destlen, for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) { if (k == -1 || k == -2) { k = (k == -1) ? 1 : n; - wc = replacement_char (); + wc = CharsetReplacement; } if (arboreal && wc < M_TREE_MAX) w = 1; /* hack */ else { - if (!IsWPrint (wc)) + if (!iswprint(wc)) wc = '?'; w = wcwidth (wc); } @@ -615,7 +607,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; } @@ -645,8 +637,7 @@ void mutt_format_string (char *dest, ssize_t destlen, * the number of character cells when printed. */ -static void mutt_format_s_x (char *dest, - size_t destlen, +static void mutt_format_s_x (char *dest, ssize_t destlen, const char *prefix, const char *s, int arboreal) { int right_justify = 1; @@ -668,14 +659,14 @@ static void mutt_format_s_x (char *dest, right_justify, ' ', s, m_strlen(s), arboreal); } -void mutt_format_s (char *dest, - size_t destlen, const char *prefix, const char *s) +void mutt_format_s (char *dest, ssize_t destlen, + const char *prefix, const char *s) { mutt_format_s_x (dest, destlen, prefix, s, 0); } -void mutt_format_s_tree (char *dest, - size_t destlen, const char *prefix, const char *s) +void mutt_format_s_tree (char *dest, ssize_t destlen, + const char *prefix, const char *s) { mutt_format_s_x (dest, destlen, prefix, s, 1); } @@ -689,17 +680,17 @@ void mutt_paddstr (int n, const char *s) { wchar_t wc; int w; - size_t k; - size_t len = m_strlen(s); + ssize_t k; + ssize_t len = m_strlen(s); mbstate_t mbstate; p_clear(&mbstate, 1); for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) { - if (k == (size_t) (-1) || k == (size_t) (-2)) { - k = (k == (size_t) (-1)) ? 1 : len; - wc = replacement_char (); + if (k == -1 || k == -2) { + k = (k == -1) ? 1 : len; + wc = CharsetReplacement; } - if (!IsWPrint (wc)) + if (!iswprint(wc)) wc = '?'; w = wcwidth (wc); if (w >= 0) { @@ -713,32 +704,3 @@ void mutt_paddstr (int n, const char *s) addch (' '); } -/* - * mutt_strwidth is like m_strlenexcept that it returns the width - * refering to the number of characters cells. - */ - -int mutt_strwidth (const char *s) -{ - wchar_t wc; - int w; - size_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 == (size_t) (-1) || k == (size_t) (-2)) { - k = (k == (size_t) (-1)) ? 1 : n; - wc = replacement_char (); - } - if (!IsWPrint (wc)) - wc = '?'; - w += wcwidth (wc); - } - return w; -}