circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 02:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-11-23 18:01:19 +00:00
commit 8a8001350d
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
key-bindings.c
View File

@ -396,7 +396,7 @@ key_bindings_read_only(struct cmdq_item *item, __unused void *data)
void
key_bindings_dispatch(struct key_binding *bd, struct client *c,
struct mouse_event *m)
struct mouse_event *m, struct cmd_find_state *fs)
{
struct cmd *cmd;
int readonly;
@ -409,5 +409,5 @@ key_bindings_dispatch(struct key_binding *bd, struct client *c,
if (!readonly && (c->flags & CLIENT_READONLY))
cmdq_append(c, cmdq_get_callback(key_bindings_read_only, NULL));
else
cmdq_append(c, cmdq_get_command(bd->cmdlist, NULL, m, 0));
cmdq_append(c, cmdq_get_command(bd->cmdlist, fs, m, 0));
}

5
key-string.c
View File

@ -140,6 +140,9 @@ key_string_get_modifiers(const char **string)
case 's':
modifiers |= KEYC_SHIFT;
break;
default:
*string = NULL;
return 0;
}
*string += 2;
}
@ -179,7 +182,7 @@ key_string_lookup_string(const char *string)
string++;
}
modifiers |= key_string_get_modifiers(&string);
if (string[0] == '\0')
if (string == NULL || string[0] == '\0')
return (KEYC_UNKNOWN);
/* Is this a standard ASCII key? */

16
server-client.c
View File

@ -690,6 +690,7 @@ server_client_handle_key(struct client *c, key_code key)
struct key_table *table;
struct key_binding bd_find, *bd;
int xtimeout;
struct cmd_find_state fs;
/* Check the client is good to accept input. */
if (s == NULL || (c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
@ -802,8 +803,21 @@ retry:
}
server_status_client(c);
/* Find default state if the pane is known. */
cmd_find_clear_state(&fs, NULL, 0);
if (wp != NULL) {
fs.s = s;
fs.wl = fs.s->curw;
fs.w = fs.wl->window;
fs.wp = wp;
cmd_find_log_state(__func__, &fs);
if (!cmd_find_valid_state(&fs))
fatalx("invalid key state");
}
/* Dispatch the key binding. */
key_bindings_dispatch(bd, c, m);
key_bindings_dispatch(bd, c, m, &fs);
key_bindings_unref_table(table);
return;
}

2
tmux.h
View File

@ -1837,7 +1837,7 @@ void key_bindings_remove(const char *, key_code);
void key_bindings_remove_table(const char *);
void key_bindings_init(void);
void key_bindings_dispatch(struct key_binding *, struct client *,
struct mouse_event *);
struct mouse_event *, struct cmd_find_state *);
/* key-string.c */
key_code key_string_lookup_string(const char *);