extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-14 15:58:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 1007:

Browse Source 
Drop the ability to have a list of keys in the prefix in favour of two
separate options, prefix and prefix2. This simplifies the code and gets
rid the data options type which was only used for this one option.

Also add a -2 flag to send-prefix to send the secondary prefix key,
fixing a cause of minor irritation.

People who want three prefix keys are out of luck :-).
This commit is contained in:
Tiago Cunha
2012-01-21 19:36:40 +00:00
parent d4c2a935f2
commit a7b0b30bdd
9 changed files with 51 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server-client.c
View File

@ -272,9 +272,7 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data)
struct options *oo;
struct timeval tv;
struct key_binding *bd;
struct keylist *keylist;
int xtimeout, isprefix;
u_int i;
/* Check the client is good to accept input. */
if ((c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
@ -359,14 +357,12 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data)
}
/* Is this a prefix key? */
keylist = options_get_data(&c->session->options, "prefix");
isprefix = 0;
for (i = 0; i < ARRAY_LENGTH(keylist); i++) {
if (key == ARRAY_ITEM(keylist, i)) {
isprefix = 1;
break;
}
}
if (key == options_get_number(&c->session->options, "prefix"))
isprefix = 1;
else if (key == options_get_number(&c->session->options, "prefix2"))
isprefix = 1;
else
isprefix = 0;
/* No previous prefix key. */
if (!(c->flags & CLIENT_PREFIX)) {