cvsimport

scgilardi · Apr 18, 2011 · 194f3c2 · 194f3c2
2 parents 177fa75 + 6f27e24
commit 194f3c2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/cmd-detach-client.c b/cmd-detach-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-detach-client.c,v 1.14 2011/04/11 06:44:56 nicm Exp $ */
+/* $Id: cmd-detach-client.c,v 1.15 2011/04/18 21:06:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_detach_client_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_detach_client_entry = {
 	"detach-client", "detach",
 	"s:t:P", 0, 0,
-	"[-P] " CMD_TARGET_CLIENT_USAGE,
+	"[-P] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
 	CMD_READONLY,
 	NULL,
 	NULL,

diff --git a/options-table.c b/options-table.c
@@ -1,4 +1,4 @@
-/* $Id: options-table.c,v 1.4 2011/01/21 23:54:19 tcunha Exp $ */
+/* $Id: options-table.c,v 1.6 2011/04/18 21:03:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -54,7 +54,7 @@ const struct options_table_entry server_options_table[] = {
 	  .type = OPTIONS_TABLE_NUMBER,
 	  .minimum = 1,
 	  .maximum = INT_MAX,
-	  .default_num = 9
+	  .default_num = 20
 	},
 
 	{ .name = "escape-time",

diff --git a/osdep-openbsd.c b/osdep-openbsd.c
@@ -1,4 +1,4 @@
-/* $Id: osdep-openbsd.c,v 1.22 2010/12/30 20:42:39 nicm Exp $ */
+/* $Id: osdep-openbsd.c,v 1.23 2011/04/18 21:03:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -35,12 +35,12 @@
 #define is_stopped(p) \
 	((p)->p_stat == SSTOP || (p)->p_stat == SZOMB || (p)->p_stat == SDEAD)
 
-struct kinfo_proc2	*cmp_procs(struct kinfo_proc2 *, struct kinfo_proc2 *);
+struct kinfo_proc	*cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
 char			*osdep_get_name(int, char *);
 struct event_base	*osdep_event_init(void);
 
-struct kinfo_proc2 *
-cmp_procs(struct kinfo_proc2 *p1, struct kinfo_proc2 *p2)
+struct kinfo_proc *
+cmp_procs(struct kinfo_proc *p1, struct kinfo_proc *p2)
 {
 	if (is_runnable(p1) && !is_runnable(p2))
 		return (p1);
@@ -80,11 +80,11 @@ cmp_procs(struct kinfo_proc2 *p1, struct kinfo_proc2 *p2)
 char *
 osdep_get_name(int fd, char *tty)
 {
-	int		 mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PGRP, 0,
-				    sizeof(struct kinfo_proc2), 0 };
+	int		 mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, 0,
+				    sizeof(struct kinfo_proc), 0 };
 	struct stat	 sb;
 	size_t		 len;
-	struct kinfo_proc2 *buf, *newbuf, *bestp;
+	struct kinfo_proc *buf, *newbuf, *bestp;
 	u_int		 i;
 	char		*name;
 
@@ -104,15 +104,15 @@ osdep_get_name(int fd, char *tty)
 		goto error;
 	buf = newbuf;
 
-	mib[5] = (int)(len / sizeof(struct kinfo_proc2));
+	mib[5] = (int)(len / sizeof(struct kinfo_proc));
 	if (sysctl(mib, nitems(mib), buf, &len, NULL, 0) == -1) {
 		if (errno == ENOMEM)
 			goto retry;
 		goto error;
 	}
 
 	bestp = NULL;
-	for (i = 0; i < len / sizeof (struct kinfo_proc2); i++) {
+	for (i = 0; i < len / sizeof (struct kinfo_proc); i++) {
 		if ((dev_t)buf[i].p_tdev != sb.st_rdev)
 			continue;
 		if (bestp == NULL)

diff --git a/screen-write.c b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.95 2011/03/24 17:03:29 micahcowan Exp $ */
+/* $Id: screen-write.c,v 1.96 2011/04/18 21:06:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1048,7 +1048,7 @@ screen_write_cell(struct screen_write_ctx *ctx,
 
 	/* Sanity checks. */
 	if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width)
-	    || s->cy > screen_size_y(s) - width)
+	    || s->cy > screen_size_y(s) - 1)
 		return;
 
 	/* Handle overwriting of UTF-8 characters. */

diff --git a/tmux.1 b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.304 2011/04/11 06:44:56 nicm Exp $
+.\" $Id: tmux.1,v 1.306 2011/04/18 21:06:25 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 5 2011 $
+.Dd $Mdocdate: April 18 2011 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -579,8 +579,8 @@ recently used
 session.
 .It Xo Ic detach-client
 .Op Fl P
-.Op Fl t Ar target-client
 .Op Fl s Ar target-session
+.Op Fl t Ar target-client
 .Xc
 .D1 (alias: Ic detach )
 Detach the current client if bound to a key, the client specified with
@@ -602,9 +602,12 @@ server and clients and destroy all sessions.
 .It Ic kill-session Op Fl t Ar target-session
 Destroy the given session, closing any windows linked to it and no other
 sessions, and detaching all clients attached to it.
-.It Ic list-clients
+.It Ic list-clients Op Fl t Ar target-session
 .D1 (alias: Ic lsc )
 List all clients attached to the server.
+If
+.Ar target-session
+is specified, list only clients connected to that session.
 .It Ic list-commands
 .D1 (alias: Ic lscm )
 List the syntax of all commands supported by
@@ -1897,6 +1900,11 @@ If on,
 captures the mouse and when a window is split into multiple panes the mouse may
 be used to select the current pane.
 The mouse click is also passed through to the application as normal.
+.It Xo Ic mouse-select-window
+.Op Ic on | off
+.Xc
+If on, clicking the mouse on a window name in the status line will select that
+window.
 .It Ic pane-active-border-bg Ar colour
 .It Ic pane-active-border-fg Ar colour
 Set the pane border colour for the currently active pane.