circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 11:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-07-08 14:01:21 +01:00
commit c1d5dda62e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-display-menu.c
View File

@ -175,7 +175,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
format_add(ft, "popup_mouse_centre_y", "%ld", n); format_add(ft, "popup_mouse_centre_y", "%ld", n);
n = (long)event->m.y + h; n = (long)event->m.y + h;
if (n + h >= tty->sy) if (n + h >= tty->sy)
format_add(ft, "popup_mouse_top", "%u", tty->sy - h); format_add(ft, "popup_mouse_top", "%u", tty->sy - 1);
else else
format_add(ft, "popup_mouse_top", "%ld", n); format_add(ft, "popup_mouse_top", "%ld", n);
n = event->m.y - h; n = event->m.y - h;

6
format.c
View File

@ -4809,7 +4809,8 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
grid_get_cell(gd, x, y, &gc); grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING) if (gc.flags & GRID_FLAG_PADDING)
break; break;
if (utf8_cstrhas(ws, &gc.data)) { if (utf8_cstrhas(ws, &gc.data) ||
(gc.data.size == 1 && *gc.data.data == ' ')) {
found = 1; found = 1;
break; break;
} }
@ -4846,7 +4847,8 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
grid_get_cell(gd, x, y, &gc); grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING) if (gc.flags & GRID_FLAG_PADDING)
break; break;
if (utf8_cstrhas(ws, &gc.data)) if (utf8_cstrhas(ws, &gc.data) ||
(gc.data.size == 1 && *gc.data.data == ' '))
break; break;
ud = xreallocarray(ud, size + 2, sizeof *ud); ud = xreallocarray(ud, size + 2, sizeof *ud);