circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-04-16 03:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Fixed missing drag end detection and mouse button detection with

Browse Source 
modifiers. From Dane Jensen, reported by Joseph Tyson and Mark Kelly.
This commit is contained in:
nicm
2026-04-01 08:10:02 +00:00
parent 2ff0dd3fef
commit 7af58f74b0
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server-client.c
View File

@@ -926,6 +926,7 @@ have_event:
* End a mouse drag by passing a MouseDragEnd key corresponding * End a mouse drag by passing a MouseDragEnd key corresponding
* to the button that started the drag. * to the button that started the drag.
*/ */
type = KEYC_TYPE_MOUSEDRAGEND;
c->tty.mouse_drag_flag = 0; c->tty.mouse_drag_flag = 0;
c->tty.mouse_slider_mpos = -1; c->tty.mouse_slider_mpos = -1;
} }
@@ -934,8 +935,8 @@ have_event:
if (type == KEYC_TYPE_MOUSEMOVE && loc == KEYC_MOUSE_LOCATION_PANE) { if (type == KEYC_TYPE_MOUSEMOVE && loc == KEYC_MOUSE_LOCATION_PANE) {
key = KEYC_MOUSEMOVE_PANE; key = KEYC_MOUSEMOVE_PANE;
if (wp != NULL && if (wp != NULL &&
wp != w->active && wp != w->active &&
options_get_number(s->options, "focus-follows-mouse")) { options_get_number(s->options, "focus-follows-mouse")) {
window_set_active_pane(w, wp, 1); window_set_active_pane(w, wp, 1);
server_redraw_window_borders(w); server_redraw_window_borders(w);
server_status_window(w); server_status_window(w);
@@ -964,24 +965,24 @@ have_event:
} }
if (key == KEYC_UNKNOWN) { if (key == KEYC_UNKNOWN) {
/* Adjust the button number */ /* Adjust the button number. */
if (b == MOUSE_BUTTON_1) if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_1)
bn = 1; bn = 1;
else if (b == MOUSE_BUTTON_2) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_2)
bn = 2; bn = 2;
else if (b == MOUSE_BUTTON_3) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_3)
bn = 3; bn = 3;
else if (b == MOUSE_BUTTON_6) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_6)
bn = 6; bn = 6;
else if (b == MOUSE_BUTTON_7) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_7)
bn = 7; bn = 7;
else if (b == MOUSE_BUTTON_8) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_8)
bn = 8; bn = 8;
else if (b == MOUSE_BUTTON_9) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_9)
bn = 9; bn = 9;
else if (b == MOUSE_BUTTON_10) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_10)
bn = 10; bn = 10;
else if (b == MOUSE_BUTTON_11) else if (MOUSE_BUTTONS(b) == MOUSE_BUTTON_11)
bn = 11; bn = 11;
else else
bn = 0; bn = 0;