The branch, hooks has been updated
via 0076ed760a51cd2c8e99ef7bbdaf891438f4754a (commit)
via a6bf9896d54ceae05f3b1b88d82f60b1a9941316 (commit)
via e8cd02fee809ba1869d019881dceed7947f381d6 (commit)
via b9973b04d1fc89e9c13c939605c4df0358577579 (commit)
via e95b445dd087871b9863a9dbdd17865c5e2b5578 (commit)
from 6c846865fa93128670feb9440f78a82e928be572 (commit)
- Log -----------------------------------------------------------------
commit 0076ed760a51cd2c8e99ef7bbdaf891438f4754a
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Prep flags for paste-buffer.
---
cmd-paste-buffer.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
index 5d91aef..1a9a0d6 100644
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_paste_buffer_entry = {
"paste-buffer", "pasteb",
"db:prs:t:", 0, 0,
"[-dpr] [-s separator] " CMD_BUFFER_USAGE " " CMD_TARGET_PANE_USAGE,
- 0,
+ CMD_PREP_PANE_T,
cmd_paste_buffer_exec
};
@@ -44,14 +44,10 @@ enum cmd_retval
cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct window_pane *wp;
- struct session *s;
+ struct window_pane *wp = cmdq->state.tflag.wp;
struct paste_buffer *pb;
const char *sepstr, *bufname;
- if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
- return (CMD_RETURN_ERROR);
-
bufname = NULL;
if (args_has(args, 'b'))
bufname = args_get(args, 'b');
commit a6bf9896d54ceae05f3b1b88d82f60b1a9941316
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Use prep flags for rename- and respawn-window.
---
cmd-rename-window.c | 8 ++------
cmd-respawn-window.c | 16 ++++++----------
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/cmd-rename-window.c b/cmd-rename-window.c
index 2f677a4..a29c5ad 100644
--- a/cmd-rename-window.c
+++ b/cmd-rename-window.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_rename_window_entry = {
"rename-window", "renamew",
"t:", 1, 1,
CMD_TARGET_WINDOW_USAGE " new-name",
- 0,
+ CMD_PREP_WINDOW_T,
cmd_rename_window_exec
};
@@ -40,11 +40,7 @@ enum cmd_retval
cmd_rename_window_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct session *s;
- struct winlink *wl;
-
- if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
- return (CMD_RETURN_ERROR);
+ struct winlink *wl = cmdq->state.tflag.wl;
window_set_name(wl->window, args->argv[0]);
options_set_number(&wl->window->options, "automatic-rename", 0);
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c
index 06102ed..779324a 100644
--- a/cmd-respawn-window.c
+++ b/cmd-respawn-window.c
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_respawn_window_entry = {
"respawn-window", "respawnw",
"kt:", 0, -1,
"[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
- 0,
+ CMD_PREP_WINDOW_T,
cmd_respawn_window_exec
};
@@ -41,25 +41,21 @@ enum cmd_retval
cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct winlink *wl;
- struct window *w;
+ struct session *s = cmdq->state.tflag.s;
+ struct winlink *wl = cmdq->state.tflag.wl;
+ struct window *w = wl->window;
struct window_pane *wp;
- struct session *s;
struct environ env;
const char *path;
char *cause;
struct environ_entry *envent;
- if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
- return (CMD_RETURN_ERROR);
- w = wl->window;
-
if (!args_has(self->args, 'k')) {
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp->fd == -1)
continue;
- cmdq_error(cmdq,
- "window still active: %s:%d", s->name, wl->idx);
+ cmdq_error(cmdq, "window still active: %s:%d", s->name,
+ wl->idx);
return (CMD_RETURN_ERROR);
}
}
commit e8cd02fee809ba1869d019881dceed7947f381d6
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Use for prepare flags for choose-buffer and choose-tree.
---
cmd-choose-buffer.c | 11 ++++-------
cmd-choose-tree.c | 17 +++++++----------
cmd-copy-mode.c | 1 -
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c
index 19f5fba..88849e5 100644
--- a/cmd-choose-buffer.c
+++ b/cmd-choose-buffer.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_choose_buffer_entry = {
"choose-buffer", NULL,
"F:t:", 0, 1,
CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
- 0,
+ CMD_PREP_WINDOW_T,
cmd_choose_buffer_exec
};
@@ -44,25 +44,22 @@ enum cmd_retval
cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct client *c;
+ struct client *c = cmdq->state.c;
+ struct winlink *wl = cmdq->state.tflag.wl;
struct window_choose_data *cdata;
- struct winlink *wl;
struct paste_buffer *pb;
char *action, *action_data;
const char *template;
u_int idx;
int utf8flag;
- if ((c = cmd_current_client(cmdq)) == NULL) {
+ if (c == NULL) {
cmdq_error(cmdq, "no client available");
return (CMD_RETURN_ERROR);
}
if ((template = args_get(args, 'F')) == NULL)
template = CHOOSE_BUFFER_TEMPLATE;
-
- if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
- return (CMD_RETURN_ERROR);
utf8flag = options_get_number(&wl->window->options, "utf8");
if (paste_get_top() == NULL)
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 823d042..a35f56f 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -48,7 +48,7 @@ const struct cmd_entry cmd_choose_tree_entry = {
"S:W:swub:c:t:", 0, 1,
"[-suw] [-b session-template] [-c window template] [-S format] " \
"[-W format] " CMD_TARGET_WINDOW_USAGE,
- 0,
+ CMD_PREP_WINDOW_T,
cmd_choose_tree_exec
};
@@ -56,7 +56,7 @@ const struct cmd_entry cmd_choose_session_entry = {
"choose-session", NULL,
"F:t:", 0, 1,
CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
- 0,
+ CMD_PREP_WINDOW_T,
cmd_choose_tree_exec
};
@@ -64,7 +64,7 @@ const struct cmd_entry cmd_choose_window_entry = {
"choose-window", NULL,
"F:t:", 0, 1,
CMD_TARGET_WINDOW_USAGE "[-F format] [template]",
- 0,
+ CMD_PREP_WINDOW_T,
cmd_choose_tree_exec
};
@@ -72,9 +72,9 @@ enum cmd_retval
cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct winlink *wl, *wm;
- struct session *s, *s2;
- struct client *c;
+ struct client *c = cmdq->state.c;
+ struct winlink *wl = cmdq->state.tflag.wl, *wm;
+ struct session *s = cmdq->state.tflag.s, *s2;
struct window_choose_data *wcd = NULL;
const char *ses_template, *win_template;
char *final_win_action, *cur_win_template;
@@ -87,14 +87,11 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
ses_template = win_template = NULL;
ses_action = win_action = NULL;
- if ((c = cmd_current_client(cmdq)) == NULL) {
+ if (c == NULL) {
cmdq_error(cmdq, "no client available");
return (CMD_RETURN_ERROR);
}
- if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
- return (CMD_RETURN_ERROR);
-
if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
return (CMD_RETURN_NORMAL);
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 055b9d6..9cf526c 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -37,7 +37,6 @@ const struct cmd_entry cmd_copy_mode_entry = {
enum cmd_retval
cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
{
- struct args *args = self->args;
struct window_pane *wp = cmdq->state.tflag.wp;
if (wp->mode != &window_copy_mode) {
commit b9973b04d1fc89e9c13c939605c4df0358577579
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Use new prepare flags for copy-mode.
---
cmd-copy-mode.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 8933529..055b9d6 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -30,7 +30,7 @@ const struct cmd_entry cmd_copy_mode_entry = {
"copy-mode", NULL,
"t:u", 0, 0,
"[-u] " CMD_TARGET_PANE_USAGE,
- 0,
+ CMD_PREP_PANE_T,
cmd_copy_mode_exec
};
@@ -38,10 +38,7 @@ enum cmd_retval
cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct window_pane *wp;
-
- if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
- return (CMD_RETURN_ERROR);
+ struct window_pane *wp = cmdq->state.tflag.wp;
if (wp->mode != &window_copy_mode) {
if (window_pane_set_mode(wp, &window_copy_mode) != 0)
commit e95b445dd087871b9863a9dbdd17865c5e2b5578
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Use new prepare flags capture-pane.
---
cmd-capture-pane.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
index ce60b4c..16008aa 100644
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_capture_pane_entry = {
"ab:CeE:JpPqS:t:", 0, 0,
"[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] [-S start-line]"
CMD_TARGET_PANE_USAGE,
- 0,
+ CMD_PREP_PANE_T,
cmd_capture_pane_exec
};
@@ -173,14 +173,11 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_q
*cmdq)
{
struct args *args = self->args;
struct client *c;
- struct window_pane *wp;
+ struct window_pane *wp = cmdq->state.tflag.wp;
char *buf, *cause;
const char *bufname;
size_t len;
- if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
- return (CMD_RETURN_ERROR);
-
len = 0;
if (args_has(args, 'P'))
buf = cmd_capture_pane_pending(args, wp, &len);
-----------------------------------------------------------------------
Summary of changes:
cmd-capture-pane.c | 7 ++-----
cmd-choose-buffer.c | 11 ++++-------
cmd-choose-tree.c | 17 +++++++----------
cmd-copy-mode.c | 8 ++------
cmd-paste-buffer.c | 8 ++------
cmd-rename-window.c | 8 ++------
cmd-respawn-window.c | 16 ++++++----------
7 files changed, 25 insertions(+), 50 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
