Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-02-08 10:01:22 +00:00
5 changed files with 41 additions and 141 deletions

22
tmux.h
View File

@ -66,18 +66,8 @@ struct tmuxproc;
/* Automatic name refresh interval, in microseconds. Must be < 1 second. */
#define NAME_INTERVAL 500000
/*
* Event watermarks. We start with FAST then if we hit full size for HITS reads
* in succession switch to SLOW, and return when we hit EMPTY the same number
* of times.
*/
#define READ_FAST_SIZE 4096
#define READ_SLOW_SIZE 128
#define READ_FULL_SIZE (4096 - 16)
#define READ_EMPTY_SIZE 16
#define READ_CHANGE_HITS 3
/* Maximum size of data to hold from a pane. */
#define READ_SIZE 4096
/* Attribute to make GCC check printf-like arguments. */
#define printflike(a, b) __attribute__ ((format (printf, a, b)))
@ -242,7 +232,7 @@ enum tty_code_code {
TTYC_DL1, /* delete_line, dl */
TTYC_E3,
TTYC_ECH, /* erase_chars, ec */
TTYC_ED, /* csr_eos, cd */
TTYC_ED, /* clr_eos, cd */
TTYC_EL, /* clr_eol, ce */
TTYC_EL1, /* clr_bol, cb */
TTYC_ENACS, /* ena_acs, eA */
@ -764,9 +754,6 @@ struct window_pane {
struct event resize_timer;
u_int wmark_size;
u_int wmark_hits;
struct input_ctx *ictx;
struct grid_cell colgc;
@ -1120,9 +1107,6 @@ struct tty_ctx {
/* The background colour used for clearing (erasing). */
u_int bg;
/* Saved last cell on line. */
struct grid_cell last_cell;
};
/* Saved message entry. */