X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=2bf01418c7051196ffb760544afe25b8680c3ca4;hp=15af96a3f6863a37b574f52b96ab130ca047f33d;hb=f5a370338d87eba00bc8696636a90f6c50b05d14;hpb=3755188848d66fd8c0638ce8514fbf57aa94518f diff --git a/mutt.h b/mutt.h index 15af96a..2bf0141 100644 --- a/mutt.h +++ b/mutt.h @@ -13,6 +13,7 @@ #include #include +#include #define MUTT_VERSION (VERSION) @@ -30,34 +31,20 @@ typedef struct { int op; /* function op */ } event_t; -/* flags for mutt_FormatString() */ -typedef enum { - M_FORMAT_FORCESUBJ = (1 << 0), /* print the subject even if unchanged */ - M_FORMAT_TREE = (1 << 1), /* draw the thread tree */ - M_FORMAT_MAKEPRINT = (1 << 2), /* make sure that all chars are printable */ - M_FORMAT_OPTIONAL = (1 << 3), - M_FORMAT_STAT_FILE = (1 << 4), /* used by mutt_attach_fmt */ - M_FORMAT_ARROWCURSOR = (1 << 5), /* reserve space for arrow_cursor */ - M_FORMAT_INDEX = (1 << 6) /* this is a main index entry */ -} format_flag; - /* types for mutt_add_hook() */ -#define M_FOLDERHOOK 1 +#define M_FOLDERHOOK (1<<0) #define M_MBOXHOOK (1<<1) #define M_SENDHOOK (1<<2) #define M_FCCHOOK (1<<3) #define M_SAVEHOOK (1<<4) -#define M_CHARSETHOOK (1<<5) -#define M_ICONVHOOK (1<<6) -#define M_MESSAGEHOOK (1<<7) -#define M_CRYPTHOOK (1<<8) -#define M_ACCOUNTHOOK (1<<9) -#define M_REPLYHOOK (1<<10) -#define M_SEND2HOOK (1<<11) - -#define M_OPENHOOK (1<<12) -#define M_APPENDHOOK (1<<13) -#define M_CLOSEHOOK (1<<14) +#define M_MESSAGEHOOK (1<<5) +#define M_CRYPTHOOK (1<<6) +#define M_REPLYHOOK (1<<7) +#define M_SEND2HOOK (1<<8) + +#define M_OPENHOOK (1<<9) +#define M_APPENDHOOK (1<<10) +#define M_CLOSEHOOK (1<<11) /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 @@ -155,23 +142,12 @@ enum { /* options for socket code */ M_NEW_SOCKET, -#ifdef USE_SSL - M_NEW_SSL_SOCKET, -#endif /* Options for mutt_save_attachment */ M_SAVE_APPEND, M_SAVE_OVERWRITE }; -/* possible arguments to set_quadoption() */ -enum { - M_NO, - M_YES, - M_ASKNO, - M_ASKYES -}; - /* quad-option vars */ enum { OPT_ABORT, @@ -186,19 +162,13 @@ enum { OPT_MIMEFWD, OPT_MIMEFWDREST, OPT_MOVE, - OPT_PGPMIMEAUTO, /* ask to revert to PGP/MIME when inline fails */ OPT_POPDELETE, OPT_POPRECONNECT, OPT_POSTPONE, OPT_PRINT, - OPT_QUIT, OPT_REPLYTO, OPT_RECALL, -#if defined(USE_SSL) || defined(USE_GNUTLS) - OPT_SSLSTARTTLS, -#endif OPT_SUBJECT, - OPT_VERIFYSIG, /* verify PGP signatures */ OPT_LISTREPLY, #ifdef USE_NNTP OPT_TOMODERATED, @@ -218,34 +188,25 @@ enum { #define SENDFORWARD (1<<3) #define SENDPOSTPONED (1<<4) #define SENDBATCH (1<<5) -#define SENDKEY (1<<6) -#define SENDRESEND (1<<7) -#define SENDNEWS (1<<8) +#define SENDRESEND (1<<6) +#define SENDNEWS (1<<7) /* flags to _mutt_select_file() */ #define M_SEL_BUFFY (1<<0) #define M_SEL_MULTI (1<<1) #define M_SEL_FOLDER (1<<2) -/* flags for parse_spam_list */ -#define M_SPAM 1 -#define M_NOSPAM 2 - /* boolean vars */ enum { OPTALLOW8BIT, OPTALLOWANSI, - OPTARROWCURSOR, OPTASCIICHARS, OPTASKBCC, OPTASKCC, OPTASKFOLLOWUP, - OPTASKXCOMMENTTO, OPTATTACHSPLIT, OPTAUTOEDIT, OPTAUTOTAG, - OPTBEEP, - OPTBEEPNEW, OPTBOUNCEDELIVERED, OPTBRAILLEFRIENDLY, OPTCHECKNEW, @@ -258,7 +219,6 @@ enum { OPTDUPTHREADS, OPTEDITHDRS, OPTENCODEFROM, - OPTENVFROM, OPTFASTREPLY, OPTFCCATTACH, OPTFCCCLEAR, @@ -267,13 +227,9 @@ enum { OPTFORCENAME, OPTFORWDECODE, OPTFORWQUOTE, -#ifdef USE_HCACHE - OPTHCACHEVERIFY, #ifdef HAVE_QDBM OPTHCACHECOMPRESS, -#endif /* HAVE_QDBM */ #endif - OPTHDRS, OPTHEADER, OPTHELP, OPTHIDDENHOST, @@ -286,21 +242,9 @@ enum { OPTIMAPCHECKSUBSCRIBED, OPTIMAPLSUB, OPTIMAPPASSIVE, - OPTIMAPPEEK, OPTIMAPSERVERNOISE, -#if defined(USE_SSL) || defined(USE_GNUTLS) -# ifndef USE_GNUTLS - OPTSSLSYSTEMCERTS, - OPTSSLV2, -# endif /* !USE_GNUTLS */ - OPTSSLV3, - OPTTLSV1, - OPTSSLFORCETLS, -#endif /* USE_SSL || USE_GNUTLS */ OPTIMPLICITAUTOVIEW, - OPTINCLUDEONLYFIRST, OPTKEEPFLAGGED, - OPTMAILCAPSANITIZE, OPTMAILDIRTRASH, OPTMARKERS, OPTMARKOLD, @@ -311,14 +255,10 @@ enum { OPTMETOO, OPTMHPURGE, OPTMIMEFORWDECODE, -#ifdef USE_NNTP - OPTMIMESUBJECT, /* encode subject line with RFC2047 */ -#endif OPTNARROWTREE, OPTPAGERSTOP, OPTPIPEDECODE, OPTPIPESPLIT, - OPTPOPAUTHTRYALL, OPTPOPLAST, OPTPRINTDECODE, OPTPRINTSPLIT, @@ -331,18 +271,11 @@ enum { OPTREVALIAS, OPTREVNAME, OPTREVREAL, - OPTRFC2047PARAMS, - OPTSAVEADDRESS, - OPTSAVEEMPTY, - OPTSAVENAME, - OPTSCORE, OPTSIGDASHES, - OPTSIGONTOP, OPTSORTRE, OPTSPAMSEP, OPTSTATUSONTOP, OPTSTRICTMAILTO, - OPTSTRICTMIME, OPTSTRICTTHREADS, OPTSTRIPWAS, OPTSTUFFQUOTED, @@ -352,16 +285,11 @@ enum { OPTTHREADRECEIVED, OPTTILDE, OPTUNCOLLAPSEJUMP, - OPTUSE8BITMIME, - OPTUSEDOMAIN, OPTUSEFROM, - OPTUSEGPGAGENT, #ifdef HAVE_LIBIDN OPTUSEIDN, #endif -#ifdef HAVE_GETADDRINFO OPTUSEIPV6, -#endif OPTWAITKEY, OPTWEED, OPTWRAP, @@ -371,31 +299,12 @@ enum { OPTXMAILTO, /* 1 if $edit_header is forcebly set */ OPTXTERMSETTITLES, - OPTCRYPTUSEGPGME, - /* PGP options */ - OPTCRYPTAUTOSIGN, - OPTCRYPTAUTOENCRYPT, - OPTCRYPTAUTOPGP, - OPTCRYPTAUTOSMIME, - OPTCRYPTREPLYENCRYPT, - OPTCRYPTREPLYSIGN, - OPTCRYPTREPLYSIGNENCRYPTED, - OPTCRYPTTIMESTAMP, - OPTSMIMEISDEFAULT, - OPTASKCERTLABEL, - OPTSDEFAULTDECRYPTKEY, - OPTPGPIGNORESUB, - OPTPGPCHECKEXIT, - OPTPGPLONGIDS, OPTPGPAUTODEC, OPTPGPRETAINABLESIG, - OPTPGPSTRICTENC, OPTFORWDECRYPT, OPTPGPSHOWUNUSABLE, - OPTPGPAUTOINLINE, - OPTPGPREPLYINLINE, /* news options */ @@ -404,7 +313,6 @@ enum { OPTSHOWONLYUNREAD, OPTSAVEUNSUB, OPTLOADDESC, - OPTXCOMMENTTO, #endif /* USE_NNTP */ /* pseudo options */ @@ -434,7 +342,6 @@ enum { OPTMENUCALLER, /* (pseudo) tell menu to give caller a take */ OPTREDRAWTREE, /* (pseudo) redraw the thread tree */ OPTPGPCHECKTRUST, /* (pseudo) used by pgp_select_key () */ - OPTDONTHANDLEPGPKEYS, /* (pseudo) used to extract PGP keys */ OPTUNBUFFEREDINPUT, /* (pseudo) don't use key buffer */ #ifdef USE_NNTP @@ -458,8 +365,6 @@ enum { #define toggle_option(x) mutt_bit_toggle(Options,x) #define option(x) mutt_bit_isset(Options,x) -int mutt_matches_ignore (const char *, string_list_t *); - void mutt_init (int, string_list_t *); typedef struct thread { @@ -494,9 +399,9 @@ typedef struct { HEADER **hdrs; HEADER *last_tag; /* last tagged msg. used to link threads */ THREAD *tree; /* top of thread tree */ - HASH *id_hash; /* hash table by msg id */ - HASH *subj_hash; /* hash table by subject */ - HASH *thread_hash; /* hash table for threading */ + hash_t *id_hash; /* hash table by msg id */ + hash_t *subj_hash; /* hash table by subject */ + hash_t *thread_hash; /* hash table for threading */ int *v2r; /* mapping from virtual to real msgno */ int hdrmax; /* number of pointers in hdrs */ int msgcount; /* number of messages in the mailbox */