Revision: 2529
http://tmux.svn.sourceforge.net/tmux/?rev=2529&view=rev
Author: nicm
Date: 2011-06-23 19:23:12 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
PatchSet 924
Date: 2011/06/05 12:19:03
Author: nicm
Branch: HEAD
Tag: (none)
Log:
Add a respawn-pane command, from Marcel Partap.
Modified Paths:
--------------
trunk/Makefile.am
trunk/cmd.c
trunk/tmux.1
trunk/tmux.h
Added Paths:
-----------
trunk/cmd-respawn-pane.c
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2011-06-23 19:22:01 UTC (rev 2528)
+++ trunk/Makefile.am 2011-06-23 19:23:12 UTC (rev 2529)
@@ -110,6 +110,7 @@
cmd-rename-session.c \
cmd-rename-window.c \
cmd-resize-pane.c \
+ cmd-respawn-pane.c \
cmd-respawn-window.c \
cmd-rotate-window.c \
cmd-run-shell.c \
Added: trunk/cmd-respawn-pane.c
===================================================================
--- trunk/cmd-respawn-pane.c (rev 0)
+++ trunk/cmd-respawn-pane.c 2011-06-23 19:23:12 UTC (rev 2529)
@@ -0,0 +1,92 @@
+/* $Id: cmd-respawn-pane.c,v 1.1 2011/06/05 11:19:03 nicm Exp $ */
+
+/*
+ * Copyright (c) 2008 Nicholas Marriott <n...@users.sourceforge.net>
+ * Copyright (c) 2011 Marcel P. Partap <mpar...@gmx.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <unistd.h>
+
+#include "tmux.h"
+
+/*
+ * Respawn a pane (restart the command). Kill existing if -k given.
+ */
+
+int cmd_respawn_pane_exec(struct cmd *, struct cmd_ctx *);
+
+const struct cmd_entry cmd_respawn_pane_entry = {
+ "respawn-pane", "respawnp",
+ "kt:", 0, 1,
+ "[-k] " CMD_TARGET_PANE_USAGE " [command]",
+ 0,
+ NULL,
+ NULL,
+ cmd_respawn_pane_exec
+};
+
+int
+cmd_respawn_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+ struct args *args = self->args;
+ struct winlink *wl;
+ struct window *w;
+ struct window_pane *wp;
+ u_int hlimit;
+ struct session *s;
+ struct environ env;
+ const char *cmd;
+ char *cause;
+
+ if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
+ return (-1);
+ w = wl->window;
+
+ if (!args_has(self->args, 'k') && wp->fd != -1) {
+ ctx->error(ctx, "pane still active: %s:%u.%u",
+ s->name, wl->idx, window_pane_index(w, wp));
+ return (-1);
+ }
+
+ environ_init(&env);
+ environ_copy(&global_environ, &env);
+ environ_copy(&s->environ, &env);
+ server_fill_environ(s, &env);
+
+ window_pane_reset_mode(wp);
+ screen_free(&wp->base);
+ hlimit = options_get_number(&s->options, "history-limit");
+ screen_init(&wp->base, wp->sx, wp->sy, hlimit);
+ wp->screen = &wp->base;
+ input_init(wp);
+
+ if (args->argc != 0)
+ cmd = args->argv[0];
+ else
+ cmd = NULL;
+ if (window_pane_spawn(wp, cmd, NULL, NULL, &env, s->tio, &cause) != 0) {
+ ctx->error(ctx, "respawn pane failed: %s", cause);
+ xfree(cause);
+ environ_free(&env);
+ return (-1);
+ }
+ wp->flags |= PANE_REDRAW;
+ server_status_window(w);
+
+ environ_free(&env);
+ return (0);
+}
Modified: trunk/cmd.c
===================================================================
--- trunk/cmd.c 2011-06-23 19:22:01 UTC (rev 2528)
+++ trunk/cmd.c 2011-06-23 19:23:12 UTC (rev 2529)
@@ -79,6 +79,7 @@
&cmd_rename_session_entry,
&cmd_rename_window_entry,
&cmd_resize_pane_entry,
+ &cmd_respawn_pane_entry,
&cmd_respawn_window_entry,
&cmd_rotate_window_entry,
&cmd_run_shell_entry,
Modified: trunk/tmux.1
===================================================================
--- trunk/tmux.1 2011-06-23 19:22:01 UTC (rev 2528)
+++ trunk/tmux.1 2011-06-23 19:23:12 UTC (rev 2529)
@@ -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: May 30 2011 $
+.Dd $Mdocdate: June 5 2011 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -1311,6 +1311,21 @@
The
.Ar adjustment
is given in lines or cells (the default is 1).
+.It Xo Ic respawn-pane
+.Op Fl k
+.Op Fl t Ar target-pane
+.Op Ar shell-command
+.Xc
+.D1 (alias: Ic respawnp )
+Reactivate a pane in which the command has exited (see the
+.Ic remain-on-exit
+window option).
+If
+.Ar shell-command
+is not given, the command used when the pane was created is executed.
+The pane must be already inactive, unless
+.Fl k
+is given, in which case any existing command is killed.
.It Xo Ic respawn-window
.Op Fl k
.Op Fl t Ar target-window
Modified: trunk/tmux.h
===================================================================
--- trunk/tmux.h 2011-06-23 19:22:01 UTC (rev 2528)
+++ trunk/tmux.h 2011-06-23 19:23:12 UTC (rev 2529)
@@ -1580,6 +1580,7 @@
extern const struct cmd_entry cmd_rename_session_entry;
extern const struct cmd_entry cmd_rename_window_entry;
extern const struct cmd_entry cmd_resize_pane_entry;
+extern const struct cmd_entry cmd_respawn_pane_entry;
extern const struct cmd_entry cmd_respawn_window_entry;
extern const struct cmd_entry cmd_rotate_window_entry;
extern const struct cmd_entry cmd_run_shell_entry;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
