circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-14 10:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2020-08-19 10:01:19 +01:00
commit 5a55d1390a
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alerts.c
View File

@ -200,7 +200,7 @@ alerts_check_bell(struct window *w)
* not check WINLINK_BELL). * not check WINLINK_BELL).
*/ */
s = wl->session; s = wl->session;
if (s->curw != wl) { if (s->curw != wl || s->attached == 0) {
wl->flags |= WINLINK_BELL; wl->flags |= WINLINK_BELL;
server_status_session(s); server_status_session(s);
} }
@ -236,7 +236,7 @@ alerts_check_activity(struct window *w)
if (wl->flags & WINLINK_ACTIVITY) if (wl->flags & WINLINK_ACTIVITY)
continue; continue;
s = wl->session; s = wl->session;
if (s->curw != wl) { if (s->curw != wl || s->attached == 0) {
wl->flags |= WINLINK_ACTIVITY; wl->flags |= WINLINK_ACTIVITY;
server_status_session(s); server_status_session(s);
} }
@ -272,7 +272,7 @@ alerts_check_silence(struct window *w)
if (wl->flags & WINLINK_SILENCE) if (wl->flags & WINLINK_SILENCE)
continue; continue;
s = wl->session; s = wl->session;
if (s->curw != wl) { if (s->curw != wl || s->attached == 0) {
wl->flags |= WINLINK_SILENCE; wl->flags |= WINLINK_SILENCE;
server_status_session(s); server_status_session(s);
} }

44
input.c
View File

@ -65,7 +65,7 @@ struct input_param {
INPUT_MISSING, INPUT_MISSING,
INPUT_NUMBER, INPUT_NUMBER,
INPUT_STRING INPUT_STRING
} type; } type;
union { union {
int num; int num;
char *str; char *str;
@ -81,7 +81,7 @@ struct input_ctx {
struct input_cell cell; struct input_cell cell;
struct input_cell old_cell; struct input_cell old_cell;
u_int old_cx; u_int old_cx;
u_int old_cy; u_int old_cy;
int old_mode; int old_mode;
@ -121,7 +121,7 @@ struct input_ctx {
* All input received since we were last in the ground state. Sent to * All input received since we were last in the ground state. Sent to
* control clients on connection. * control clients on connection.
*/ */
struct evbuffer *since_ground; struct evbuffer *since_ground;
}; };
/* Helper functions. */ /* Helper functions. */
@ -2459,13 +2459,31 @@ input_osc_parse_colour(const char *p, u_int *r, u_int *g, u_int *b)
return (1); return (1);
} }
/* Reply to a colour request. */
static void
input_osc_colour_reply(struct input_ctx *ictx, u_int n, int c)
{
u_char r, g, b;
const char *end;
if (c == 8 || (~c & COLOUR_FLAG_RGB))
return;
colour_split_rgb(c, &r, &g, &b);
if (ictx->input_end == INPUT_END_BEL)
end = "\007";
else
end = "\033\\";
input_reply(ictx, "\033]%u;rgb:%02hhx/%02hhx/%02hhx%s", n, r, g, b, end);
}
/* Handle the OSC 4 sequence for setting (multiple) palette entries. */ /* Handle the OSC 4 sequence for setting (multiple) palette entries. */
static void static void
input_osc_4(struct input_ctx *ictx, const char *p) input_osc_4(struct input_ctx *ictx, const char *p)
{ {
struct window_pane *wp = ictx->wp; struct window_pane *wp = ictx->wp;
char *copy, *s, *next = NULL; char *copy, *s, *next = NULL;
long idx; long idx;
u_int r, g, b; u_int r, g, b;
if (wp == NULL) if (wp == NULL)
@ -2497,17 +2515,22 @@ bad:
free(copy); free(copy);
} }
/* Handle the OSC 10 sequence for setting foreground colour. */ /* Handle the OSC 10 sequence for setting and querying foreground colour. */
static void static void
input_osc_10(struct input_ctx *ictx, const char *p) input_osc_10(struct input_ctx *ictx, const char *p)
{ {
struct window_pane *wp = ictx->wp; struct window_pane *wp = ictx->wp;
struct grid_cell defaults;
u_int r, g, b; u_int r, g, b;
if (wp == NULL) if (wp == NULL)
return; return;
if (strcmp(p, "?") == 0)
if (strcmp(p, "?") == 0) {
tty_default_colours(&defaults, wp);
input_osc_colour_reply(ictx, 10, defaults.fg);
return; return;
}
if (!input_osc_parse_colour(p, &r, &g, &b)) if (!input_osc_parse_colour(p, &r, &g, &b))
goto bad; goto bad;
@ -2520,17 +2543,22 @@ bad:
log_debug("bad OSC 10: %s", p); log_debug("bad OSC 10: %s", p);
} }
/* Handle the OSC 11 sequence for setting background colour. */ /* Handle the OSC 11 sequence for setting and querying background colour. */
static void static void
input_osc_11(struct input_ctx *ictx, const char *p) input_osc_11(struct input_ctx *ictx, const char *p)
{ {
struct window_pane *wp = ictx->wp; struct window_pane *wp = ictx->wp;
struct grid_cell defaults;
u_int r, g, b; u_int r, g, b;
if (wp == NULL) if (wp == NULL)
return; return;
if (strcmp(p, "?") == 0)
if (strcmp(p, "?") == 0) {
tty_default_colours(&defaults, wp);
input_osc_colour_reply(ictx, 11, defaults.bg);
return; return;
}
if (!input_osc_parse_colour(p, &r, &g, &b)) if (!input_osc_parse_colour(p, &r, &g, &b))
goto bad; goto bad;