mirror of https://github.com/tmux/tmux.git
Merge branch 'obsd-master'
commit
3df4e78492
3
grid.c
3
grid.c
|
@ -665,8 +665,7 @@ grid_string_cells_bg(const struct grid_cell *gc, int *values)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns ANSI code to set particular attributes (colour, bold and so on)
|
* Returns ANSI code to set particular attributes (colour, bold and so on)
|
||||||
* given a current state. The output buffer must be able to hold at least 57
|
* given a current state.
|
||||||
* bytes.
|
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
grid_string_cells_code(const struct grid_cell *lastgc,
|
grid_string_cells_code(const struct grid_cell *lastgc,
|
||||||
|
|
|
@ -49,7 +49,8 @@ static void server_client_dispatch_shell(struct client *);
|
||||||
|
|
||||||
/* Identify mode callback. */
|
/* Identify mode callback. */
|
||||||
static void
|
static void
|
||||||
server_client_callback_identify(__unused int fd, __unused short events, void *data)
|
server_client_callback_identify(__unused int fd, __unused short events,
|
||||||
|
void *data)
|
||||||
{
|
{
|
||||||
server_client_clear_identify(data, NULL);
|
server_client_clear_identify(data, NULL);
|
||||||
}
|
}
|
||||||
|
@ -328,7 +329,7 @@ server_client_free(__unused int fd, __unused short events, void *arg)
|
||||||
void
|
void
|
||||||
server_client_suspend(struct client *c)
|
server_client_suspend(struct client *c)
|
||||||
{
|
{
|
||||||
struct session *s = c->session;
|
struct session *s = c->session;
|
||||||
|
|
||||||
if (s == NULL || (c->flags & CLIENT_DETACHING))
|
if (s == NULL || (c->flags & CLIENT_DETACHING))
|
||||||
return;
|
return;
|
||||||
|
@ -342,7 +343,7 @@ server_client_suspend(struct client *c)
|
||||||
void
|
void
|
||||||
server_client_detach(struct client *c, enum msgtype msgtype)
|
server_client_detach(struct client *c, enum msgtype msgtype)
|
||||||
{
|
{
|
||||||
struct session *s = c->session;
|
struct session *s = c->session;
|
||||||
|
|
||||||
if (s == NULL || (c->flags & CLIENT_DETACHING))
|
if (s == NULL || (c->flags & CLIENT_DETACHING))
|
||||||
return;
|
return;
|
||||||
|
@ -1238,7 +1239,7 @@ server_client_check_redraw(struct client *c)
|
||||||
struct session *s = c->session;
|
struct session *s = c->session;
|
||||||
struct tty *tty = &c->tty;
|
struct tty *tty = &c->tty;
|
||||||
struct window_pane *wp;
|
struct window_pane *wp;
|
||||||
int needed, flags, masked;
|
int needed, flags, masked;
|
||||||
struct timeval tv = { .tv_usec = 1000 };
|
struct timeval tv = { .tv_usec = 1000 };
|
||||||
static struct event ev;
|
static struct event ev;
|
||||||
size_t left;
|
size_t left;
|
||||||
|
@ -1543,7 +1544,7 @@ static void
|
||||||
server_client_dispatch_identify(struct client *c, struct imsg *imsg)
|
server_client_dispatch_identify(struct client *c, struct imsg *imsg)
|
||||||
{
|
{
|
||||||
const char *data, *home;
|
const char *data, *home;
|
||||||
size_t datalen;
|
size_t datalen;
|
||||||
int flags;
|
int flags;
|
||||||
char *name;
|
char *name;
|
||||||
|
|
||||||
|
@ -1688,7 +1689,7 @@ void
|
||||||
server_client_push_stdout(struct client *c)
|
server_client_push_stdout(struct client *c)
|
||||||
{
|
{
|
||||||
struct msg_stdout_data data;
|
struct msg_stdout_data data;
|
||||||
size_t sent, left;
|
size_t sent, left;
|
||||||
|
|
||||||
left = EVBUFFER_LENGTH(c->stdout_data);
|
left = EVBUFFER_LENGTH(c->stdout_data);
|
||||||
while (left != 0) {
|
while (left != 0) {
|
||||||
|
@ -1729,7 +1730,7 @@ void
|
||||||
server_client_push_stderr(struct client *c)
|
server_client_push_stderr(struct client *c)
|
||||||
{
|
{
|
||||||
struct msg_stderr_data data;
|
struct msg_stderr_data data;
|
||||||
size_t sent, left;
|
size_t sent, left;
|
||||||
|
|
||||||
if (c->stderr_data == c->stdout_data) {
|
if (c->stderr_data == c->stdout_data) {
|
||||||
server_client_push_stdout(c);
|
server_client_push_stdout(c);
|
||||||
|
|
Loading…
Reference in New Issue