diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-08-02 15:02:25 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-08-02 15:02:25 +0100 |
| commit | eceaa9a49345d0ab1cdd2f0489acbbbf4838126a (patch) | |
| tree | f60faaec2c6b99b7076ca8e86a1841ea93e18bde /server-client.c | |
| parent | 2e19a5ecb96d5c4c9abd196b0a61ad88360530d0 (diff) | |
| parent | fb1f0fee5af3da964ec359ae2b543353ce47f996 (diff) | |
| download | rtmux-eceaa9a49345d0ab1cdd2f0489acbbbf4838126a.tar.gz rtmux-eceaa9a49345d0ab1cdd2f0489acbbbf4838126a.tar.bz2 rtmux-eceaa9a49345d0ab1cdd2f0489acbbbf4838126a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c index 64d894cd..84b93272 100644 --- a/server-client.c +++ b/server-client.c @@ -41,6 +41,8 @@ static void server_client_check_redraw(struct client *); static void server_client_set_title(struct client *); static void server_client_reset_state(struct client *); static int server_client_assume_paste(struct session *); +static void server_client_clear_identify(struct client *, + struct window_pane *); static void server_client_dispatch(struct imsg *, void *); static void server_client_dispatch_command(struct client *, struct imsg *); @@ -91,7 +93,7 @@ server_client_set_identify(struct client *c, u_int delay) } /* Clear identify mode on client. */ -void +static void server_client_clear_identify(struct client *c, struct window_pane *wp) { if (~c->flags & CLIENT_IDENTIFY) @@ -813,7 +815,7 @@ server_client_handle_key(struct client *c, key_code key) struct window_pane *wp; struct timeval tv; struct key_table *table, *first; - struct key_binding bd_find, *bd; + struct key_binding *bd; int xtimeout, flags; struct cmd_find_state fs; key_code key0; @@ -926,8 +928,7 @@ table_changed: try_again: /* Try to see if there is a key binding in the current table. */ - bd_find.key = key0; - bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); + bd = key_bindings_get(table, key0); if (bd != NULL) { /* * Key was matched in this table. If currently repeating but a |