* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
-#include "curses.h"
#include "enter.h"
#include "menu.h"
int n = wcwidth (wc);
if (iswprint(wc) && n > 0)
- return mutt_addwch (wc);
+ return waddwch(stdscr, wc);
if (!(wc & ~0x7f))
- return printw ("^%c", ((int) wc + 0x40) & 0x7f);
+ return wprintw (stdscr, "^%c", ((int) wc + 0x40) & 0x7f);
if (!(wc & ~0xffff))
- return printw ("\\u%04x", (int) wc);
- return printw ("\\u%08x", (int) wc);
+ return wprintw (stdscr, "\\u%04x", (int) wc);
+ return wprintw (stdscr, "\\u%08x", (int) wc);
}
static size_t width_ceiling (const wchar_t * s, size_t n, int w1)
width_ceiling (state->wbuf, state->lastchar,
my_wcswidth (state->wbuf,
state->curpos) - width / 2);
- move (y, x);
+ wmove (stdscr, y, x);
w = 0;
for (i = state->begin; i < state->lastchar; i++) {
w += my_wcwidth (state->wbuf[i]);
break;
my_addwch (state->wbuf[i]);
}
- clrtoeol ();
- move (y,
- x + my_wcswidth (state->wbuf + state->begin,
- state->curpos - state->begin));
+ wclrtoeol (stdscr);
+ wmove (stdscr, y,
+ x + my_wcswidth (state->wbuf + state->begin,
+ state->curpos - state->begin));
}
mutt_refresh ();
if (tempbuf && templen == state->lastchar - i &&
!memcmp (tempbuf, state->wbuf + i,
(state->lastchar - i) * sizeof (wchar_t))) {
- mutt_select_file (buf, buflen,
- (flags & M_EFILE) ? M_SEL_FOLDER : 0);
+ mutt_select_file(buf, buflen, flags & M_EFILE ? M_SEL_FOLDER : 0,
+ NULL, NULL);
set_option (OPTNEEDREDRAW);
if (*buf)
replace_part (state, i, buf);
|| (tempbuf && templen == state->lastchar
&& !memcmp (tempbuf, state->wbuf,
state->lastchar * sizeof (wchar_t)))) {
- _mutt_select_file (buf, buflen,
- ((flags & M_EFILE) ? M_SEL_FOLDER : 0) |
- (multiple ? M_SEL_MULTI : 0), files, numfiles);
+ mutt_select_file(buf, buflen,
+ ((flags & M_EFILE) ? M_SEL_FOLDER : 0) |
+ (multiple ? M_SEL_MULTI : 0), files, numfiles);
set_option (OPTNEEDREDRAW);
if (*buf) {
mutt_pretty_mailbox (buf);