diff options
| -rw-r--r-- | usr.bin/tmux/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-respawn-pane.c | 92 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 19 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 3 |
5 files changed, 115 insertions, 6 deletions
diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile index 917d77efa34..6923c38ed30 100644 --- a/usr.bin/tmux/Makefile +++ b/usr.bin/tmux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2011/06/05 10:53:05 nicm Exp $ +# $OpenBSD: Makefile,v 1.53 2011/06/05 11:19:03 nicm Exp $ PROG= tmux SRCS= arguments.c attributes.c cfg.c client.c clock.c \ @@ -16,7 +16,7 @@ SRCS= arguments.c attributes.c cfg.c client.c clock.c \ cmd-lock-server.c \ cmd-move-window.c cmd-new-session.c cmd-new-window.c \ cmd-paste-buffer.c \ - cmd-refresh-client.c \ + cmd-refresh-client.c cmd-respawn-pane.c \ cmd-rename-session.c cmd-rename-window.c cmd-resize-pane.c \ cmd-respawn-window.c cmd-rotate-window.c cmd-save-buffer.c \ cmd-select-layout.c cmd-select-pane.c cmd-select-window.c \ diff --git a/usr.bin/tmux/cmd-respawn-pane.c b/usr.bin/tmux/cmd-respawn-pane.c new file mode 100644 index 00000000000..163d4674db9 --- /dev/null +++ b/usr.bin/tmux/cmd-respawn-pane.c @@ -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 <nicm@users.sourceforge.net> + * Copyright (c) 2011 Marcel P. Partap <mpartap@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); +} diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c index ed113411e91..f5699e4ed2b 100644 --- a/usr.bin/tmux/cmd.c +++ b/usr.bin/tmux/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.55 2011/06/05 10:53:05 nicm Exp $ */ +/* $OpenBSD: cmd.c,v 1.56 2011/06/05 11:19:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -80,6 +80,7 @@ const struct cmd_entry *cmd_table[] = { &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, diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 4b10437720c..19cdf1a0e06 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.233 2011/05/30 21:02:28 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.234 2011/06/05 11:19:03 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: May 30 2011 $ +.Dd $Mdocdate: June 5 2011 $ .Dt TMUX 1 .Os .Sh NAME @@ -1307,6 +1307,21 @@ and to the right with 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 diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index fe5967c1c56..86ecdf62d77 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.289 2011/06/05 10:53:05 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.290 2011/06/05 11:19:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1584,6 +1584,7 @@ extern const struct cmd_entry cmd_refresh_client_entry; 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; |