Make layout windows visible, makes the whole thing way simpler.

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index 43d7ffb..24e174d 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -32,20 +32,19 @@ typedef struct {
 } event_t;
 
 /* 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_MESSAGEHOOK  (1<<5)
 #define M_CRYPTHOOK    (1<<6)
-#define M_ACCOUNTHOOK  (1<<7)
-#define M_REPLYHOOK    (1<<8)
-#define M_SEND2HOOK     (1<<9)
+#define M_REPLYHOOK    (1<<7)
+#define M_SEND2HOOK     (1<<8)
 
-#define M_OPENHOOK     (1<<10)
-#define M_APPENDHOOK   (1<<11)
-#define M_CLOSEHOOK    (1<<12)
+#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
@@ -143,9 +142,6 @@ enum {
 
   /* options for socket code */
   M_NEW_SOCKET,
-#ifdef USE_SSL
-  M_NEW_SSL_SOCKET,
-#endif
 
   /* Options for mutt_save_attachment */
   M_SAVE_APPEND,
@@ -172,11 +168,7 @@ enum {
   OPT_PRINT,
   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,
@@ -199,7 +191,7 @@ enum {
 #define SENDRESEND     (1<<6)
 #define SENDNEWS       (1<<7)
 
-/* flags to _mutt_select_file() */
+/* flags to mutt_select_file() */
 #define M_SEL_BUFFY    (1<<0)
 #define M_SEL_MULTI    (1<<1)
 #define M_SEL_FOLDER   (1<<2)
@@ -208,12 +200,9 @@ enum {
 enum {
   OPTALLOW8BIT,
   OPTALLOWANSI,
-  OPTARROWCURSOR,
-  OPTASCIICHARS,
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
-  OPTASKXCOMMENTTO,
   OPTATTACHSPLIT,
   OPTAUTOEDIT,
   OPTAUTOTAG,
@@ -237,15 +226,10 @@ enum {
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
-#ifdef USE_HCACHE
-  OPTHCACHEVERIFY,
 #ifdef HAVE_QDBM
   OPTHCACHECOMPRESS,
-#endif /* HAVE_QDBM */
 #endif
-  OPTHDRS,
   OPTHEADER,
-  OPTHELP,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
   OPTHIDEMISSING,
@@ -256,19 +240,8 @@ 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,
   OPTMAILDIRTRASH,
   OPTMARKERS,
@@ -276,7 +249,6 @@ enum {
   OPTMBOXPANE,
   OPTMENUSCROLL,                /* scroll menu instead of implicit next-page */
   OPTMENUMOVEOFF,
-  OPTMETAKEY,                   /* interpret ALT-x as ESC-x */
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
@@ -284,7 +256,6 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-  OPTPOPAUTHTRYALL,
   OPTPOPLAST,
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
@@ -297,10 +268,6 @@ enum {
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
-  OPTSAVEADDRESS,
-  OPTSAVEEMPTY,
-  OPTSAVENAME,
-  OPTSCORE,
   OPTSIGDASHES,
   OPTSORTRE,
   OPTSPAMSEP,
@@ -319,9 +286,7 @@ enum {
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
-#ifdef HAVE_GETADDRINFO
   OPTUSEIPV6,
-#endif
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -333,16 +298,6 @@ enum {
 
   /* PGP options */
 
-  OPTCRYPTAUTOSIGN,
-  OPTCRYPTAUTOENCRYPT,
-  OPTCRYPTAUTOPGP,
-  OPTCRYPTAUTOSMIME,
-  OPTCRYPTREPLYENCRYPT,
-  OPTCRYPTREPLYSIGN,
-  OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTSMIMEISDEFAULT,
-  OPTPGPLONGIDS,
-  OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
@@ -352,9 +307,7 @@ enum {
 #ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
-  OPTSAVEUNSUB,
   OPTLOADDESC,
-  OPTXCOMMENTTO,
 #endif                          /* USE_NNTP */
 
   /* pseudo options */
@@ -384,13 +337,11 @@ 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
   OPTNEWS,                      /* (pseudo) used to change reader mode */
   OPTNEWSSEND,                  /* (pseudo) used to change behavior when posting */
-  OPTNEWSCACHE,                 /* (pseudo) used to indicate if news cache exist */
 #endif
   OPTSHORTENHIERARCHY,          /* set when to shorten "hierarchies" in the sidebar */
   OPTSIDEBARNEWMAILONLY,