X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=47586238891e3594ecdb0c6a5d339a33e4f16ac2;hp=b1270eaaf3d12b8c5cbc817e5063d4b7a477bdf8;hb=56ac9bea51f338d488828ad1114d58b4a9542209;hpb=97677c08933e16e25ecb3c12473ef1efdab7962b diff --git a/mutt.h b/mutt.h index b1270ea..4758623 100644 --- a/mutt.h +++ b/mutt.h @@ -11,53 +11,11 @@ #ifndef _MUTT_H #define _MUTT_H -#include "config.h" - -#include -#include -#ifdef HAVE_UNISTD_H -# include /* needed for SEEK_SET */ -#endif -#ifdef HAVE_UNIX_H -# include /* needed for snprintf on QNX. */ -#endif -#include -#include -#include -#include -#include -#include -#ifdef HAVE_WCHAR_H -# include -#endif -#if defined(HAVE_WCTYPE_H) && defined(HAVE_WC_FUNCS) -# include -#endif - -#ifndef _POSIX_PATH_MAX -#include -#endif - -#include -#include - -#include -#include -#include -#include - +#include #include +#include -#include "charset.h" - -#ifndef HAVE_WC_FUNCS -# ifdef MB_LEN_MAX -# undef MB_LEN_MAX -# endif -# define MB_LEN_MAX 16 -#endif - -# define MUTT_VERSION (VERSION) +#define MUTT_VERSION (VERSION) /* nifty trick I stole from ELM 2.5alpha. */ #ifdef MAIN_C @@ -73,17 +31,6 @@ 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_MBOXHOOK (1<<1) @@ -207,14 +154,6 @@ enum { M_SAVE_OVERWRITE }; -/* possible arguments to set_quadoption() */ -enum { - M_NO, - M_YES, - M_ASKNO, - M_ASKYES -}; - /* quad-option vars */ enum { OPT_ABORT, @@ -234,7 +173,6 @@ enum { OPT_POPRECONNECT, OPT_POSTPONE, OPT_PRINT, - OPT_QUIT, OPT_REPLYTO, OPT_RECALL, #if defined(USE_SSL) || defined(USE_GNUTLS) @@ -295,7 +233,6 @@ enum { OPTCOLLAPSEUNREAD, OPTCONFIRMAPPEND, OPTCONFIRMCREATE, - OPTCOUNTATTACH, OPTDELETEUNTAG, OPTDELSP, OPTDIGESTCOLLAPSE, @@ -313,7 +250,7 @@ enum { OPTFORWQUOTE, #ifdef USE_HCACHE OPTHCACHEVERIFY, -#if HAVE_QDBM +#ifdef HAVE_QDBM OPTHCACHECOMPRESS, #endif /* HAVE_QDBM */ #endif @@ -434,9 +371,6 @@ enum { OPTPGPCHECKEXIT, OPTPGPLONGIDS, OPTPGPAUTODEC, -#if 0 - OPTPGPENCRYPTSELF, -#endif OPTPGPRETAINABLESIG, OPTPGPSTRICTENC, OPTFORWDECRYPT, @@ -458,7 +392,6 @@ enum { OPTAUXSORT, /* (pseudo) using auxillary sort function */ OPTFORCEREFRESH, /* (pseudo) refresh even during macros */ - OPTLOCALES, /* (pseudo) set if user has valid locale definition */ OPTNOCURSES, /* (pseudo) when sending in batch mode */ OPTNEEDREDRAW, /* (pseudo) to notify caller of a submenu */ OPTSEARCHREVERSE, /* (pseudo) used by ci_search_command */ @@ -495,7 +428,7 @@ enum { OPTMAX }; -#define mutt_bit_alloc(n) calloc ((n + 7) / 8, sizeof (char)) +#define mutt_bit_alloc(n) p_new(char, (n + 7) / 8) #define mutt_bit_set(v,n) v[n/8] |= (1 << (n % 8)) #define mutt_bit_unset(v,n) v[n/8] &= ~(1 << (n % 8)) #define mutt_bit_toggle(v,n) v[n/8] ^= (1 << (n % 8)) @@ -506,20 +439,7 @@ enum { #define toggle_option(x) mutt_bit_toggle(Options,x) #define option(x) mutt_bit_isset(Options,x) -typedef struct spam_list_t { - rx_t *rx; - int nmatch; - char *template; - struct spam_list_t *next; -} SPAM_LIST; - - -#define mutt_new_spam_list() p_new(SPAM_LIST, 1) -void mutt_free_spam_list (SPAM_LIST **); - -int mutt_matches_ignore (const char *, LIST *); - -void mutt_init (int, LIST *); +void mutt_init (int, string_list_t *); typedef struct thread { unsigned int fake_thread:1; @@ -538,26 +458,8 @@ typedef struct thread { HEADER *sort_key; } THREAD; - -/* flag to mutt_pattern_comp() */ -#define M_FULL_MSG (1<<0) /* enable body and header matching */ - -typedef enum { - M_MATCH_FULL_ADDRESS = 1 -} pattern_exec_flag; - -typedef struct pattern_t { - short op; - unsigned int not : 1; - unsigned int alladdr : 1; - unsigned int stringmatch : 1; - int min; - int max; - struct pattern_t *next; - struct pattern_t *child; /* arguments to logical op */ - char* str; - regex_t *rx; -} pattern_t; +typedef struct compress_info compress_info; +typedef struct pattern_t pattern_t; typedef struct { char *path; @@ -571,9 +473,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 */ @@ -589,7 +491,7 @@ typedef struct { short magic; /* mailbox type */ - void *compressinfo; /* compressed mbox module private data */ + compress_info *cinfo; /* compressed mbox module private data */ char *realpath; /* path to compressed mailbox */ unsigned int locked:1; /* is the mailbox locked? */ @@ -616,7 +518,6 @@ typedef struct { #define M_PARTS_RECOUNT (1<<1) /* force recount */ #include "protos.h" -#include "lib.h" #include "globals.h" #endif /* !_MUTT_H */