diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-09-16 16:01:23 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-09-16 16:01:23 +0100 |
| commit | 5ae2d421fba5a5bc41d9fac8f525854f17bf89b9 (patch) | |
| tree | e5bd706b7fd169b3022e6b4320c111a7cd3783ec | |
| parent | 7a1abd66e7f38412f4bdc944d969e88d6b268a13 (diff) | |
| parent | 83be3afc54b783fabb5e57d2588887b9c8c0decf (diff) | |
| download | rtmux-5ae2d421fba5a5bc41d9fac8f525854f17bf89b9.tar.gz rtmux-5ae2d421fba5a5bc41d9fac8f525854f17bf89b9.tar.bz2 rtmux-5ae2d421fba5a5bc41d9fac8f525854f17bf89b9.zip | |
Merge branch 'obsd-master'
| -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 df2dcf46..3c96832c 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -328,10 +328,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 || |