mirror of
https://github.com/tmux/tmux.git
synced 2026-06-20 17:25:57 +00:00
Merge branch 'obsd-master'
This commit is contained in:
@@ -1164,11 +1164,11 @@ server_client_repeat_time(struct client *c, struct key_binding *bd)
|
||||
static enum cmd_retval
|
||||
server_client_key_callback(struct cmdq_item *item, void *data)
|
||||
{
|
||||
struct client *c = cmdq_get_client(item);
|
||||
struct key_event *event = data;
|
||||
struct client *c, *ec = event->client;
|
||||
key_code key = event->key;
|
||||
struct mouse_event *m = &event->m;
|
||||
struct session *s = c->session;
|
||||
struct session *s;
|
||||
struct winlink *wl;
|
||||
struct window_pane *wp;
|
||||
struct window_mode_entry *wme;
|
||||
@@ -1180,6 +1180,12 @@ server_client_key_callback(struct cmdq_item *item, void *data)
|
||||
struct cmd_find_state fs;
|
||||
key_code key0, prefix, prefix2;
|
||||
|
||||
if (ec != NULL)
|
||||
c = ec;
|
||||
else
|
||||
c = cmdq_get_client(item);
|
||||
s = c->session;
|
||||
|
||||
/* Check the client is good to accept input. */
|
||||
if (s == NULL || (c->flags & CLIENT_UNATTACHEDFLAGS))
|
||||
goto out;
|
||||
@@ -1426,14 +1432,17 @@ paste_key:
|
||||
out:
|
||||
if (s != NULL && key != KEYC_FOCUS_OUT)
|
||||
server_client_update_latest(c);
|
||||
if (ec != NULL)
|
||||
server_client_unref(ec);
|
||||
free(event->buf);
|
||||
free(event);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
/* Handle a key event. */
|
||||
int
|
||||
server_client_handle_key(struct client *c, struct key_event *event)
|
||||
static int
|
||||
server_client_handle_key0(struct client *c, struct key_event *event,
|
||||
struct cmdq_item *after, struct cmdq_item **next)
|
||||
{
|
||||
struct session *s = c->session;
|
||||
struct cmdq_item *item;
|
||||
@@ -1487,10 +1496,31 @@ server_client_handle_key(struct client *c, struct key_event *event)
|
||||
* previous keys.
|
||||
*/
|
||||
item = cmdq_get_callback(server_client_key_callback, event);
|
||||
if (after != NULL) {
|
||||
event->client = c;
|
||||
c->references++;
|
||||
item = cmdq_insert_after(after, item);
|
||||
if (next != NULL)
|
||||
*next = item;
|
||||
return (1);
|
||||
}
|
||||
cmdq_append(c, item);
|
||||
return (1);
|
||||
}
|
||||
|
||||
int
|
||||
server_client_handle_key(struct client *c, struct key_event *event)
|
||||
{
|
||||
return (server_client_handle_key0(c, event, NULL, NULL));
|
||||
}
|
||||
|
||||
int
|
||||
server_client_handle_key_after(struct client *c, struct key_event *event,
|
||||
struct cmdq_item *after, struct cmdq_item **next)
|
||||
{
|
||||
return (server_client_handle_key0(c, event, after, next));
|
||||
}
|
||||
|
||||
/* Client functions that need to happen every loop. */
|
||||
void
|
||||
server_client_loop(void)
|
||||
|
||||
Reference in New Issue
Block a user