X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=babbc72c48a230a4b405736c813d005ea5856083;hp=71be0119aa3b7bc5e5df2797458f3baf3c5e42a4;hb=5dcac54e5db074dc4572f843666c7f7acaf2d109;hpb=d4b790a79307b4f53c49f4c25223977a8baa6aa1 diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index 71be011..babbc72 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -11,16 +11,15 @@ * please see the file GPL in the top level source directory. */ -#include +#include -#include #include +#include #include #include #include -#include "curses.h" #include "menu.h" #include "enter.h" @@ -36,33 +35,6 @@ ssize_t UngetCount = 0; static ssize_t UngetBufLen = 0; 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 in the middle of macros unless necessary */ - if (UngetCount && !option (OPTFORCEREFRESH)) - return; - - /* else */ - refresh (); -} - -/* 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) { int ch; @@ -74,7 +46,7 @@ event_t mutt_getch (void) SigInt = 0; mutt_allow_interrupt (1); - ch = getch (); + ch = wgetch (stdscr); mutt_allow_interrupt (0); if (SigInt) @@ -83,15 +55,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); @@ -107,7 +70,7 @@ 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, @@ -142,7 +105,7 @@ void mutt_edit_file(const char *data) char cmd[LONG_STRING]; mutt_endwin (NULL); - m_quotefile_fmt(cmd, sizeof (cmd), MCore.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); @@ -152,8 +115,8 @@ void mutt_edit_file(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; char *expr; @@ -182,7 +145,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 (;;) { @@ -217,7 +180,7 @@ int mutt_yesorno (const char *msg, int def) regfree (&reno); if (def != -1) { - addstr ((char *) (def == M_YES ? yes : no)); + waddstr (stdscr, (char *) (def == M_YES ? yes : no)); mutt_refresh (); } return (def); @@ -229,7 +192,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); @@ -255,8 +218,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 (); } @@ -307,8 +270,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 (); } @@ -323,24 +286,18 @@ 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); } -void mutt_endwin (const char *msg) +void curses_initialize(void) { - if (!option (OPTNOCURSES)) { - CLEARLINE (LINES - 1); - - attrset (A_NORMAL); - mutt_refresh (); - endwin (); - } - - if (msg && *msg) { - puts (msg); - fflush (stdout); - } + ci_start_color(); + keypad(stdscr, TRUE); + cbreak(); + noecho(); + typeahead (-1); /* simulate smooth scrolling */ + meta(stdscr, TRUE); } void _mutt_perror (const char *s, const char* filename, int line) @@ -349,6 +306,27 @@ void _mutt_perror (const char *s, const char* filename, int line) mutt_error ("%s: %s (errno = %d) from %s:%i", s, p ? p : _("unknown error"), errno, filename, line); } +/* + * prompts the user to enter a keystroke, and displays the octal value back + * to the user. + */ +void mutt_what_key (void) +{ + int ch; + + mvwprintw (stdscr, LINES - 1, 0, _("Enter keys (^G to abort): ")); + do { + ch = wgetch (stdscr); + if (ch != ERR && ch != ctrl ('G')) { + mutt_message (_("Char = %s, Octal = %o, Decimal = %d"), + km_keyname (ch), ch, ch); + } + } + while (ch != ERR && ch != ctrl ('G')); + + mutt_flushinp (); +} + int mutt_any_key_to_continue (const char *s) { struct termios t; @@ -383,11 +361,11 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen, { 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 (); @@ -398,8 +376,8 @@ 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 { @@ -438,7 +416,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 @@ -458,16 +435,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 (); @@ -509,7 +485,7 @@ 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) @@ -637,7 +613,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) @@ -660,11 +636,10 @@ void mutt_paddstr (int n, const char *s) if (w >= 0) { if (w > n) break; - addnstr ((char *) s, k); + waddnstr (stdscr, (char *) s, k); n -= w; } } while (n-- > 0) - addch (' '); + waddch (stdscr, ' '); } -