Permit commands to be bound to key presses without the prefix key first. The

new -n flag to bind-key and unbind-key sets or removes these bindings, and
list-key shows them in []s.

1 files changed, 9 insertions, 7 deletions

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 2d9e7ec4f10..6dc712b1546 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.53 2009/07/23 20:24:27 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.54 2009/07/24 14:52:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -102,10 +102,12 @@ struct buffer {
 #define BELL_CURRENT 2
 
 /* Key codes. ncurses defines KEY_*. Grrr. */
-#define KEYC_NONE    0x0fff
-#define KEYC_ESCAPE  0x2000
-#define KEYC_CTRL    0x4000
-#define KEYC_SHIFT   0x8000
+#define KEYC_NONE 0xfff
+/* 0x1000 is base for special keys */
+#define KEYC_ESCAPE 0x2000
+#define KEYC_CTRL 0x4000
+#define KEYC_SHIFT 0x8000
+#define KEYC_PREFIX 0x10000
 
 enum key_code {
 	/* Mouse key. */
@@ -856,8 +858,6 @@ struct client_ctx {
 
 /* Key/command line command. */
 struct cmd_ctx {
-	struct client  *cmdclient;
-
 	/*
 	 * curclient is the client where this command was executed if inside
 	 * tmux. This is NULL if the command came from the command-line.
@@ -869,6 +869,8 @@ struct cmd_ctx {
 	 * configuration file.
 	 */
 	struct client  *curclient;
+	struct client  *cmdclient;
+
 	struct session *cursession;
 
 	struct msg_command_data	*msgdata;