diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-03-22 08:01:17 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-03-22 08:01:17 +0000 |
commit | 843e605b89b2da163c60739adaa48d885abfe2b3 (patch) | |
tree | 078d555321d0742d8c917a1180e832b3b70aa9ab /tmux.h | |
parent | 223ed4a98962c088aee84ca6ceb33798e92ac473 (diff) | |
parent | df3ab87964fc52c6f44b2bbe014c8bec202d0528 (diff) | |
download | rtmux-843e605b89b2da163c60739adaa48d885abfe2b3.tar.gz rtmux-843e605b89b2da163c60739adaa48d885abfe2b3.tar.bz2 rtmux-843e605b89b2da163c60739adaa48d885abfe2b3.zip |
Merge branch 'obsd-master'
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 */ |