The branch, master has been updated
via 357da035b9d052b4cba8db806c6237272ade6673 (commit)
from 5aa54c863dad308e2ba96342be887eb59c427e42 (commit)
- Log -----------------------------------------------------------------
commit 357da035b9d052b4cba8db806c6237272ade6673
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge send-prefix into send-keys.
---
Makefile.am | 1 -
cmd-send-keys.c | 19 +++++++++++++++++
cmd-send-prefix.c | 57 -----------------------------------------------------
3 files changed, 19 insertions(+), 58 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 57534af..ddeacd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,7 +117,6 @@ dist_tmux_SOURCES = \
cmd-select-pane.c \
cmd-select-window.c \
cmd-send-keys.c \
- cmd-send-prefix.c \
cmd-server-info.c \
cmd-set-buffer.c \
cmd-set-environment.c \
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index e19ca3b..fbd0aca 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -39,6 +39,16 @@ const struct cmd_entry cmd_send_keys_entry = {
cmd_send_keys_exec
};
+const struct cmd_entry cmd_send_prefix_entry = {
+ "send-prefix", NULL,
+ "2t:", 0, 0,
+ "[-2] " CMD_TARGET_PANE_USAGE,
+ 0,
+ NULL,
+ NULL,
+ cmd_send_keys_exec
+};
+
enum cmd_retval
cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
{
@@ -52,6 +62,15 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL)
return (CMD_RETURN_ERROR);
+ if (self->entry == &cmd_send_prefix_entry) {
+ if (args_has(args, '2'))
+ key = options_get_number(&s->options, "prefix2");
+ else
+ key = options_get_number(&s->options, "prefix");
+ window_pane_key(wp, s, key);
+ return (CMD_RETURN_NORMAL);
+ }
+
if (args_has(args, 'R')) {
ictx = &wp->ictx;
diff --git a/cmd-send-prefix.c b/cmd-send-prefix.c
deleted file mode 100644
index 5dded95..0000000
--- a/cmd-send-prefix.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2007 Nicholas Marriott <n...@users.sourceforge.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 "tmux.h"
-
-/*
- * Send prefix key as a key.
- */
-
-enum cmd_retval cmd_send_prefix_exec(struct cmd *, struct cmd_ctx *);
-
-const struct cmd_entry cmd_send_prefix_entry = {
- "send-prefix", NULL,
- "2t:", 0, 0,
- "[-2] " CMD_TARGET_PANE_USAGE,
- 0,
- NULL,
- NULL,
- cmd_send_prefix_exec
-};
-
-enum cmd_retval
-cmd_send_prefix_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
- struct args *args = self->args;
- struct session *s;
- struct window_pane *wp;
- int key;
-
- if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL)
- return (CMD_RETURN_ERROR);
-
- if (args_has(args, '2'))
- key = options_get_number(&s->options, "prefix2");
- else
- key = options_get_number(&s->options, "prefix");
- window_pane_key(wp, s, key);
-
- return (CMD_RETURN_NORMAL);
-}
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
cmd-send-keys.c | 19 +++++++++++++++++
cmd-send-prefix.c | 57 -----------------------------------------------------
3 files changed, 19 insertions(+), 58 deletions(-)
delete mode 100644 cmd-send-prefix.c
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
