X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=68272c3aba8bcbfcde8bdf0bc713f5be7a2e9389;hp=9875925a3c39ecb2a13d3a8196c1e16f43779635;hb=529bd38e97bf5b597a7e8149293b63c6fb82984e;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/mutt.h b/mutt.h index 9875925..68272c3 100644 --- a/mutt.h +++ b/mutt.h @@ -8,8 +8,8 @@ * please see the file GPL in the top level source directory. */ -#ifndef MUTT_H -#define MUTT_H +#ifndef _MUTT_H +#define _MUTT_H #include "config.h" @@ -42,8 +42,10 @@ #include #include "rfc822.h" +#include "list.h" #include "hash.h" #include "charset.h" +#include "lib/rx.h" #ifndef HAVE_WC_FUNCS # ifdef MB_LEN_MAX @@ -52,11 +54,7 @@ # define MB_LEN_MAX 16 #endif -#ifdef SUBVERSION -# define MUTT_VERSION (VERSION SUBVERSION) -#else # define MUTT_VERSION (VERSION) -#endif /* nifty trick I stole from ELM 2.5alpha. */ #ifdef MAIN_C @@ -67,40 +65,7 @@ #define INITVAL(x) #endif -#include "mutt_regex.h" - -/* flags for mutt_copy_header() */ -#define CH_UPDATE 1 /* update the status and x-status fields? */ -#define CH_WEED (1<<1) /* weed the headers? */ -#define CH_DECODE (1<<2) /* do RFC1522 decoding? */ -#define CH_XMIT (1<<3) /* transmitting this message? */ -#define CH_FROM (1<<4) /* retain the "From " message separator? */ -#define CH_PREFIX (1<<5) /* use Prefix string? */ -#define CH_NOSTATUS (1<<6) /* supress the status and x-status fields */ -#define CH_REORDER (1<<7) /* Re-order output of headers */ -#define CH_NONEWLINE (1<<8) /* don't output terminating newline */ -#define CH_MIME (1<<9) /* ignore MIME fields */ -#define CH_UPDATE_LEN (1<<10) /* update Lines: and Content-Length: */ -#define CH_TXTPLAIN (1<<11) /* generate text/plain MIME headers */ -#define CH_NOLEN (1<<12) /* don't write Content-Length: and Lines: */ -#define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */ -#define CH_FORCE_FROM (1<<14) /* give CH_FROM precedence over CH_WEED? */ -#define CH_NOQFROM (1<<15) /* give CH_FROM precedence over CH_WEED? */ -#define CH_UPDATE_IRT (1<<16) /* update In-Reply-To: */ -#define CH_UPDATE_REFS (1<<17) /* update References: */ - -/* flags for mutt_enter_string() */ -#define M_ALIAS 1 /* do alias "completion" by calling up the alias-menu */ -#define M_FILE (1<<1) /* do file completion */ -#define M_EFILE (1<<2) /* do file completion, plus incoming folders */ -#define M_CMD (1<<3) /* do completion on previous word */ -#define M_PASS (1<<4) /* password mode (no echo) */ -#define M_CLEAR (1<<5) /* clear input if printable character is pressed */ -#define M_COMMAND (1<<6) /* do command completion */ -#define M_PATTERN (1<<7) /* pattern mode - only used for history classes */ -#define M_LASTFOLDER (1<<8) /* last-folder mode - hack hack hack */ - -/* flags for mutt_get_token() */ +/* flags for mutt_extract_token() */ #define M_TOKEN_EQUAL 1 /* treat '=' as a special */ #define M_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */ #define M_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */ @@ -109,9 +74,6 @@ #define M_TOKEN_COMMENT (1<<5) /* don't reap comments */ #define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */ -/* flags for km_dokey() */ -#define M_KM_UNBUFFERED 1 /* don't read from the key buffer */ - typedef struct { char *data; /* pointer to data */ char *dptr; /* current read/write position */ @@ -271,6 +233,7 @@ enum { /* quad-option vars */ enum { OPT_ABORT, + OPT_ATTACH, OPT_BOUNCE, OPT_COPY, OPT_DELETE, @@ -347,11 +310,13 @@ enum { OPTBEEP, OPTBEEPNEW, OPTBOUNCEDELIVERED, + OPTBRAILLEFRIENDLY, OPTCHECKNEW, OPTCOLLAPSEUNREAD, OPTCONFIRMAPPEND, OPTCONFIRMCREATE, OPTDELETEUNTAG, + OPTDELSP, OPTDIGESTCOLLAPSE, OPTDUPTHREADS, OPTEDITHDRS, @@ -367,6 +332,9 @@ enum { OPTFORWQUOTE, #if USE_HCACHE OPTHCACHEVERIFY, +#if HAVE_QDBM + OPTHCACHECOMPRESS, +#endif /* HAVE_QDBM */ #endif OPTHDRS, OPTHEADER, @@ -379,24 +347,21 @@ enum { OPTHIDETOPMISSING, OPTIGNORELISTREPLYTO, #ifdef USE_IMAP + OPTIMAPCHECKSUBSCRIBED, OPTIMAPLSUB, OPTIMAPPASSIVE, OPTIMAPPEEK, OPTIMAPSERVERNOISE, -# if defined(USE_SSL) || defined(USE_GNUTLS) - OPTIMAPFORCESSL, -# endif #endif -#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS) +#if defined(USE_SSL) || defined(USE_GNUTLS) # ifndef USE_GNUTLS + OPTSSLSYSTEMCERTS, OPTSSLV2, -# endif +# endif /* !USE_GNUTLS */ OPTSSLV3, OPTTLSV1, -# ifndef USE_GNUTLS - OPTSSLSYSTEMCERTS, -# endif -#endif + OPTSSLFORCETLS, +#endif /* USE_SSL || USE_GNUTLS */ OPTIMPLICITAUTOVIEW, OPTINCLUDEONLYFIRST, OPTKEEPFLAGGED, @@ -443,6 +408,7 @@ enum { OPTSORTRE, OPTSPAMSEP, OPTSTATUSONTOP, + OPTSTRICTMAILTO, OPTSTRICTMIME, OPTSTRICTTHREADS, OPTSTRIPWAS, @@ -562,52 +528,21 @@ enum { #define toggle_option(x) mutt_bit_toggle(Options,x) #define option(x) mutt_bit_isset(Options,x) -/* Exit values used in send_msg() */ -#define S_ERR 127 -#define S_BKG 126 - -typedef struct list_t { - char *data; - struct list_t *next; -} LIST; - -typedef struct rx_list_t { - REGEXP *rx; - struct rx_list_t *next; -} RX_LIST; - typedef struct spam_list_t { - REGEXP *rx; + rx_t *rx; int nmatch; char *template; struct spam_list_t *next; } SPAM_LIST; -#define mutt_new_list() safe_calloc (1, sizeof (LIST)) -#define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST)) -#define mutt_new_rx_list() safe_calloc (1, sizeof (RX_LIST)) -void mutt_free_list (LIST **); -void mutt_free_rx_list (RX_LIST **); +#define mutt_new_spam_list() mem_calloc (1, sizeof (SPAM_LIST)) void mutt_free_spam_list (SPAM_LIST **); -LIST *mutt_copy_list (LIST *); -int mutt_matches_ignore (const char *, LIST *); -/* add an element to a list */ -LIST *mutt_add_list (LIST *, const char *); +int mutt_matches_ignore (const char *, LIST *); void mutt_init (int, LIST *); -typedef struct alias { - struct alias *self; /* XXX - ugly hack */ - char *name; - ADDRESS *addr; - struct alias *next; - short tagged; - short del; - short num; -} ALIAS; - typedef struct envelope { ADDRESS *return_path; ADDRESS *from; @@ -635,6 +570,8 @@ typedef struct envelope { LIST *references; /* message references (in reverse order) */ LIST *in_reply_to; /* in-reply-to header content */ LIST *userhdrs; /* user defined headers */ + unsigned int irt_changed:1; /* In-Reply-To changed to link/break threads */ + unsigned int refs_changed:1; /* References changed to break thread */ } ENVELOPE; typedef struct parameter { @@ -750,8 +687,6 @@ typedef struct header { unsigned int subject_changed:1; /* used for threading */ unsigned int threaded:1; /* used for threading */ unsigned int display_subject:1; /* used for threading */ - unsigned int irt_changed:1; /* In-Reply-To changed to link/break threads */ - unsigned int refs_changed:1; /* References changed to break thread */ unsigned int recip_valid:1; /* is_recipient is valid */ unsigned int active:1; /* message is not to be removed */ unsigned int trash:1; /* message is marked as trashed on disk. @@ -795,8 +730,6 @@ typedef struct header { char *tree; /* character string to print thread tree */ struct thread *thread; - ENVELOPE *new_env; /* envelope information for rethreading */ - #ifdef MIXMASTER LIST *chain; #endif @@ -893,57 +826,11 @@ typedef struct { unsigned int quiet:1; /* inhibit status messages? */ unsigned int collapsed:1; /* are all threads collapsed? */ unsigned int closing:1; /* mailbox is being closed */ + unsigned int counting:1; /* do we just want to cound? */ } CONTEXT; -typedef struct attachptr { - BODY *content; - int parent_type; - char *tree; - int level; - int num; -} ATTACHPTR; - -typedef struct { - FILE *fpin; - FILE *fpout; - char *prefix; - int flags; -} STATE; - -/* used by enter.c */ - -typedef struct { - wchar_t *wbuf; - size_t wbuflen; - size_t lastchar; - size_t curpos; - size_t begin; - int tabs; -} ENTER_STATE; - -/* flags for the STATE struct */ -#define M_DISPLAY (1<<0) /* output is displayed to the user */ -#define M_VERIFY (1<<1) /* perform signature verification */ -#define M_PENDINGPREFIX (1<<2) /* prefix to write, but character must follow */ -#define M_WEED (1<<3) /* weed headers even when not in display mode */ -#define M_CHARCONV (1<<4) /* Do character set conversions */ -#define M_PRINTING (1<<5) /* are we printing? - M_DISPLAY "light" */ -#define M_REPLYING (1<<6) /* are we replying? */ -#define M_FIRSTDONE (1<<7) /* the first attachment has been done */ - -#define state_set_prefix(s) ((s)->flags |= M_PENDINGPREFIX) -#define state_reset_prefix(s) ((s)->flags &= ~M_PENDINGPREFIX) -#define state_puts(x,y) fputs(x,(y)->fpout) -#define state_putc(x,y) fputc(x,(y)->fpout) - -void state_mark_attach (STATE *); -void state_attach_puts (const char *, STATE *); -void state_prefix_putc (char, STATE *); -int state_printf (STATE *, const char *, ...); - -#include "ascii.h" #include "protos.h" #include "lib.h" #include "globals.h" -#endif /*MUTT_H */ +#endif /* !_MUTT_H */