src/usr.bin/tmux/window-copy.c - diff - 1.78

Return to window-copy.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window-copy.c between version 1.77 and 1.78

version 1.77, 2012/03/11 23:01:19

version 1.78, 2012/03/17 21:40:53

Line 984

Line 984

struct grid_cell gc;

struct grid_cell gc;

size_t searchlen;

size_t searchlen;

u_int i, last, fx, fy, px;

u_int i, last, fx, fy, px;

int utf8flag, n, wrapped;

int utf8flag, n, wrapped, wrapflag;

if (*searchstr == '\0')

if (*searchstr == '\0')

return;

return;

utf8flag = options_get_number(&wp->window->options, "utf8");

utf8flag = options_get_number(&wp->window->options, "utf8");

wrapflag = options_get_number(&wp->window->options, "wrap-search");

searchlen = screen_write_strlen(utf8flag, "%s", searchstr);

searchlen = screen_write_strlen(utf8flag, "%s", searchstr);

screen_init(&ss, searchlen, 1, 0);

screen_init(&ss, searchlen, 1, 0);

Line 1021

Line 1022

break;

break;

}

}

}

}

if (!n && !wrapped) {

if (wrapflag && !n && !wrapped) {

fx = gd->sx - 1;

fx = gd->sx - 1;

fy = gd->hsize + gd->sy - 1;

fy = gd->hsize + gd->sy - 1;

wrapped = 1;

wrapped = 1;

Line 1041

Line 1042

struct grid_cell gc;

struct grid_cell gc;

size_t searchlen;

size_t searchlen;

u_int i, first, fx, fy, px;

u_int i, first, fx, fy, px;

int utf8flag, n, wrapped;

int utf8flag, n, wrapped, wrapflag;

if (*searchstr == '\0')

if (*searchstr == '\0')

return;

return;

utf8flag = options_get_number(&wp->window->options, "utf8");

utf8flag = options_get_number(&wp->window->options, "utf8");

wrapflag = options_get_number(&wp->window->options, "wrap-search");

searchlen = screen_write_strlen(utf8flag, "%s", searchstr);

searchlen = screen_write_strlen(utf8flag, "%s", searchstr);

screen_init(&ss, searchlen, 1, 0);

screen_init(&ss, searchlen, 1, 0);

Line 1078

Line 1080

break;

break;

}

}

}

}

if (!n && !wrapped) {

if (wrapflag && !n && !wrapped) {

fx = 0;

fx = 0;

fy = 0;

fy = 0;

wrapped = 1;

wrapped = 1;