circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-17 18:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2018-08-02 13:02:26 +01:00
commit 2e19a5ecb9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tmux.h
View File

@ -19,8 +19,6 @@
#ifndef TMUX_H #ifndef TMUX_H
#define TMUX_H #define TMUX_H
#define PROTOCOL_VERSION 8
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
@ -56,6 +54,9 @@ struct session;
struct tmuxpeer; struct tmuxpeer;
struct tmuxproc; struct tmuxproc;
/* Client-server protocol version. */
#define PROTOCOL_VERSION 8
/* Default global configuration file. */ /* Default global configuration file. */
#ifndef TMUX_CONF #ifndef TMUX_CONF
#define TMUX_CONF "/etc/tmux.conf" #define TMUX_CONF "/etc/tmux.conf"
@ -825,12 +826,11 @@ struct window {
int flags; int flags;
#define WINDOW_BELL 0x1 #define WINDOW_BELL 0x1
#define WINDOW_ACTIVITY 0x2 #define WINDOW_ACTIVITY 0x2
/* 0x4 unused */ #define WINDOW_SILENCE 0x4
#define WINDOW_SILENCE 0x8 #define WINDOW_ZOOMED 0x8
#define WINDOW_ZOOMED 0x1000 #define WINDOW_FORCEWIDTH 0x10
#define WINDOW_FORCEWIDTH 0x2000 #define WINDOW_FORCEHEIGHT 0x20
#define WINDOW_FORCEHEIGHT 0x4000 #define WINDOW_STYLECHANGED 0x40
#define WINDOW_STYLECHANGED 0x8000
#define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE) #define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
int alerts_queued; int alerts_queued;
@ -1407,7 +1407,7 @@ struct key_binding {
RB_HEAD(key_bindings, key_binding); RB_HEAD(key_bindings, key_binding);
struct key_table { struct key_table {
const char *name; const char *name;
struct key_bindings key_bindings; struct key_bindings key_bindings;
u_int references; u_int references;
@ -1428,6 +1428,7 @@ enum options_table_type {
OPTIONS_TABLE_STYLE, OPTIONS_TABLE_STYLE,
OPTIONS_TABLE_ARRAY, OPTIONS_TABLE_ARRAY,
}; };
enum options_table_scope { enum options_table_scope {
OPTIONS_TABLE_NONE, OPTIONS_TABLE_NONE,
OPTIONS_TABLE_SERVER, OPTIONS_TABLE_SERVER,