diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-30 13:45:56 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-30 13:45:56 +0000 |
commit | 071494d8faff83287088bbdcc38db1414c0123b9 (patch) | |
tree | 1f5caa38dbc76cf1ece9c51e63de2a8f25ddee2c /cmd-clear-history.c | |
parent | a87228b4ff85087600b0a077cb88b41506a60ff1 (diff) |
Merge pane number into the target specification for pane commands. Instead of
using -p index, a target pane is now addressed with the normal -t window form
but suffixed with a period and a pane index, for example :0.2 or
mysess:mywin.1. An unadorned number such as -t 1 is tried as a pane index in
the current window, if that fails the same rules are followed as for a target
window and the current pane in that window used.
As a side-effect this now means that swap-pane can swap panes between different
windows.
Note that this changes the syntax of the break-pane, clear-history, kill-pane,
resize-pane, select-pane and swap-pane commands.
Diffstat (limited to 'cmd-clear-history.c')
-rw-r--r-- | cmd-clear-history.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/cmd-clear-history.c b/cmd-clear-history.c index 2e4c118d..0a87b9b0 100644 --- a/cmd-clear-history.c +++ b/cmd-clear-history.c @@ -28,34 +28,25 @@ int cmd_clear_history_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_clear_history_entry = { "clear-history", "clearhist", - CMD_PANE_WINDOW_USAGE, + CMD_TARGET_PANE_USAGE, 0, 0, - cmd_pane_init, - cmd_pane_parse, + cmd_target_init, + cmd_target_parse, cmd_clear_history_exec, - cmd_pane_free, - cmd_pane_print + cmd_target_free, + cmd_target_print }; int cmd_clear_history_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_pane_data *data = self->data; + struct cmd_target_data *data = self->data; struct winlink *wl; struct window_pane *wp; struct grid *gd; - if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) + if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL) return (-1); - if (data->pane == -1) - wp = wl->window->active; - else { - wp = window_pane_at_index(wl->window, data->pane); - if (wp == NULL) { - ctx->error(ctx, "no pane: %d", data->pane); - return (-1); - } - } gd = wp->base.grid; grid_move_lines(gd, 0, gd->hsize, gd->sy); |