X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.h;h=9c7fecb16a49a6f383471c6cf3d4a32a87f10873;hp=a88bbf46167a812b375297f37a608b4dbcbe69fa;hb=df70e07e24add1869bcc9b7af2277d9d0c09a281;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1 diff --git a/keymap.h b/keymap.h index a88bbf4..9c7fecb 100644 --- a/keymap.h +++ b/keymap.h @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ + */ #ifndef KEYMAP_H #define KEYMAP_H @@ -32,15 +32,14 @@ void km_bindkey (char *, int, int); int km_dokey (int); /* entry in the keymap tree */ -struct keymap_t -{ - char *macro; /* macro expansion (op == OP_MACRO) */ - char *descr; /* description of a macro for the help menu */ - struct keymap_t *next; /* next key in map */ - short op; /* operation to perform */ - short eq; /* number of leading keys equal to next entry */ - short len; /* length of key sequence (unit: sizeof (keycode_t)) */ - keycode_t *keys; /* key sequence */ +struct keymap_t { + char *macro; /* macro expansion (op == OP_MACRO) */ + char *descr; /* description of a macro for the help menu */ + struct keymap_t *next; /* next key in map */ + short op; /* operation to perform */ + short eq; /* number of leading keys equal to next entry */ + short len; /* length of key sequence (unit: sizeof (keycode_t)) */ + keycode_t *keys; /* key sequence */ }; char *km_keyname (int); @@ -50,8 +49,7 @@ void km_init (void); void km_error_key (int); void mutt_what_key (void); -enum -{ +enum { MENU_ALIAS, MENU_ATTACH, MENU_COMPOSE, @@ -63,11 +61,15 @@ enum MENU_POST, MENU_QUERY, - - MENU_PGP, + MENU_PGP, MENU_SMIME, +#ifdef CRYPT_BACKEND_GPGME + MENU_KEY_SELECT_PGP, + MENU_KEY_SELECT_SMIME, +#endif + #ifdef MIXMASTER MENU_MIX, #endif @@ -85,11 +87,10 @@ extern int LastKey; extern struct mapping_t Menus[]; -struct binding_t -{ - char *name; /* name of the function */ - int op; /* function id number */ - char *seq; /* default key binding */ +struct binding_t { + char *name; /* name of the function */ + int op; /* function id number */ + char *seq; /* default key binding */ }; struct binding_t *km_get_table (int menu);