circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Add StatusDefault binding for the mouse on any otherwise unassigned

Browse Source 
parts of the status line, from Avi Halachmi.
This commit is contained in:
nicm
2019-03-25 18:59:55 +00:00
parent ff4d7d541f
commit d21f8ecc13
3 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
server-client.c
View File

@ -419,7 +419,7 @@ server_client_check_mouse(struct client *c)
struct timeval tv; struct timeval tv;
struct style_range *sr; struct style_range *sr;
enum { NOTYPE, MOVE, DOWN, UP, DRAG, WHEEL, DOUBLE, TRIPLE } type; enum { NOTYPE, MOVE, DOWN, UP, DRAG, WHEEL, DOUBLE, TRIPLE } type;
enum { NOWHERE, PANE, STATUS, STATUS_LEFT, STATUS_RIGHT, BORDER } where; enum { NOWHERE, PANE, STATUS, STATUS_LEFT, STATUS_RIGHT, STATUS_DEFAULT, BORDER } where;
type = NOTYPE; type = NOTYPE;
where = NOWHERE; where = NOWHERE;
@ -508,25 +508,27 @@ have_event:
y >= (u_int)m->statusat && y >= (u_int)m->statusat &&
y < m->statusat + status_line_size(c)) { y < m->statusat + status_line_size(c)) {
sr = status_get_range(c, x, y - m->statusat); sr = status_get_range(c, x, y - m->statusat);
if (sr == NULL) if (sr == NULL) {
return (KEYC_UNKNOWN); where = STATUS_DEFAULT;
switch (sr->type) { } else {
case STYLE_RANGE_NONE: switch (sr->type) {
return (KEYC_UNKNOWN); case STYLE_RANGE_NONE:
case STYLE_RANGE_LEFT:
where = STATUS_LEFT;
break;
case STYLE_RANGE_RIGHT:
where = STATUS_RIGHT;
break;
case STYLE_RANGE_WINDOW:
wl = winlink_find_by_index(&s->windows, sr->argument);
if (wl == NULL)
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);
m->w = wl->window->id; case STYLE_RANGE_LEFT:
where = STATUS_LEFT;
break;
case STYLE_RANGE_RIGHT:
where = STATUS_RIGHT;
break;
case STYLE_RANGE_WINDOW:
wl = winlink_find_by_index(&s->windows, sr->argument);
if (wl == NULL)
return (KEYC_UNKNOWN);
m->w = wl->window->id;
where = STATUS; where = STATUS;
break; break;
}
} }
} }
@ -605,6 +607,8 @@ have_event:
key = KEYC_MOUSEDRAGEND1_STATUS_LEFT; key = KEYC_MOUSEDRAGEND1_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDRAGEND1_STATUS_RIGHT; key = KEYC_MOUSEDRAGEND1_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDRAGEND1_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDRAGEND1_BORDER; key = KEYC_MOUSEDRAGEND1_BORDER;
break; break;
@ -617,6 +621,8 @@ have_event:
key = KEYC_MOUSEDRAGEND2_STATUS_LEFT; key = KEYC_MOUSEDRAGEND2_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDRAGEND2_STATUS_RIGHT; key = KEYC_MOUSEDRAGEND2_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDRAGEND2_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDRAGEND2_BORDER; key = KEYC_MOUSEDRAGEND2_BORDER;
break; break;
@ -629,6 +635,8 @@ have_event:
key = KEYC_MOUSEDRAGEND3_STATUS_LEFT; key = KEYC_MOUSEDRAGEND3_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDRAGEND3_STATUS_RIGHT; key = KEYC_MOUSEDRAGEND3_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDRAGEND3_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDRAGEND3_BORDER; key = KEYC_MOUSEDRAGEND3_BORDER;
break; break;
@ -651,6 +659,12 @@ have_event:
key = KEYC_MOUSEMOVE_PANE; key = KEYC_MOUSEMOVE_PANE;
if (where == STATUS) if (where == STATUS)
key = KEYC_MOUSEMOVE_STATUS; key = KEYC_MOUSEMOVE_STATUS;
if (where == STATUS_LEFT)
key = KEYC_MOUSEMOVE_STATUS_LEFT;
if (where == STATUS_RIGHT)
key = KEYC_MOUSEMOVE_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEMOVE_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEMOVE_BORDER; key = KEYC_MOUSEMOVE_BORDER;
break; break;
@ -668,6 +682,8 @@ have_event:
key = KEYC_MOUSEDRAG1_STATUS_LEFT; key = KEYC_MOUSEDRAG1_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDRAG1_STATUS_RIGHT; key = KEYC_MOUSEDRAG1_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDRAG1_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDRAG1_BORDER; key = KEYC_MOUSEDRAG1_BORDER;
break; break;
@ -680,6 +696,8 @@ have_event:
key = KEYC_MOUSEDRAG2_STATUS_LEFT; key = KEYC_MOUSEDRAG2_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDRAG2_STATUS_RIGHT; key = KEYC_MOUSEDRAG2_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDRAG2_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDRAG2_BORDER; key = KEYC_MOUSEDRAG2_BORDER;
break; break;
@ -692,6 +710,8 @@ have_event:
key = KEYC_MOUSEDRAG3_STATUS_LEFT; key = KEYC_MOUSEDRAG3_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDRAG3_STATUS_RIGHT; key = KEYC_MOUSEDRAG3_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDRAG3_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDRAG3_BORDER; key = KEYC_MOUSEDRAG3_BORDER;
break; break;
@ -714,6 +734,8 @@ have_event:
key = KEYC_WHEELUP_STATUS_LEFT; key = KEYC_WHEELUP_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_WHEELUP_STATUS_RIGHT; key = KEYC_WHEELUP_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_WHEELUP_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_WHEELUP_BORDER; key = KEYC_WHEELUP_BORDER;
} else { } else {
@ -721,6 +743,12 @@ have_event:
key = KEYC_WHEELDOWN_PANE; key = KEYC_WHEELDOWN_PANE;
if (where == STATUS) if (where == STATUS)
key = KEYC_WHEELDOWN_STATUS; key = KEYC_WHEELDOWN_STATUS;
if (where == STATUS_LEFT)
key = KEYC_WHEELDOWN_STATUS_LEFT;
if (where == STATUS_RIGHT)
key = KEYC_WHEELDOWN_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_WHEELDOWN_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_WHEELDOWN_BORDER; key = KEYC_WHEELDOWN_BORDER;
} }
@ -736,6 +764,8 @@ have_event:
key = KEYC_MOUSEUP1_STATUS_LEFT; key = KEYC_MOUSEUP1_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEUP1_STATUS_RIGHT; key = KEYC_MOUSEUP1_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEUP1_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEUP1_BORDER; key = KEYC_MOUSEUP1_BORDER;
break; break;
@ -748,6 +778,8 @@ have_event:
key = KEYC_MOUSEUP2_STATUS_LEFT; key = KEYC_MOUSEUP2_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEUP2_STATUS_RIGHT; key = KEYC_MOUSEUP2_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEUP2_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEUP2_BORDER; key = KEYC_MOUSEUP2_BORDER;
break; break;
@ -760,6 +792,8 @@ have_event:
key = KEYC_MOUSEUP3_STATUS_LEFT; key = KEYC_MOUSEUP3_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEUP3_STATUS_RIGHT; key = KEYC_MOUSEUP3_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEUP3_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEUP3_BORDER; key = KEYC_MOUSEUP3_BORDER;
break; break;
@ -776,6 +810,8 @@ have_event:
key = KEYC_MOUSEDOWN1_STATUS_LEFT; key = KEYC_MOUSEDOWN1_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDOWN1_STATUS_RIGHT; key = KEYC_MOUSEDOWN1_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDOWN1_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDOWN1_BORDER; key = KEYC_MOUSEDOWN1_BORDER;
break; break;
@ -788,6 +824,8 @@ have_event:
key = KEYC_MOUSEDOWN2_STATUS_LEFT; key = KEYC_MOUSEDOWN2_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDOWN2_STATUS_RIGHT; key = KEYC_MOUSEDOWN2_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDOWN2_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDOWN2_BORDER; key = KEYC_MOUSEDOWN2_BORDER;
break; break;
@ -800,6 +838,8 @@ have_event:
key = KEYC_MOUSEDOWN3_STATUS_LEFT; key = KEYC_MOUSEDOWN3_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_MOUSEDOWN3_STATUS_RIGHT; key = KEYC_MOUSEDOWN3_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_MOUSEDOWN3_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_MOUSEDOWN3_BORDER; key = KEYC_MOUSEDOWN3_BORDER;
break; break;
@ -816,6 +856,8 @@ have_event:
key = KEYC_DOUBLECLICK1_STATUS_LEFT; key = KEYC_DOUBLECLICK1_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_DOUBLECLICK1_STATUS_RIGHT; key = KEYC_DOUBLECLICK1_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_DOUBLECLICK1_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_DOUBLECLICK1_BORDER; key = KEYC_DOUBLECLICK1_BORDER;
break; break;
@ -828,6 +870,8 @@ have_event:
key = KEYC_DOUBLECLICK2_STATUS_LEFT; key = KEYC_DOUBLECLICK2_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_DOUBLECLICK2_STATUS_RIGHT; key = KEYC_DOUBLECLICK2_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_DOUBLECLICK2_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_DOUBLECLICK2_BORDER; key = KEYC_DOUBLECLICK2_BORDER;
break; break;
@ -840,6 +884,8 @@ have_event:
key = KEYC_DOUBLECLICK3_STATUS_LEFT; key = KEYC_DOUBLECLICK3_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_DOUBLECLICK3_STATUS_RIGHT; key = KEYC_DOUBLECLICK3_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_DOUBLECLICK3_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_DOUBLECLICK3_BORDER; key = KEYC_DOUBLECLICK3_BORDER;
break; break;
@ -856,6 +902,8 @@ have_event:
key = KEYC_TRIPLECLICK1_STATUS_LEFT; key = KEYC_TRIPLECLICK1_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_TRIPLECLICK1_STATUS_RIGHT; key = KEYC_TRIPLECLICK1_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_TRIPLECLICK1_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_TRIPLECLICK1_BORDER; key = KEYC_TRIPLECLICK1_BORDER;
break; break;
@ -868,6 +916,8 @@ have_event:
key = KEYC_TRIPLECLICK2_STATUS_LEFT; key = KEYC_TRIPLECLICK2_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_TRIPLECLICK2_STATUS_RIGHT; key = KEYC_TRIPLECLICK2_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_TRIPLECLICK2_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_TRIPLECLICK2_BORDER; key = KEYC_TRIPLECLICK2_BORDER;
break; break;
@ -880,6 +930,8 @@ have_event:
key = KEYC_TRIPLECLICK3_STATUS_LEFT; key = KEYC_TRIPLECLICK3_STATUS_LEFT;
if (where == STATUS_RIGHT) if (where == STATUS_RIGHT)
key = KEYC_TRIPLECLICK3_STATUS_RIGHT; key = KEYC_TRIPLECLICK3_STATUS_RIGHT;
if (where == STATUS_DEFAULT)
key = KEYC_TRIPLECLICK3_STATUS_DEFAULT;
if (where == BORDER) if (where == BORDER)
key = KEYC_TRIPLECLICK3_BORDER; key = KEYC_TRIPLECLICK3_BORDER;
break; break;

20
tmux.1
View File

@ -3519,16 +3519,16 @@ option is on (the default is off),
allows mouse events to be bound as keys. allows mouse events to be bound as keys.
The name of each key is made up of a mouse event (such as The name of each key is made up of a mouse event (such as
.Ql MouseUp1 ) .Ql MouseUp1 )
and a location suffix (one of and a location suffix, one of the following:
.Ql Pane .Bl -column "XXXXXXXXXXXXX" -offset indent
for the contents of a pane, .It Li "Pane" Ta "the contents of a pane"
.Ql Border .It Li "Border" Ta "a pane border"
for a pane border or .It Li "Status" Ta "the status line window list"
.Ql Status , .It Li "StatusLeft" Ta "the left part of the status line"
.Ql StatusLeft , .It Li "StatusRight" Ta "the right part of the status line"
or .It Li "StatusDefault" Ta "any other part of the status line"
.Ql StatusRight .El
for the status line). .Pp
The following mouse events are available: The following mouse events are available:
.Bl -column "MouseDown1" "MouseDrag1" "WheelDown" -offset indent .Bl -column "MouseDown1" "MouseDrag1" "WheelDown" -offset indent
.It Li "WheelUp" Ta "WheelDown" Ta "" .It Li "WheelUp" Ta "WheelDown" Ta ""

2
tmux.h
View File

@ -128,12 +128,14 @@ struct winlink;
KEYC_ ## name ## _STATUS, \ KEYC_ ## name ## _STATUS, \
KEYC_ ## name ## _STATUS_LEFT, \ KEYC_ ## name ## _STATUS_LEFT, \
KEYC_ ## name ## _STATUS_RIGHT, \ KEYC_ ## name ## _STATUS_RIGHT, \
KEYC_ ## name ## _STATUS_DEFAULT, \
KEYC_ ## name ## _BORDER KEYC_ ## name ## _BORDER
#define KEYC_MOUSE_STRING(name, s) \ #define KEYC_MOUSE_STRING(name, s) \
{ #s "Pane", KEYC_ ## name ## _PANE }, \ { #s "Pane", KEYC_ ## name ## _PANE }, \
{ #s "Status", KEYC_ ## name ## _STATUS }, \ { #s "Status", KEYC_ ## name ## _STATUS }, \
{ #s "StatusLeft", KEYC_ ## name ## _STATUS_LEFT }, \ { #s "StatusLeft", KEYC_ ## name ## _STATUS_LEFT }, \
{ #s "StatusRight", KEYC_ ## name ## _STATUS_RIGHT }, \ { #s "StatusRight", KEYC_ ## name ## _STATUS_RIGHT }, \
{ #s "StatusDefault", KEYC_ ## name ## _STATUS_DEFAULT }, \
{ #s "Border", KEYC_ ## name ## _BORDER } { #s "Border", KEYC_ ## name ## _BORDER }
/* /*