endif
SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
- lib-lib lib-mime lib-crypt lib-hash lib \
+ lib-lib lib-mime lib-crypt lib-hash lib-ui lib \
pop imap $(NNTP_SUBDIR)
BUILT_SOURCES = keymap_defs.h version.h
bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
madmutt_SOURCES = $(BUILT_SOURCES) \
alias.c attach.c base64.c browser.c buffy.c \
- charset.c color.c compress.c commands.c complete.c \
- compose.c copy.c curs_lib.c curs_main.c \
- editmsg.c enter.c \
+ charset.c compress.c commands.c complete.c \
+ compose.c copy.c editmsg.c enter.c \
flags.c filter.c from.c getdomain.c \
handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
init.c keymap.c lib.c \
madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
-Limap -limap -Lpop -lpop $(LIBNNTP) \
-Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
+ -Llib-ui -lui \
-Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
$(top_builddir)/lib-mime/libmime.a \
$(top_builddir)/lib-crypt/libcrypt.a \
$(top_builddir)/lib-hash/libhash.a \
+ $(top_builddir)/lib-ui/libui.a \
$(top_builddir)/lib/libsane.a \
\
$(top_builddir)/pop/libpop.a \
dotlock.h functions.def gen_defs \
enter.h recvattach.h handler.h thread.h \
globals.h history.h init.h keymap.h mutt_crypt.h \
- mime.h mutt.h mutt_curses.h mutt_menu.h \
+ mime.h mutt.h mutt_menu.h \
mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
rfc3676.h sort.h mime.types autogen.sh \
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "lib/rx.h"
#include "lib/debug.h"
#include "mutt.h"
#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt_menu.h"
#include "sort.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "keymap.h"
#include "rfc1524.h"
#include "pager.h"
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "mx.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.h"
#include "sort.h"
#include <lib-lib/buffer.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include <imap/imap.h>
#include "mutt.h"
#include "mh.h"
#include "sidebar.h"
-#include "mutt_curses.h"
#include <string.h>
#include <sys/stat.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "sort.h"
#include "copy.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mx.h"
#include "mbox.h"
-#include "mutt_curses.h"
#include "lib/debug.h"
lib-mime/Makefile
lib-crypt/Makefile
lib-hash/Makefile
+ lib-ui/Makefile
lib/Makefile
imap/Makefile
pop/Makefile
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include <lib-crypt/crypt.h>
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "handler.h"
#include "enter.h"
#include "copy.h"
#include <lib-lib/mem.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "keymap.h"
#include "history.h"
#include "buffy.h"
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "sort.h"
#include "mx.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "recvattach.h"
#include "handler.h"
-#include "mutt_curses.h"
#include "rfc1524.h"
#include "rfc3676.h"
#include "keymap.h"
# include "config.h"
#endif
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "sort.h"
#include "thread.h"
#include "charset.h"
#include <lib-lib/str.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "keymap.h"
#include "pager.h"
#include <inttypes.h>
+#include <lib-ui/curses.h>
+
#include "imap.h"
#include "mutt_socket.h"
-#include "mutt_curses.h"
/* -- symbols -- */
#define IMAP_PORT 143
#include <lib-lib/str.h>
#include <lib-lib/buffer.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
#include "mx.h"
#include <lib-lib/buffer.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "history.h"
#include "keymap.h"
#include "mbyte.h"
#include <lib-lib/buffer.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "keymap.h"
#include <lib-crypt/crypt.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "handler.h"
-#include "mutt_curses.h"
#include "copy.h"
#include "crypt.h"
#include "pgp.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "handler.h"
-#include "mutt_curses.h"
#include "pgp.h"
#include "copy.h"
#include "attach.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "mutt_idna.h"
#include "pgp.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "pgp.h"
#include "pager.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "handler.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "copy.h"
--- /dev/null
+noinst_LIBRARIES = libui.a
+
+libui_a_SOURCES = curses.h \
+ color.c curs_lib.c curs_main.c
+
+noinst_HEADERS = curses.h
+
+-include ../cflags.mk
#include <lib-lib/buffer.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "lib/debug.h"
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "pager.h"
#include "mbyte.h"
char *p;
wchar_t wc;
int w;
- size_t k, k2;
+ ssize_t k, k2;
char scratch[MB_LEN_MAX];
mbstate_t mbstate1, mbstate2;
--destlen;
p = dest;
for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
- if (k == (size_t) (-1) || k == (size_t) (-2)) {
- k = (k == (size_t) (-1)) ? 1 : n;
+ if (k == -1 || k == -2) {
+ k = (k == -1) ? 1 : n;
wc = replacement_char ();
}
if (arboreal && wc < M_TREE_MAX)
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include <pop/pop.h>
#include "mutt.h"
-#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
#ifdef USE_NNTP
-#include "nntp.h"
+#include "nntp/nntp.h"
#endif
#ifdef USE_SASL
CHECK_MSGCOUNT;
if (Context->magic == M_NNTP) {
HEADER *h;
- int old = CURHDR->index, i;
+ int old = CURHDR->index;
if (!CURHDR->env->message_id) {
mutt_error (_("No Message-ID. Unable to perform operation"));
#ifndef _MUTT_CURSES_H
#define _MUTT_CURSES_H
+#include "mutt.h"
+
#ifdef USE_SLANG_CURSES
#ifndef unix /* this symbol is not defined by the hp-ux compiler (sigh) */
#define MAYBE_REDRAW(x) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); x = REDRAW_FULL; }
-/* ----------------------------------------------------------------------------
- * These are here to avoid compiler warnings with -Wall under SunOS 4.1.x
- */
-
-#if !defined(STDC_HEADERS) && !defined(NCURSES_VERSION) && !defined(USE_SLANG_CURSES)
-extern int endwin ();
-extern int printw ();
-extern int beep ();
-extern int isendwin ();
-extern int w32addch ();
-extern int keypad ();
-extern int wclrtobot ();
-extern int mvprintw ();
-extern int getcurx ();
-extern int getcury ();
-extern int noecho ();
-extern int wdelch ();
-extern int wrefresh ();
-extern int wmove ();
-extern int wclear ();
-extern int waddstr ();
-extern int wclrtoeol ();
-#endif
-
#endif /* !_MUTT_CURSES_H */
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
#include "keymap.h"
#include "url.h"
#include "mutt_idna.h"
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
#include "sidebar.h"
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "mutt_ssl.h"
#include "lib/debug.h"
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt_socket.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mutt_ssl.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
-#include "mutt_curses.h"
#include "mx.h"
#include "url.h"
#include "attach.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "sort.h"
#include "mx.h"
#include "nntp.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "sort.h"
#include "mx.h"
#include "mx_nntp.h"
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
-#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "sort.h"
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mx.h"
#include "pop.h"
#include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
#include "lib/debug.h"
#ifndef _POP_H
#define _POP_H 1
+#include <lib-ui/curses.h>
+
#include "mx.h"
#include "mutt_socket.h"
-#include "mutt_curses.h"
#define POP_PORT 110
#define POP_SSL_PORT 995
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "handler.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "attach.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "attach.h"
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "remailer.h"
# include "config.h"
#endif
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include <stdlib.h>
#include <unistd.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "enter.h"
-#include "mutt_curses.h"
#include "rfc3676.h"
#include "keymap.h"
#include "copy.h"
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mx.h"
#include "copy.h"
#include "pager.h"
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "sidebar.h"
#include "buffy.h"
#include "keymap.h"
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include <signal.h>
#include <string.h>
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "sort.h"
#include "mx.h"
#include "buffy.h"