mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-23 08:33:17 +01:00
Sync OpenBSD patchset 175:
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.
This commit is contained in:
Tiago Cunha
parent
744ccb7cc9
commit
28cf7dc39e
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-bind-key.c,v 1.22 2009-07-14 06:43:32 nicm Exp $ */
|
||||
/* $Id: cmd-bind-key.c,v 1.23 2009-07-25 08:52:04 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -39,7 +39,7 @@ struct cmd_bind_key_data {
|
||||
|
||||
const struct cmd_entry cmd_bind_key_entry = {
|
||||
"bind-key", "bind",
|
||||
"[-r] key command [arguments]",
|
||||
"[-nr] key command [arguments]",
|
||||
0, 0,
|
||||
NULL,
|
||||
cmd_bind_key_parse,
|
||||
@ -54,14 +54,17 @@ int
|
||||
cmd_bind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
|
||||
{
|
||||
struct cmd_bind_key_data *data;
|
||||
int opt;
|
||||
int opt, no_prefix = 0;
|
||||
|
||||
self->data = data = xmalloc(sizeof *data);
|
||||
data->can_repeat = 0;
|
||||
data->cmdlist = NULL;
|
||||
|
||||
while ((opt = getopt(argc, argv, "r")) != -1) {
|
||||
while ((opt = getopt(argc, argv, "nr")) != -1) {
|
||||
switch (opt) {
|
||||
case 'n':
|
||||
no_prefix = 1;
|
||||
break;
|
||||
case 'r':
|
||||
data->can_repeat = 1;
|
||||
break;
|
||||
@ -78,6 +81,8 @@ cmd_bind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
|
||||
xasprintf(cause, "unknown key: %s", argv[0]);
|
||||
goto error;
|
||||
}
|
||||
if (!no_prefix)
|
||||
data->key |= KEYC_PREFIX;
|
||||
|
||||
argc--;
|
||||
argv++;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-list-keys.c,v 1.16 2009-07-22 17:53:27 tcunha Exp $ */
|
||||
/* $Id: cmd-list-keys.c,v 1.17 2009-07-25 08:52:04 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -46,27 +46,33 @@ cmd_list_keys_exec(unused struct cmd *self, struct cmd_ctx *ctx)
|
||||
{
|
||||
struct key_binding *bd;
|
||||
const char *key;
|
||||
char tmp[BUFSIZ];
|
||||
char tmp[BUFSIZ], keytmp[64];
|
||||
int width, keywidth;
|
||||
|
||||
width = 0;
|
||||
SPLAY_FOREACH(bd, key_bindings, &key_bindings) {
|
||||
if ((key = key_string_lookup_key(bd->key)) == NULL)
|
||||
key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
|
||||
if (key == NULL)
|
||||
continue;
|
||||
|
||||
keywidth = strlen(key) + 1;
|
||||
if (!(bd->key & KEYC_PREFIX))
|
||||
keywidth += 2;
|
||||
if (keywidth > width)
|
||||
width = keywidth;
|
||||
}
|
||||
|
||||
|
||||
SPLAY_FOREACH(bd, key_bindings, &key_bindings) {
|
||||
if ((key = key_string_lookup_key(bd->key)) == NULL)
|
||||
key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
|
||||
if (key == NULL)
|
||||
continue;
|
||||
|
||||
*tmp = '\0';
|
||||
cmd_list_print(bd->cmdlist, tmp, sizeof tmp);
|
||||
|
||||
if (!(bd->key & KEYC_PREFIX)) {
|
||||
xsnprintf(keytmp, sizeof keytmp, "[%s]", key);
|
||||
key = keytmp;
|
||||
}
|
||||
ctx->print(ctx, "%*s: %s", width, key, tmp);
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-unbind-key.c,v 1.17 2009-07-14 06:43:33 nicm Exp $ */
|
||||
/* $Id: cmd-unbind-key.c,v 1.18 2009-07-25 08:52:04 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -36,7 +36,7 @@ struct cmd_unbind_key_data {
|
||||
|
||||
const struct cmd_entry cmd_unbind_key_entry = {
|
||||
"unbind-key", "unbind",
|
||||
"key",
|
||||
"[-n] key",
|
||||
0, 0,
|
||||
NULL,
|
||||
cmd_unbind_key_parse,
|
||||
@ -51,12 +51,15 @@ int
|
||||
cmd_unbind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
|
||||
{
|
||||
struct cmd_unbind_key_data *data;
|
||||
int opt;
|
||||
int opt, no_prefix = 0;
|
||||
|
||||
self->data = data = xmalloc(sizeof *data);
|
||||
|
||||
while ((opt = getopt(argc, argv, "")) != -1) {
|
||||
while ((opt = getopt(argc, argv, "n")) != -1) {
|
||||
switch (opt) {
|
||||
case 'n':
|
||||
no_prefix = 1;
|
||||
break;
|
||||
default:
|
||||
goto usage;
|
||||
}
|
||||
@ -70,6 +73,8 @@ cmd_unbind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
|
||||
xasprintf(cause, "unknown key: %s", argv[0]);
|
||||
goto error;
|
||||
}
|
||||
if (!no_prefix)
|
||||
data->key |= KEYC_PREFIX;
|
||||
|
||||
return (0);
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: key-bindings.c,v 1.78 2009-07-22 16:24:59 tcunha Exp $ */
|
||||
/* $Id: key-bindings.c,v 1.79 2009-07-25 08:52:04 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -32,7 +32,18 @@ struct key_bindings dead_key_bindings;
|
||||
int
|
||||
key_bindings_cmp(struct key_binding *bd1, struct key_binding *bd2)
|
||||
{
|
||||
return (bd1->key - bd2->key);
|
||||
int key1, key2;
|
||||
|
||||
key1 = bd1->key & ~KEYC_PREFIX;
|
||||
key2 = bd2->key & ~KEYC_PREFIX;
|
||||
if (key1 != key2)
|
||||
return (key1 - key2);
|
||||
|
||||
if (bd1->key & KEYC_PREFIX && !(bd2->key & KEYC_PREFIX))
|
||||
return (-1);
|
||||
if (bd2->key & KEYC_PREFIX && !(bd1->key & KEYC_PREFIX))
|
||||
return (1);
|
||||
return (0);
|
||||
}
|
||||
|
||||
struct key_binding *
|
||||
@ -170,7 +181,8 @@ key_bindings_init(void)
|
||||
cmd->entry->init(cmd, table[i].key);
|
||||
TAILQ_INSERT_HEAD(cmdlist, cmd, qentry);
|
||||
|
||||
key_bindings_add(table[i].key, table[i].can_repeat, cmdlist);
|
||||
key_bindings_add(
|
||||
table[i].key | KEYC_PREFIX, table[i].can_repeat, cmdlist);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
11
server.c
11
server.c
@ -1,4 +1,4 @@
|
||||
/* $Id: server.c,v 1.162 2009-07-22 17:46:53 tcunha Exp $ */
|
||||
/* $Id: server.c,v 1.163 2009-07-25 08:52:04 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -807,14 +807,19 @@ server_handle_client(struct client *c)
|
||||
if (!(c->flags & CLIENT_PREFIX)) {
|
||||
if (key == prefix)
|
||||
c->flags |= CLIENT_PREFIX;
|
||||
else
|
||||
else {
|
||||
/* Try as a non-prefix key binding. */
|
||||
if ((bd = key_bindings_lookup(key)) == NULL)
|
||||
window_pane_key(wp, c, key);
|
||||
else
|
||||
key_bindings_dispatch(bd, c);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Prefix key already pressed. Reset prefix and lookup key. */
|
||||
c->flags &= ~CLIENT_PREFIX;
|
||||
if ((bd = key_bindings_lookup(key)) == NULL) {
|
||||
if ((bd = key_bindings_lookup(key | KEYC_PREFIX)) == NULL) {
|
||||
/* If repeating, treat this as a key, else ignore. */
|
||||
if (c->flags & CLIENT_REPEAT) {
|
||||
c->flags &= ~CLIENT_REPEAT;
|
||||
|
||||
21
tmux.1
21
tmux.1
@ -1,4 +1,4 @@
|
||||
.\" $Id: tmux.1,v 1.130 2009-07-25 08:39:39 tcunha Exp $
|
||||
.\" $Id: tmux.1,v 1.131 2009-07-25 08:52:04 tcunha Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
.\"
|
||||
@ -617,7 +617,7 @@ If no server is started,
|
||||
will attempt to start it; this will fail unless sessions are created in the
|
||||
configuration file.
|
||||
.It Xo Ic bind-key
|
||||
.Op Fl r
|
||||
.Op Fl nr
|
||||
.Ar key Ar command Op Ar arguments
|
||||
.Xc
|
||||
.D1 (alias: Ic bind )
|
||||
@ -632,6 +632,13 @@ or
|
||||
for Ctrl keys, or
|
||||
.Ql M-
|
||||
for Alt (meta) keys.
|
||||
If
|
||||
.Fl n
|
||||
is specified, it is not necessary to use the prefix key,
|
||||
.Ar command
|
||||
is bound to
|
||||
.Ar key
|
||||
alone.
|
||||
The
|
||||
.Fl r
|
||||
flag indicates this key may repeat, see the
|
||||
@ -842,6 +849,10 @@ List the syntax of all commands supported by
|
||||
.Xc
|
||||
.D1 (alias: Ic lsk )
|
||||
List all key bindings.
|
||||
Keys bound without the prefix key (see
|
||||
.Ic bind-key
|
||||
.Fl n )
|
||||
are enclosed in square brackets.
|
||||
.It Xo Ic list-sessions
|
||||
.Xc
|
||||
.D1 (alias: Ic ls )
|
||||
@ -1613,11 +1624,17 @@ Switch the current session for client
|
||||
to
|
||||
.Ar target-session .
|
||||
.It Xo Ic unbind-key
|
||||
.Op Fl n
|
||||
.Ar key
|
||||
.Xc
|
||||
.D1 (alias: Ic unbind )
|
||||
Unbind the command bound to
|
||||
.Ar key .
|
||||
If
|
||||
.Fl n
|
||||
is specified, the command bound to
|
||||
.Ar key
|
||||
without a prefix (if any) is removed.
|
||||
.It Xo Ic unlink-window
|
||||
.Op Fl k
|
||||
.Op Fl t Ar target-window
|
||||
|
||||
10
tmux.h
10
tmux.h
@ -1,4 +1,4 @@
|
||||
/* $Id: tmux.h,v 1.388 2009-07-23 23:42:59 tcunha Exp $ */
|
||||
/* $Id: tmux.h,v 1.389 2009-07-25 08:52:04 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -101,10 +101,12 @@ struct buffer {
|
||||
#define BELL_CURRENT 2
|
||||
|
||||
/* Key codes. ncurses defines KEY_*. Grrr. */
|
||||
#define KEYC_NONE 0x0fff
|
||||
#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. */
|
||||
@ -855,8 +857,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.
|
||||
@ -868,6 +868,8 @@ struct cmd_ctx {
|
||||
* configuration file.
|
||||
*/
|
||||
struct client *curclient;
|
||||
struct client *cmdclient;
|
||||
|
||||
struct session *cursession;
|
||||
|
||||
struct msg_command_data *msgdata;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user