circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-26 07:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-12-10 14:01:10 +00:00
commit 8941dbe482
3 changed files with 13 additions and 2 deletions

5
tmux.1
View File

@ -6292,6 +6292,11 @@ to change the cursor colour from inside
.Bd -literal -offset indent .Bd -literal -offset indent
$ printf '\e033]12;red\e033\e\e' $ printf '\e033]12;red\e033\e\e'
.Ed .Ed
.Pp
The colour is an
.Xr X 7
colour, see
.Xr XParseColor 3 .
.It Em \&Cmg, \&Clmg, \&Dsmg , \&Enmg .It Em \&Cmg, \&Clmg, \&Dsmg , \&Enmg
Set, clear, disable or enable DECSLRM margins. Set, clear, disable or enable DECSLRM margins.
These are set automatically if the terminal reports it is These are set automatically if the terminal reports it is

2
tmux.h
View File

@ -1312,7 +1312,7 @@ struct tty {
#define TTY_NOCURSOR 0x1 #define TTY_NOCURSOR 0x1
#define TTY_FREEZE 0x2 #define TTY_FREEZE 0x2
#define TTY_TIMER 0x4 #define TTY_TIMER 0x4
/* 0x8 unused */ #define TTY_NOBLOCK 0x8
#define TTY_STARTED 0x10 #define TTY_STARTED 0x10
#define TTY_OPENED 0x20 #define TTY_OPENED 0x20
/* 0x40 unused */ /* 0x40 unused */

8
tty.c
View File

@ -206,6 +206,11 @@ tty_block_maybe(struct tty *tty)
size_t size = EVBUFFER_LENGTH(tty->out); size_t size = EVBUFFER_LENGTH(tty->out);
struct timeval tv = { .tv_usec = TTY_BLOCK_INTERVAL }; struct timeval tv = { .tv_usec = TTY_BLOCK_INTERVAL };
if (size == 0)
tty->flags &= ~TTY_NOBLOCK;
else if (tty->flags & TTY_NOBLOCK)
return (0);
if (size < TTY_BLOCK_START(tty)) if (size < TTY_BLOCK_START(tty))
return (0); return (0);
@ -2088,8 +2093,8 @@ tty_set_selection(struct tty *tty, const char *buf, size_t len)
encoded = xmalloc(size); encoded = xmalloc(size);
b64_ntop(buf, len, encoded, size); b64_ntop(buf, len, encoded, size);
tty->flags |= TTY_NOBLOCK;
tty_putcode_ptr2(tty, TTYC_MS, "", encoded); tty_putcode_ptr2(tty, TTYC_MS, "", encoded);
tty->client->redraw = EVBUFFER_LENGTH(tty->out);
free(encoded); free(encoded);
} }
@ -2097,6 +2102,7 @@ tty_set_selection(struct tty *tty, const char *buf, size_t len)
void void
tty_cmd_rawstring(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_rawstring(struct tty *tty, const struct tty_ctx *ctx)
{ {
tty->flags |= TTY_NOBLOCK;
tty_add(tty, ctx->ptr, ctx->num); tty_add(tty, ctx->ptr, ctx->num);
tty_invalidate(tty); tty_invalidate(tty);
} }