diff options
| author | nicm <nicm> | 2021-10-05 17:23:13 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2021-10-05 17:23:13 +0000 |
| commit | e06a4e041c68cabe448e6680505b4690e2d7169d (patch) | |
| tree | c70f486078a8fa9b62dd0e5697d587ed0a636428 | |
| parent | 9f6164a05cc0de372f6859127f72c8b242596bf5 (diff) | |
| download | rtmux-e06a4e041c68cabe448e6680505b4690e2d7169d.tar.gz rtmux-e06a4e041c68cabe448e6680505b4690e2d7169d.tar.bz2 rtmux-e06a4e041c68cabe448e6680505b4690e2d7169d.zip | |
Set mouse_x and mouse_y on the status line, GitHub issue 2913.
| -rw-r--r-- | format.c | 28 |
1 files changed, 19 insertions, 9 deletions
@@ -1614,11 +1614,16 @@ format_cb_mouse_x(struct format_tree *ft) struct window_pane *wp; u_int x, y; - if (ft->m.valid) { - wp = cmd_mouse_pane(&ft->m, NULL, NULL); - if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0) - return (format_printf("%u", x)); + if (!ft->m.valid) return (NULL); + wp = cmd_mouse_pane(&ft->m, NULL, NULL); + if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0) + return (format_printf("%u", x)); + if (ft->c != NULL && (ft->c->tty.flags & TTY_STARTED)) { + if (ft->m.statusat == 0 && ft->m.y < ft->m.statuslines) + return (format_printf("%u", ft->m.x)); + if (ft->m.statusat > 0 && ft->m.y >= ft->m.statusat) + return (format_printf("%u", ft->m.x)); } return (NULL); } @@ -1628,13 +1633,18 @@ static void * format_cb_mouse_y(struct format_tree *ft) { struct window_pane *wp; - u_int x, y; + u_int x, y, top; - if (ft->m.valid) { - wp = cmd_mouse_pane(&ft->m, NULL, NULL); - if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0) - return (format_printf("%u", y)); + if (!ft->m.valid) return (NULL); + wp = cmd_mouse_pane(&ft->m, NULL, NULL); + if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0) + return (format_printf("%u", y)); + if (ft->c != NULL && (ft->c->tty.flags & TTY_STARTED)) { + if (ft->m.statusat == 0 && ft->m.y < ft->m.statuslines) + return (format_printf("%u", ft->m.y)); + if (ft->m.statusat > 0 && ft->m.y >= ft->m.statusat) + return (format_printf("%u", ft->m.y - ft->m.statusat)); } return (NULL); } |