circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server-client.c
	tmux.1
This commit is contained in:
Thomas Adam
2017-04-06 11:10:17 +01:00
parent 05c97d7fe9 94b71bcb64
commit 5f662d91db
11 changed files with 78 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
format.c
View File

@@ -1159,11 +1159,11 @@ format_defaults_client(struct format_tree *ft, struct client *c)
if (ft->s == NULL)
ft->s = c->session;
format_add(ft, "client_name", "%s", c->name);
format_add(ft, "client_pid", "%ld", (long) c->pid);
format_add(ft, "client_height", "%u", tty->sy);
format_add(ft, "client_width", "%u", tty->sx);
if (tty->path != NULL)
format_add(ft, "client_tty", "%s", tty->path);
format_add(ft, "client_tty", "%s", c->ttyname);
format_add(ft, "client_control_mode", "%d",
!!(c->flags & CLIENT_CONTROL));