From: pdmef Date: Thu, 11 Aug 2005 11:07:37 +0000 (+0000) Subject: Rocco Rutte: X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=000b7ffd7d9cc9cfd9395727227bcbadbe8cdb18 Rocco Rutte: - move some more flags out to headers they belong to git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@387 e385b8ad-14ed-0310-8656-cc95a2468c6d --- diff --git a/copy.h b/copy.h index df2c342..fd08b75 100644 --- a/copy.h +++ b/copy.h @@ -6,44 +6,53 @@ * It's licensed under the GNU General Public License, * please see the file GPL in the top level source directory. */ +#ifndef _MUTT_COPY_H +#define _MUTT_COPY_H + +/* flags for mutt_copy_header() */ +#define CH_UPDATE (1<<0) /* 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 to _mutt_copy_message */ -#define M_CM_NOHEADER 1 /* don't copy the message header */ -#define M_CM_PREFIX (1<<1) /* quote the message */ -#define M_CM_DECODE (1<<2) /* decode the message body into text/plain */ -#define M_CM_DISPLAY (1<<3) /* output is displayed to the user */ -#define M_CM_UPDATE (1<<4) /* update structs on sync */ -#define M_CM_WEED (1<<5) /* weed message/rfc822 attachment headers */ -#define M_CM_CHARCONV (1<<6) /* perform character set conversions */ -#define M_CM_PRINTING (1<<7) /* printing the message - display light */ -#define M_CM_REPLYING (1<<8) /* replying the message */ - - -#define M_CM_DECODE_PGP (1<<9) /* used for decoding PGP messages */ -#define M_CM_DECODE_SMIME (1<<10) /* used for decoding S/MIME messages */ -#define M_CM_DECODE_CRYPT (M_CM_DECODE_PGP | M_CM_DECODE_SMIME) - - -#define M_CM_VERIFY (1<<11) /* do signature verification */ - - +#define M_CM_NOHEADER (1<<0) /* don't copy the message header */ +#define M_CM_PREFIX (1<<1) /* quote the message */ +#define M_CM_DECODE (1<<2) /* decode the message body into text/plain */ +#define M_CM_DISPLAY (1<<3) /* output is displayed to the user */ +#define M_CM_UPDATE (1<<4) /* update structs on sync */ +#define M_CM_WEED (1<<5) /* weed message/rfc822 attachment headers */ +#define M_CM_CHARCONV (1<<6) /* perform character set conversions */ +#define M_CM_PRINTING (1<<7) /* printing the message - display light */ +#define M_CM_REPLYING (1<<8) /* replying the message */ +#define M_CM_DECODE_PGP (1<<9) /* used for decoding PGP messages */ +#define M_CM_DECODE_SMIME (1<<10) /* used for decoding S/MIME messages */ +#define M_CM_DECODE_CRYPT (M_CM_DECODE_PGP | M_CM_DECODE_SMIME) +#define M_CM_VERIFY (1<<11) /* do signature verification */ int mutt_copy_hdr (FILE *, FILE *, long, long, int, const char *); - int mutt_copy_header (FILE *, HEADER *, FILE *, int, const char *); - -int _mutt_copy_message (FILE * fpout, - FILE * fpin, +int _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, int flags, int chflags); - int mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags, int chflags); - -int _mutt_append_message (CONTEXT * dest, - FILE * fpin, - CONTEXT * src, +int _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src, HEADER * hdr, BODY * body, int flags, int chflags); - -int mutt_append_message (CONTEXT * dest, - CONTEXT * src, +int mutt_append_message (CONTEXT * dest, CONTEXT * src, HEADER * hdr, int cmflags, int chflags); + +#endif /* !_MUTT_COPY_H */ diff --git a/enter.h b/enter.h index aaf677f..f484f1e 100644 --- a/enter.h +++ b/enter.h @@ -9,6 +9,17 @@ #ifndef _MUTT_ENTER_H #define _MUTT_ENTER_H +/* 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 */ + typedef struct { wchar_t *wbuf; size_t wbuflen; diff --git a/keymap.h b/keymap.h index 55251e0..3668f18 100644 --- a/keymap.h +++ b/keymap.h @@ -15,6 +15,9 @@ /* maximal length of a key binding sequence used for buffer in km_bindkey */ #define MAX_SEQ 8 +/* flags for km_dokey() */ +#define M_KM_UNBUFFERED 1 /* don't read from the key buffer */ + /* type for key storage, the rest of mutt works fine with int type */ typedef short keycode_t; diff --git a/mutt.h b/mutt.h index 35dd081..226eda0 100644 --- a/mutt.h +++ b/mutt.h @@ -65,38 +65,7 @@ #define INITVAL(x) #endif -/* 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 */ @@ -105,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 */