The branch, master has been updated
via 3a13e066ba184b1051167b0675bf9b4364af021e (commit)
via bcd9bcae2a9aa3a2553f546107b99431dbb6931f (commit)
from 939f796f086cac17ad0558b36fa87c55a9cb1a22 (commit)
- Log -----------------------------------------------------------------
commit 3a13e066ba184b1051167b0675bf9b4364af021e
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Allow the file descriptor received from the client to be -1 - it can be on
Cygwin when stdin is not a terminal. Reported by A Young, SF bug 52.
---
server-client.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server-client.c b/server-client.c
index 5923eb0..fa4d268 100644
--- a/server-client.c
+++ b/server-client.c
@@ -829,9 +829,6 @@ server_client_msg_dispatch(struct client *c)
#ifdef __CYGWIN__
imsg.fd = open(identifydata.ttyname, O_RDWR|O_NOCTTY);
#endif
- if (imsg.fd == -1)
- fatalx("MSG_IDENTIFY missing fd");
-
server_client_msg_identify(c, &identifydata, imsg.fd);
break;
case MSG_STDIN:
@@ -975,6 +972,8 @@ server_client_msg_identify(
return;
}
+ if (fd == -1)
+ return;
if (!isatty(fd)) {
close(fd);
return;
commit bcd9bcae2a9aa3a2553f546107b99431dbb6931f
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Add formats for window flags.
---
format.c | 9 +++++++++
tmux.1 | 4 ++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/format.c b/format.c
index 2275090..0845df6 100644
--- a/format.c
+++ b/format.c
@@ -410,6 +410,15 @@ format_winlink(struct format_tree *ft, struct session *s,
struct winlink *wl)
format_add(ft, "window_active", "%d", wl == s->curw);
format_add(ft, "window_panes", "%u", window_count_panes(w));
+ format_add(ft, "window_bell_flag", "%u",
+ !!(wl->flags & WINLINK_BELL));
+ format_add(ft, "window_content_flag", "%u",
+ !!(wl->flags & WINLINK_CONTENT));
+ format_add(ft, "window_activity_flag", "%u",
+ !!(wl->flags & WINLINK_ACTIVITY));
+ format_add(ft, "window_silence_flag", "%u",
+ !!(wl->flags & WINLINK_SILENCE));
+
free(flags);
free(layout);
}
diff --git a/tmux.1 b/tmux.1
index 1125179..340109b 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3096,6 +3096,9 @@ The following variables are available, where appropriate:
.It Li "session_width" Ta "" Ta "Width of session"
.It Li "session_windows" Ta "" Ta "Number of windows in session"
.It Li "window_active" Ta "" Ta "1 if window active"
+.It Li "window_activity_flag" Ta "" Ta "1 if window has activity alert"
+.It Li "window_bell_flag" Ta "" Ta "1 if window has bell"
+.It Li "window_content_flag" Ta "" Ta "1 if window has content alert"
.It Li "window_find_matches" Ta "" Ta "Matched data from the find-window"
.It Li "window_flags" Ta "#F" Ta "Window flags"
.It Li "window_height" Ta "" Ta "Height of window"
@@ -3104,6 +3107,7 @@ The following variables are available, where appropriate:
.It Li "window_layout" Ta "" Ta "Window layout description"
.It Li "window_name" Ta "#W" Ta "Name of window"
.It Li "window_panes" Ta "" Ta "Number of panes in window"
+.It Li "window_silence_flag" Ta "" Ta "1 if window has silence alert"
.It Li "window_width" Ta "" Ta "Width of window"
.It Li "wrap_flag" Ta "" Ta "Pane wrap flag"
.El
-----------------------------------------------------------------------
Summary of changes:
format.c | 9 +++++++++
server-client.c | 5 ++---
tmux.1 | 4 ++++
3 files changed, 15 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
