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

Merge branch 'obsd-master'

pull/1434/head
Thomas Adam 2018-08-10 11:41:07 +01:00
parent 13fe06a459 87e87030fe
commit a368548645
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.h
View File

@ -515,10 +515,11 @@ struct msg_stderr_data {
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)
/*
* A single UTF-8 character. UTF8_SIZE must be big enough to hold at least one
* combining character as well.
* A single UTF-8 character. UTF8_SIZE must be big enough to hold
* combining characters as well, currently at most five (of three
* bytes) are supported.
*/
#define UTF8_SIZE 9
#define UTF8_SIZE 18
struct utf8_data {
u_char data[UTF8_SIZE];

14
window-copy.c
View File

@ -201,22 +201,10 @@ window_copy_init(struct window_pane *wp, __unused struct cmd_find_state *fs,
struct window_copy_mode_data *data;
struct screen *s;
wp->modedata = data = xmalloc(sizeof *data);
data->oy = 0;
data->cx = 0;
data->cy = 0;
wp->modedata = data = xcalloc(1, sizeof *data);
data->cursordrag = CURSORDRAG_NONE;
data->lastcx = 0;
data->lastsx = 0;
data->backing_written = 0;
data->lineflag = LINE_SEL_NONE;
data->rectflag = 0;
data->scroll_exit = 0;
if (wp->searchstr != NULL) {
data->searchtype = WINDOW_COPY_SEARCHUP;