=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.26 retrieving revision 1.27 diff -c -r1.26 -r1.27 *** src/usr.bin/tmux/tmux.h 2009/07/13 17:47:46 1.26 --- src/usr.bin/tmux/tmux.h 2009/07/13 23:11:35 1.27 *************** *** 1,4 **** ! /* $OpenBSD: tmux.h,v 1.26 2009/07/13 17:47:46 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: tmux.h,v 1.27 2009/07/13 23:11:35 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 861,877 **** #define CMD_CANTNEST 0x2 #define CMD_ARG1 0x4 #define CMD_ARG01 0x8 - #define CMD_AFLAG 0x10 - #define CMD_DFLAG 0x20 - #define CMD_GFLAG 0x40 - #define CMD_KFLAG 0x80 - #define CMD_UFLAG 0x100 - #define CMD_BIGDFLAG 0x200 - #define CMD_BIGUFLAG 0x400 - #define CMD_RFLAG 0x800 - int flags; void (*init)(struct cmd *, int); int (*parse)(struct cmd *, int, char **, char **); int (*exec)(struct cmd *, struct cmd_ctx *); --- 861,873 ---- #define CMD_CANTNEST 0x2 #define CMD_ARG1 0x4 #define CMD_ARG01 0x8 int flags; + #define CMD_CHFLAG(flag) \ + ((flag) >= 'a' && (flag) <= 'z' ? 1ULL << ((flag) - 'a') : \ + (flag) >= 'A' && (flag) <= 'Z' ? 1ULL << (26 + (flag) - 'A') : 0) + uint64_t chflags; + void (*init)(struct cmd *, int); int (*parse)(struct cmd *, int, char **, char **); int (*exec)(struct cmd *, struct cmd_ctx *); *************** *** 883,916 **** /* Generic command data. */ struct cmd_target_data { ! int flags; char *target; char *arg; }; struct cmd_srcdst_data { ! int flags; char *src; char *dst; char *arg; }; struct cmd_buffer_data { ! int flags; char *target; int buffer; char *arg; }; struct cmd_option_data { ! int flags; char *target; char *option; char *value; }; struct cmd_pane_data { ! int flags; char *target; char *arg; int pane; --- 879,912 ---- /* Generic command data. */ struct cmd_target_data { ! uint64_t chflags; char *target; char *arg; }; struct cmd_srcdst_data { ! uint64_t chflags; char *src; char *dst; char *arg; }; struct cmd_buffer_data { ! uint64_t chflags; char *target; int buffer; char *arg; }; struct cmd_option_data { ! uint64_t chflags; char *target; char *option; char *value; }; struct cmd_pane_data { ! uint64_t chflags; char *target; char *arg; int pane;