diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-02 20:01:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-02 20:01:26 +0100 |
| commit | 450315aa74c9821ce1bc8c4d51f7ab4abf55993a (patch) | |
| tree | 740d0d03b4e551403e87726c232bc4f774cbafe5 /window-copy.c | |
| parent | 9bcf5c0b900f2bae5c590969393cd51add37f933 (diff) | |
| parent | a20d96000e7b04962105242883c91655833809da (diff) | |
| download | rtmux-450315aa74c9821ce1bc8c4d51f7ab4abf55993a.tar.gz rtmux-450315aa74c9821ce1bc8c4d51f7ab4abf55993a.tar.bz2 rtmux-450315aa74c9821ce1bc8c4d51f7ab4abf55993a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/window-copy.c b/window-copy.c index bc0cd849..1a558915 100644 --- a/window-copy.c +++ b/window-copy.c @@ -509,6 +509,8 @@ window_copy_pageup1(struct window_mode_entry *wme, int half_page) window_copy_cursor_end_of_line(wme); } + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 1, 0); window_copy_redraw_screen(wme); } @@ -557,6 +559,8 @@ window_copy_pagedown(struct window_mode_entry *wme, int half_page, if (scroll_exit && data->oy == 0) return (1); + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 1, 0); window_copy_redraw_screen(wme); return (0); @@ -1049,6 +1053,8 @@ window_copy_cmd_history_bottom(struct window_copy_cmd_state *cs) data->cx = window_copy_find_length(wme, data->cy); data->oy = 0; + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 1, 0); return (WINDOW_COPY_CMD_REDRAW); } @@ -1068,6 +1074,8 @@ window_copy_cmd_history_top(struct window_copy_cmd_state *cs) data->cx = 0; data->oy = screen_hsize(data->backing); + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 1, 0); return (WINDOW_COPY_CMD_REDRAW); } @@ -2200,6 +2208,8 @@ window_copy_scroll_to(struct window_mode_entry *wme, u_int px, u_int py) data->oy = gd->hsize - offset; } + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 1, 0); window_copy_redraw_screen(wme); } @@ -2777,6 +2787,7 @@ window_copy_search_marks(struct window_mode_entry *wme, struct screen *ssp, struct screen *s = data->backing, ss; struct screen_write_ctx ctx; struct grid *gd = s->grid; + const struct grid_line *gl; int found, cis, which = -1; int cflags = REG_EXTENDED; u_int px, py, b, nfound = 0, width; @@ -2814,7 +2825,15 @@ window_copy_search_marks(struct window_mode_entry *wme, struct screen *ssp, } } time(&tstart); - for (py = 0; py < gd->hsize + gd->sy; py++) { + py = gd->hsize - data->oy; + if (py > 0) + py--; + for (; py > 0; py--) { + gl = grid_peek_line(gd, py); + if (~gl->flags & GRID_LINE_WRAPPED) + break; + } + for (; py < gd->hsize - data->oy + gd->sy; py++) { px = 0; for (;;) { if (regex) { @@ -4190,6 +4209,8 @@ window_copy_scroll_up(struct window_mode_entry *wme, u_int ny) return; data->oy -= ny; + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 0, 0); screen_write_start(&ctx, wp, NULL); @@ -4224,6 +4245,8 @@ window_copy_scroll_down(struct window_mode_entry *wme, u_int ny) return; data->oy += ny; + if (data->searchmark != NULL && !data->timeout) + window_copy_search_marks(wme, NULL, data->searchregex); window_copy_update_selection(wme, 0, 0); screen_write_start(&ctx, wp, NULL); |