diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-10-05 20:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-10-05 20:01:11 +0100 |
| commit | d8996a1c1dfff860304f0282523f17345c2a0708 (patch) | |
| tree | a55074807f54f7702c4bed3b32b14c37f9815145 | |
| parent | 479c9563c70343af7c8afc3f6bd02599d1fd1269 (diff) | |
| parent | e06a4e041c68cabe448e6680505b4690e2d7169d (diff) | |
| download | rtmux-d8996a1c1dfff860304f0282523f17345c2a0708.tar.gz rtmux-d8996a1c1dfff860304f0282523f17345c2a0708.tar.bz2 rtmux-d8996a1c1dfff860304f0282523f17345c2a0708.zip | |
Merge branch 'obsd-master' into master
| -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); } |