diff options
| author | nicm <nicm> | 2019-09-16 13:27:14 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-09-25 15:56:30 +0100 |
| commit | e6995196f22c24fc76ffe1d83d987ae5fd270619 (patch) | |
| tree | 1e49eec3bf009e8827f40991be21d63151028571 | |
| parent | a74e37d32d5cd6654444d6517add43e3a91f14f0 (diff) | |
| download | rtmux-e6995196f22c24fc76ffe1d83d987ae5fd270619.tar.gz rtmux-e6995196f22c24fc76ffe1d83d987ae5fd270619.tar.bz2 rtmux-e6995196f22c24fc76ffe1d83d987ae5fd270619.zip | |
Change menu key bindings to Up and Down and also close it on any mouse
press if opened by key.
| -rw-r--r-- | key-bindings.c | 4 | ||||
| -rw-r--r-- | menu.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/key-bindings.c b/key-bindings.c index 0c9ba67b..afb07ce6 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -329,10 +329,10 @@ key_bindings_init(void) "bind -n MouseDown3StatusRight display-menu -t= -xM -yS -T \"#[align=centre]#{client_name}\" " DEFAULT_CLIENT_MENU, "bind -n MouseDown3StatusLeft display-menu -t= -xM -yS -T \"#[align=centre]#{session_name}\" " DEFAULT_SESSION_MENU, "bind -n MouseDown3Status display-menu -t= -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU, - "bind C-m display-menu -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU, + "bind Up display-menu -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU, "bind -n MouseDown3Pane if -Ft= '#{||:#{mouse_any_flag},#{pane_in_mode}}' 'select-pane -t=; send-keys -M' {display-menu -t= -xM -yM -T \"#[align=centre]#{pane_index} (#{pane_id})\" " DEFAULT_PANE_MENU "}", "bind -n M-MouseDown3Pane display-menu -t= -xM -yM -T \"#[align=centre]#{pane_index} (#{pane_id})\" " DEFAULT_PANE_MENU, - "bind M-m display-menu -xP -yP -T \"#[align=centre]#{pane_index} (#{pane_id})\" " DEFAULT_PANE_MENU, + "bind Down display-menu -xP -yP -T \"#[align=centre]#{pane_index} (#{pane_id})\" " DEFAULT_PANE_MENU, "bind -Tcopy-mode C-Space send -X begin-selection", "bind -Tcopy-mode C-a send -X start-of-line", @@ -185,8 +185,11 @@ menu_key_cb(struct client *c, struct key_event *event) const char *name; if (KEYC_IS_MOUSE(event->key)) { - if (md->flags & MENU_NOMOUSE) + if (md->flags & MENU_NOMOUSE) { + if (MOUSE_BUTTONS(m->b) != 0) + return (1); return (0); + } if (m->x < md->px || m->x > md->px + 4 + menu->width || m->y < md->py + 1 || |