projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop mixmaster support. I don't like people caring about being anonymous that much.
[apps/madmutt.git]
/
lib-ui
/
curs_lib.c
diff --git
a/lib-ui/curs_lib.c
b/lib-ui/curs_lib.c
index
c50c18d
..
53609b5
100644
(file)
--- a/
lib-ui/curs_lib.c
+++ b/
lib-ui/curs_lib.c
@@
-43,29
+43,23
@@
static event_t *KeyEvent;
void mutt_refresh (void)
{
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)
{
void mutt_need_hard_redraw (void)
{
- if (!getenv ("DISPLAY")) {
keypad (stdscr, TRUE);
clearok (stdscr, TRUE);
set_option (OPTNEEDREDRAW);
keypad (stdscr, TRUE);
clearok (stdscr, TRUE);
set_option (OPTNEEDREDRAW);
- }
}
event_t mutt_getch (void)
}
event_t mutt_getch (void)
@@
-79,7
+73,7
@@
event_t mutt_getch (void)
SigInt = 0;
mutt_allow_interrupt (1);
SigInt = 0;
mutt_allow_interrupt (1);
- ch =
getch (
);
+ ch =
wgetch (stdscr
);
mutt_allow_interrupt (0);
if (SigInt)
mutt_allow_interrupt (0);
if (SigInt)
@@
-88,15
+82,6
@@
event_t mutt_getch (void)
if (ch == ERR)
return err;
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);
ret.ch = ch;
ret.op = 0;
return (ch == ctrl ('G') ? err : ret);
@@
-112,7
+97,7
@@
int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
do {
CLEARLINE (LINES - 1);
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,
mutt_refresh ();
getyx (stdscr, y, x);
ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
@@
-187,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);
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 (;;) {
p_delete(&answer_string);
for (;;) {
@@
-222,7
+207,7
@@
int mutt_yesorno (const char *msg, int def)
regfree (&reno);
if (def != -1) {
regfree (&reno);
if (def != -1) {
-
addstr (
(char *) (def == M_YES ? yes : no));
+
waddstr (stdscr,
(char *) (def == M_YES ? yes : no));
mutt_refresh ();
}
return (def);
mutt_refresh ();
}
return (def);
@@
-234,7
+219,7
@@
void mutt_query_exit (void)
mutt_flushinp ();
curs_set (1);
if (Timeout)
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);
if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) {
mutt_endwin (NULL);
exit (1);
@@
-260,8
+245,8
@@
void mutt_curses_error (const char *fmt, ...)
if (!option (OPTKEEPQUIET)) {
BEEP ();
SETCOLOR (MT_COLOR_ERROR);
if (!option (OPTKEEPQUIET)) {
BEEP ();
SETCOLOR (MT_COLOR_ERROR);
- mv
addstr (
LINES - 1, 0, Errorbuf);
-
clrtoeol (
);
+ mv
waddstr (stdscr,
LINES - 1, 0, Errorbuf);
+
wclrtoeol (stdscr
);
SETCOLOR (MT_COLOR_NORMAL);
mutt_refresh ();
}
SETCOLOR (MT_COLOR_NORMAL);
mutt_refresh ();
}
@@
-312,8
+297,8
@@
void mutt_curses_message (const char *fmt, ...)
if (!option (OPTKEEPQUIET)) {
SETCOLOR (MT_COLOR_MESSAGE);
if (!option (OPTKEEPQUIET)) {
SETCOLOR (MT_COLOR_MESSAGE);
- mv
addstr (
LINES - 1, 0, Errorbuf);
-
clrtoeol (
);
+ mv
waddstr (stdscr,
LINES - 1, 0, Errorbuf);
+
wclrtoeol (stdscr
);
SETCOLOR (MT_COLOR_NORMAL);
mutt_refresh ();
}
SETCOLOR (MT_COLOR_NORMAL);
mutt_refresh ();
}
@@
-328,7
+313,7
@@
void mutt_show_error (void)
SETCOLOR (option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
CLEARLINE (LINES - 1);
SETCOLOR (option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
CLEARLINE (LINES - 1);
-
addstr (
Errorbuf);
+
waddstr (stdscr,
Errorbuf);
SETCOLOR (MT_COLOR_NORMAL);
}
SETCOLOR (MT_COLOR_NORMAL);
}
@@
-337,7
+322,7
@@
void mutt_endwin (const char *msg)
if (!option (OPTNOCURSES)) {
CLEARLINE (LINES - 1);
if (!option (OPTNOCURSES)) {
CLEARLINE (LINES - 1);
-
attrset (
A_NORMAL);
+
wattrset (stdscr,
A_NORMAL);
mutt_refresh ();
endwin ();
}
mutt_refresh ();
endwin ();
}
@@
-388,11
+373,11
@@
int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
{
event_t ch;
{
event_t ch;
- mv
addstr (
LINES - 1, 0, (char *) prompt);
-
addstr (
_(" ('?' for list): "));
+ mv
waddstr (stdscr,
LINES - 1, 0, (char *) prompt);
+
waddstr (stdscr,
_(" ('?' for list): "));
if (buf[0])
if (buf[0])
-
addstr (
buf);
-
clrtoeol (
);
+
waddstr (stdscr,
buf);
+
wclrtoeol (stdscr
);
mutt_refresh ();
ch = mutt_getch ();
mutt_refresh ();
ch = mutt_getch ();
@@
-469,8
+454,8
@@
int mutt_multi_choice (const char *prompt, const char *letters)
int choice;
char *p;
int choice;
char *p;
- mv
addstr (
LINES - 1, 0, prompt);
-
clrtoeol (
);
+ mv
waddstr (stdscr,
LINES - 1, 0, prompt);
+
wclrtoeol (stdscr
);
for (;;) {
mutt_refresh ();
ch = mutt_getch ();
for (;;) {
mutt_refresh ();
ch = mutt_getch ();
@@
-512,7
+497,7
@@
int mutt_addwch (wchar_t wc)
(n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1)
return -1; /* ERR */
else
(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)
}
ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n)
@@
-640,7
+625,7
@@
void mutt_format_s_tree (char *dest, ssize_t destlen,
/*
* mutt_paddstr (n, s) is almost equivalent to
/*
* 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)
*/
void mutt_paddstr (int n, const char *s)
@@
-663,12
+648,12
@@
void mutt_paddstr (int n, const char *s)
if (w >= 0) {
if (w > n)
break;
if (w >= 0) {
if (w > n)
break;
-
addnstr (
(char *) s, k);
+
waddnstr (stdscr,
(char *) s, k);
n -= w;
}
}
while (n-- > 0)
n -= w;
}
}
while (n-- > 0)
-
addch (
' ');
+
waddch (stdscr,
' ');
}
/* this routine should be called after receiving SIGWINCH */
}
/* this routine should be called after receiving SIGWINCH */