X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=4203b0ee7a5d2686943e893c6fd19bcfc5f07768;hp=87d87218171c8afa28be1eb3cdbe38d4065aced1;hb=0c12d960399d14b4143b2bb91a96bdaca64e4c56;hpb=e01486aabea6f0af36933158bd58b9ab03b30add diff --git a/curs_lib.c b/curs_lib.c index 87d8721..4203b0e 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -15,17 +15,20 @@ # include "config.h" #endif +#include +#include +#include + #include "mutt.h" +#include "enter.h" #include "mutt_menu.h" #include "mutt_curses.h" #include "pager.h" #include "mbyte.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/debug.h" +#include #include #include #include @@ -113,7 +116,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, size_t buflen, int complete, int multiple, char ***files, int *numfiles) { int ret; @@ -155,19 +158,6 @@ void mutt_clear_error (void) CLEARLINE (LINES - 1); } -static void fix_end_of_file (const char *data) -{ - FILE *fp; - int c; - - if ((fp = safe_fopen (data, "a+")) == NULL) - return; - fseek (fp, -1, SEEK_END); - if ((c = fgetc (fp)) != '\n') - fputc ('\n', fp); - safe_fclose (&fp); -} - void mutt_edit_file (const char *editor, const char *data) { char cmd[LONG_STRING]; @@ -176,7 +166,6 @@ void mutt_edit_file (const char *editor, const char *data) mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data); if (mutt_system (cmd) == -1) mutt_error (_("Error running \"%s\"!"), cmd); - fix_end_of_file (data); keypad (stdscr, TRUE); clearok (stdscr, TRUE); } @@ -213,12 +202,12 @@ int mutt_yesorno (const char *msg, int def) * ensure there is enough room for the answer and truncate the question * to fit. */ - answer_string = safe_malloc (COLS + 1); + answer_string = p_new(char, COLS + 1); snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no, def == M_YES ? no : yes); - answer_string_len = mutt_strlen (answer_string); + answer_string_len = m_strlen(answer_string); printw ("%.*s%s", COLS - answer_string_len, msg, answer_string); - FREE (&answer_string); + p_delete(&answer_string); FOREVER { mutt_refresh (); @@ -275,7 +264,7 @@ void mutt_query_exit (void) if (Timeout) timeout (-1); /* restore blocking operation */ if (mutt_yesorno (_("Exit Mutt-ng?"), M_YES) == M_YES) { - endwin (); + mutt_endwin (NULL); exit (1); } mutt_clear_error (); @@ -309,6 +298,36 @@ void mutt_curses_error (const char *fmt, ...) set_option (OPTMSGERR); } +#ifdef USE_SOCKET +void mutt_progress_bar (progress_t* progress, long pos) { + char posstr[SHORT_STRING]; + + if (!pos) { + if (!NetInc) + mutt_message (progress->msg); + else { + if (progress->size) + mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr), + progress->size); + progress->pos = 0; + } + } + + if (!NetInc) + return; + + if (pos >= progress->pos + (NetInc << 10)) { + progress->pos = pos; + pos = pos / (NetInc << 10) * (NetInc << 10); + mutt_pretty_size (posstr, sizeof (posstr), pos); + if (progress->size) + mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr); + else + mutt_message ("%s %s", progress->msg, posstr); + } +} +#endif + void mutt_curses_message (const char *fmt, ...) { char TmpErrorbuf[STRING]; @@ -401,7 +420,7 @@ int mutt_do_pager (const char *banner, { int rc; - if (!Pager || mutt_strcmp (Pager, "builtin") == 0) + if (!Pager || m_strcmp(Pager, "builtin") == 0) rc = mutt_pager (banner, tempfile, do_color, info); else { char cmd[STRING]; @@ -446,7 +465,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen, *redraw = REDRAW_FULL; } else { - char *pc = safe_malloc (mutt_strlen (prompt) + 3); + char *pc = p_new(char, m_strlen(prompt) + 3); sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */ mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0); @@ -456,7 +475,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen, != 0) buf[0] = 0; MAYBE_REDRAW (*redraw); - FREE (&pc); + p_delete(&pc); } return 0; @@ -470,7 +489,7 @@ void mutt_ungetch (int ch, int op) tmp.op = op; if (UngetCount >= UngetBufLen) - safe_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t)); + p_realloc(&KeyEvent, UngetBufLen += 128); KeyEvent[UngetCount++] = tmp; } @@ -526,7 +545,7 @@ int mutt_multi_choice (char *prompt, char *letters) } else if (ch.ch <= '9' && ch.ch > '0') { choice = ch.ch - '0'; - if (choice <= mutt_strlen (letters)) + if (choice <= m_strlen(letters)) break; } } @@ -547,7 +566,7 @@ int mutt_addwch (wchar_t wc) mbstate_t mbstate; size_t n1, n2; - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) || (n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1)) return -1; /* ERR */ @@ -575,8 +594,8 @@ void mutt_format_string (char *dest, size_t destlen, char scratch[MB_LEN_MAX]; mbstate_t mbstate1, mbstate2; - memset (&mbstate1, 0, sizeof (mbstate1)); - memset (&mbstate2, 0, sizeof (mbstate2)); + p_clear(&mbstate1, 1); + p_clear(&mbstate2, 1); --destlen; p = dest; for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) { @@ -646,7 +665,7 @@ static void mutt_format_s_x (char *dest, } mutt_format_string (dest, destlen, min_width, max_width, - right_justify, ' ', s, mutt_strlen (s), arboreal); + right_justify, ' ', s, m_strlen(s), arboreal); } void mutt_format_s (char *dest, @@ -671,10 +690,10 @@ void mutt_paddstr (int n, const char *s) wchar_t wc; int w; size_t k; - size_t len = mutt_strlen (s); + size_t len = m_strlen(s); mbstate_t mbstate; - memset (&mbstate, 0, sizeof (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; @@ -695,7 +714,7 @@ void mutt_paddstr (int n, const char *s) } /* - * mutt_strwidth is like mutt_strlen except that it returns the width + * mutt_strwidth is like m_strlenexcept that it returns the width * refering to the number of characters cells. */ @@ -709,9 +728,9 @@ int mutt_strwidth (const char *s) if (!s) return 0; - n = mutt_strlen (s); + n = m_strlen(s); - memset (&mbstate, 0, sizeof (mbstate)); + 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;