diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-22 08:46:12 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-22 08:46:12 +0000 |
| commit | 9c0520f2c52548d0949db172662015a75926ff89 (patch) | |
| tree | 1f1850fad2ed521e5b2e3d75a17e0581539f6260 /tmux.h | |
| parent | c3dbbdaadff396bf25e2a99740dde9da8248ce02 (diff) | |
| parent | 843e605b89b2da163c60739adaa48d885abfe2b3 (diff) | |
| download | rtmux-9c0520f2c52548d0949db172662015a75926ff89.tar.gz rtmux-9c0520f2c52548d0949db172662015a75926ff89.tar.bz2 rtmux-9c0520f2c52548d0949db172662015a75926ff89.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -399,6 +399,7 @@ enum tty_code_code { TTYC_SMKX, /* keypad_xmit, ks */ TTYC_SMSO, /* enter_standout_mode, so */ TTYC_SMUL, /* enter_underline_mode, us */ + TTYC_SMXX, TTYC_SS, /* set cursor style, Ss */ TTYC_TC, /* 24-bit "true" colour, Tc */ TTYC_TSL, /* to_status_line, tsl */ @@ -510,7 +511,7 @@ enum utf8_state { #define COLOUR_FLAG_256 0x01000000 #define COLOUR_FLAG_RGB 0x02000000 -/* Grid attributes. */ +/* Grid attributes. Anything above 0xff is stored in an extended cell. */ #define GRID_ATTR_BRIGHT 0x1 #define GRID_ATTR_DIM 0x2 #define GRID_ATTR_UNDERSCORE 0x4 @@ -519,6 +520,7 @@ enum utf8_state { #define GRID_ATTR_HIDDEN 0x20 #define GRID_ATTR_ITALICS 0x40 #define GRID_ATTR_CHARSET 0x80 /* alternative character set */ +#define GRID_ATTR_STRIKETHROUGH 0x100 /* Grid flags. */ #define GRID_FLAG_FG256 0x1 @@ -535,7 +537,7 @@ enum utf8_state { /* Grid cell data. */ struct grid_cell { u_char flags; - u_char attr; + u_short attr; int fg; int bg; struct utf8_data data; @@ -1913,7 +1915,7 @@ int colour_fromstring(const char *s); u_char colour_256to16(u_char); /* attributes.c */ -const char *attributes_tostring(u_char); +const char *attributes_tostring(int); int attributes_fromstring(const char *); /* grid.c */ |