circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle UTF-8 in word-separators option, GitHub issue 1551.

pull/1556/head
nicm 2018-11-28 11:20:13 +00:00
parent 3a7b9d5735
commit 40d246b29c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
window-copy.c
View File

@ -1817,15 +1817,27 @@ window_copy_in_set(struct window_pane *wp, u_int px, u_int py, const char *set)
struct window_copy_mode_data *data = wp->modedata;
struct grid_cell gc;
const struct utf8_data *ud;
struct utf8_data *copy;
struct utf8_data *loop;
int found = 0;
grid_get_cell(data->backing->grid, px, py, &gc);
if (gc.flags & GRID_FLAG_PADDING)
return (0);
ud = &gc.data;
if (ud->size != 1 || (gc.flags & GRID_FLAG_PADDING))
return (0);
if (*ud->data == 0x00 || *ud->data == 0x7f)
return (0);
return (strchr(set, *ud->data) != NULL);
copy = utf8_fromcstr(set);
for (loop = copy; loop->size != 0; loop++) {
if (loop->size != ud->size)
continue;
if (memcmp(loop->data, ud->data, loop->size) == 0) {
found = 1;
break;
}
}
free(copy);
return (found);
}
static u_int