The branch, hooks has been updated
via ab0bed54927e8955ad76c8cb694f2312868fc614 (commit)
via db1566de733e6a784d5cf1817ce229061242bd7a (commit)
via 4a2bc259cfe4961a74fec11889407d2f7c066175 (commit)
via 1925534351c944418266549c733b126b4882a83f (commit)
via 5016805fc90369ef07d204d1e392bf5a44d532d1 (commit)
from c6ac06cba8a9ab6871dcb82bb7a3c8d6b577ab8f (commit)
- Log -----------------------------------------------------------------
commit ab0bed54927e8955ad76c8cb694f2312868fc614
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Convert list-panes and friends to use prepare flags
---
cmd-list-panes.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/cmd-list-panes.c b/cmd-list-panes.c
index 7f62177..f08f79b 100644
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -39,7 +39,7 @@ const struct cmd_entry cmd_list_panes_entry = {
"list-panes", "lsp",
"asF:t:", 0, 0,
"[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
- 0,
+ CMD_PREP_WINDOW_T,
cmd_list_panes_exec
};
@@ -47,22 +47,15 @@ enum cmd_retval
cmd_list_panes_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct session *s;
- struct winlink *wl;
+ struct session *s = cmdq->state.tflag.s;
+ struct winlink *wl = cmdq->state.tflag.wl;
if (args_has(args, 'a'))
cmd_list_panes_server(self, cmdq);
- else if (args_has(args, 's')) {
- s = cmd_find_session(cmdq, args_get(args, 't'), 0);
- if (s == NULL)
- return (CMD_RETURN_ERROR);
+ else if (args_has(args, 's'))
cmd_list_panes_session(self, s, cmdq, 1);
- } else {
- wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
- if (wl == NULL)
- return (CMD_RETURN_ERROR);
+ else
cmd_list_panes_window(self, s, wl, cmdq, 0);
- }
return (CMD_RETURN_NORMAL);
}
commit db1566de733e6a784d5cf1817ce229061242bd7a
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Convert select-window and friends to use prepare flags
---
cmd-select-window.c | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/cmd-select-window.c b/cmd-select-window.c
index f530f1f..44fc015 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_select_window_entry = {
"select-window", "selectw",
"lnpTt:", 0, 0,
"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
- 0,
+ CMD_PREP_WINDOW_T,
cmd_select_window_exec
};
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_next_window_entry = {
"next-window", "next",
"at:", 0, 0,
"[-a] " CMD_TARGET_SESSION_USAGE,
- 0,
+ CMD_PREP_SESSION_T,
cmd_select_window_exec
};
@@ -48,7 +48,7 @@ const struct cmd_entry cmd_previous_window_entry = {
"previous-window", "prev",
"at:", 0, 0,
"[-a] " CMD_TARGET_SESSION_USAGE,
- 0,
+ CMD_PREP_SESSION_T,
cmd_select_window_exec
};
@@ -56,16 +56,15 @@ const struct cmd_entry cmd_last_window_entry = {
"last-window", "last",
"t:", 0, 0,
CMD_TARGET_SESSION_USAGE,
- 0,
+ CMD_PREP_SESSION_T,
cmd_select_window_exec
};
enum cmd_retval
cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
{
- struct args *args = self->args;
- struct winlink *wl;
- struct session *s;
+ struct winlink *wl = cmdq->state.tflag.wl;
+ struct session *s = cmdq->state.tflag.s;
int next, previous, last, activity;
next = self->entry == &cmd_next_window_entry;
@@ -79,10 +78,6 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
last = 1;
if (next || previous || last) {
- s = cmd_find_session(cmdq, args_get(args, 't'), 0);
- if (s == NULL)
- return (CMD_RETURN_ERROR);
-
activity = args_has(self->args, 'a');
if (next) {
if (session_next(s, activity) != 0) {
@@ -103,10 +98,6 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
server_redraw_session(s);
} else {
- wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
- if (wl == NULL)
- return (CMD_RETURN_ERROR);
-
/*
* If -T and select-window is invoked on same window as
* current, switch to previous window.
commit 4a2bc259cfe4961a74fec11889407d2f7c066175
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Convert kill-window to use prepare flags
---
cmd-kill-window.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index d402acc..a2b89b3 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -30,7 +30,7 @@ const struct cmd_entry cmd_kill_window_entry = {
"kill-window", "killw",
"at:", 0, 0,
"[-a] " CMD_TARGET_WINDOW_USAGE,
- 0,
+ CMD_PREP_WINDOW_T,
cmd_kill_window_exec
};
@@ -38,7 +38,7 @@ const struct cmd_entry cmd_unlink_window_entry = {
"unlink-window", "unlinkw",
"kt:", 0, 0,
"[-k] " CMD_TARGET_WINDOW_USAGE,
- 0,
+ CMD_PREP_WINDOW_T,
cmd_kill_window_exec
};
@@ -46,16 +46,12 @@ enum cmd_retval
cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct winlink *wl, *wl2, *wl3;
- struct window *w;
- struct session *s;
+ struct winlink *wl = cmdq->state.tflag.wl, *wl2, *wl3;
+ struct window *w = wl->window;
+ struct session *s = cmdq->state.tflag.s;
struct session_group *sg;
u_int references;
- if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
- return (CMD_RETURN_ERROR);
- w = wl->window;
-
if (self->entry == &cmd_unlink_window_entry) {
sg = session_group_find(s);
if (sg != NULL)
commit 1925534351c944418266549c733b126b4882a83f
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Convert kill-pane to use prepare flags
---
cmd-kill-pane.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index f4735fd..20a2b8c 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -32,19 +32,16 @@ const struct cmd_entry cmd_kill_pane_entry = {
"kill-pane", "killp",
"at:", 0, 0,
"[-a] " CMD_TARGET_PANE_USAGE,
- 0,
+ CMD_PREP_PANE_T,
cmd_kill_pane_exec
};
enum cmd_retval
cmd_kill_pane_exec(struct cmd *self, struct cmd_q *cmdq)
{
- struct args *args = self->args;
- struct winlink *wl;
- struct window_pane *loopwp, *tmpwp, *wp;
+ struct winlink *wl = cmdq->state.tflag.wl;
+ struct window_pane *loopwp, *tmpwp, *wp = cmdq->state.tflag.wp;
- if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
- return (CMD_RETURN_ERROR);
server_unzoom_window(wl->window);
if (window_count_panes(wl->window) == 1) {
commit 5016805fc90369ef07d204d1e392bf5a44d532d1
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Convert find-window to use prepare flags
---
cmd-find-window.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/cmd-find-window.c b/cmd-find-window.c
index 88e4879..3dcc782 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -51,7 +51,7 @@ const struct cmd_entry cmd_find_window_entry = {
"find-window", "findw",
"F:CNt:T", 1, 4,
"[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
- 0,
+ CMD_PREP_WINDOW_T,
cmd_find_window_exec
};
@@ -134,7 +134,7 @@ enum cmd_retval
cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct client *c;
+ struct client *c = cmdq->state.c;
struct window_choose_data *cdata;
struct session *s;
struct winlink *wl, *wm;
@@ -143,14 +143,8 @@ cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
const char *template;
u_int i, match_flags;
- if ((c = cmd_current_client(cmdq)) == NULL) {
- cmdq_error(cmdq, "no client available");
- return (CMD_RETURN_ERROR);
- }
s = c->session;
-
- if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
- return (CMD_RETURN_ERROR);
+ wl = cmdq->state.tflag.wl;
if ((template = args_get(args, 'F')) == NULL)
template = FIND_WINDOW_TEMPLATE;
-----------------------------------------------------------------------
Summary of changes:
cmd-find-window.c | 12 +++---------
cmd-kill-pane.c | 9 +++------
cmd-kill-window.c | 14 +++++---------
cmd-list-panes.c | 17 +++++------------
cmd-select-window.c | 21 ++++++---------------
5 files changed, 22 insertions(+), 51 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
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
