diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-07-05 16:24:13 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-07-05 16:24:13 +0100 |
| commit | e496a548d7b07c9a4be9ce8e750cf5423e3bafe3 (patch) | |
| tree | 26b867940c5174e44894050a493a70a5118ba968 /tmux.h | |
| parent | 3d39b18e319cdd96bf25debcfcf52c03120e3d8e (diff) | |
| parent | c7a121cfc0137c907b7bfb0c3fd1bdee395af8aa (diff) | |
| download | rtmux-e496a548d7b07c9a4be9ce8e750cf5423e3bafe3.tar.gz rtmux-e496a548d7b07c9a4be9ce8e750cf5423e3bafe3.tar.bz2 rtmux-e496a548d7b07c9a4be9ce8e750cf5423e3bafe3.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -39,9 +39,6 @@ extern char *__progname; extern char **environ; -/* Default global configuration file. */ -#define TMUX_CONF "/etc/tmux.conf" - /* Default prompt history length. */ #define PROMPT_HISTORY 100 @@ -937,6 +934,7 @@ struct window_pane { #define PANE_DROP 0x2 #define PANE_FOCUSED 0x4 #define PANE_RESIZE 0x8 +#define PANE_FOCUSPUSH 0x10 char *cmd; char *shell; @@ -1228,6 +1226,7 @@ struct tty { #define TTY_UTF8 0x8 #define TTY_STARTED 0x10 #define TTY_OPENED 0x20 +#define TTY_FOCUS 0x40 int flags; int term_flags; @@ -1379,6 +1378,9 @@ struct cmd { char *file; u_int line; +#define CMD_CONTROL 0x1 + int flags; + TAILQ_ENTRY(cmd) qentry; }; struct cmd_list { |