diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-09-12 18:01:12 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-09-12 18:01:12 +0100 |
| commit | a5b29a1250c321d08b227120b4d9e835297e7acd (patch) | |
| tree | b9324a9c18be232633b9e8ba6ae749e95178dad3 /window-choose.c | |
| parent | 060515684dd2f3d471cc801920495426368b6ecf (diff) | |
| parent | 2e5584c2b41df1c1b836c3229ea78f8ea3d81054 (diff) | |
| download | rtmux-a5b29a1250c321d08b227120b4d9e835297e7acd.tar.gz rtmux-a5b29a1250c321d08b227120b4d9e835297e7acd.tar.bz2 rtmux-a5b29a1250c321d08b227120b4d9e835297e7acd.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/window-choose.c b/window-choose.c index e5b34f42..715915b6 100644 --- a/window-choose.c +++ b/window-choose.c @@ -552,7 +552,7 @@ window_choose_key(struct window_pane *wp, __unused struct client *c, items = data->list_size; if (data->input_type == WINDOW_CHOOSE_GOTO_ITEM) { - switch (mode_key_lookup(&data->mdata, key, NULL)) { + switch (mode_key_lookup(&data->mdata, key, NULL, NULL)) { case MODEKEYCHOICE_CANCEL: data->input_type = WINDOW_CHOOSE_NORMAL; window_choose_redraw_screen(wp); @@ -582,7 +582,7 @@ window_choose_key(struct window_pane *wp, __unused struct client *c, return; } - switch (mode_key_lookup(&data->mdata, key, NULL)) { + switch (mode_key_lookup(&data->mdata, key, NULL, NULL)) { case MODEKEYCHOICE_CANCEL: window_choose_fire_callback(wp, NULL); break; @@ -837,7 +837,7 @@ window_choose_key_index(struct window_choose_mode_data *data, u_int idx) int mkey; for (ptr = keys; *ptr != '\0'; ptr++) { - mkey = mode_key_lookup(&data->mdata, *ptr, NULL); + mkey = mode_key_lookup(&data->mdata, *ptr, NULL, NULL); if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER) continue; if (idx-- == 0) @@ -857,7 +857,7 @@ window_choose_index_key(struct window_choose_mode_data *data, key_code key) u_int idx = 0; for (ptr = keys; *ptr != '\0'; ptr++) { - mkey = mode_key_lookup(&data->mdata, *ptr, NULL); + mkey = mode_key_lookup(&data->mdata, *ptr, NULL, NULL); if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER) continue; if (key == (key_code)*ptr) |