diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-07-27 16:54:25 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-07-27 16:54:25 +0000 |
| commit | a3db31d5cb62bb9afeb1c6cf3ee626abdf061009 (patch) | |
| tree | f23d5434f505b35b6a53e14673593ca95ea02349 /search.c | |
| parent | meson/pkgbuild: bump to 1.4.2 (diff) | |
| parent | doc: foot.5: modifiers+keys are plural (diff) | |
Merge branch 'master' into releases/1.4
Diffstat (limited to 'search.c')
| -rw-r--r-- | search.c | 74 |
1 files changed, 46 insertions, 28 deletions
@@ -104,40 +104,58 @@ search_update_selection(struct terminal *term, int start_row, int start_col, int end_row, int end_col) { - int old_view = term->grid->view; - int new_view = start_row; + bool move_viewport = true; - /* Prevent scrolling in uninitialized rows */ - bool all_initialized = false; - do { - all_initialized = true; + int view_end = (term->grid->view + term->rows - 1) & (term->grid->num_rows - 1); + if (view_end >= term->grid->view) { + /* Viewport does *not* wrap around */ + if (start_row >= term->grid->view && end_row <= view_end) + move_viewport = false; + } else { + /* Viewport wraps */ + if (start_row >= term->grid->view || end_row <= view_end) + move_viewport = false; + } - for (int i = 0; i < term->rows; i++) { - int row_no = (new_view + i) % term->grid->num_rows; - if (term->grid->rows[row_no] == NULL) { - all_initialized = false; - new_view--; - break; + if (move_viewport) { + int old_view = term->grid->view; + int new_view = start_row - term->rows / 2; + + while (new_view < 0) + new_view += term->grid->num_rows; + + /* Prevent scrolling in uninitialized rows */ + bool all_initialized = false; + do { + all_initialized = true; + + for (int i = 0; i < term->rows; i++) { + int row_no = (new_view + i) % term->grid->num_rows; + if (term->grid->rows[row_no] == NULL) { + all_initialized = false; + new_view--; + break; + } } + } while (!all_initialized); + + /* Don't scroll past scrollback history */ + int end = (term->grid->offset + term->rows - 1) % term->grid->num_rows; + if (end >= term->grid->offset) { + /* Not wrapped */ + if (new_view >= term->grid->offset && new_view <= end) + new_view = term->grid->offset; + } else { + if (new_view >= term->grid->offset || new_view <= end) + new_view = term->grid->offset; } - } while (!all_initialized); - /* Don't scroll past scrollback history */ - int end = (term->grid->offset + term->rows - 1) % term->grid->num_rows; - if (end >= term->grid->offset) { - /* Not wrapped */ - if (new_view >= term->grid->offset && new_view <= end) - new_view = term->grid->offset; - } else { - if (new_view >= term->grid->offset || new_view <= end) - new_view = term->grid->offset; + /* Update view */ + term->grid->view = new_view; + if (new_view != old_view) + term_damage_view(term); } - /* Update view */ - term->grid->view = new_view; - if (new_view != old_view) - term_damage_view(term); - /* Selection endpoint is inclusive */ if (--end_col < 0) { end_col = term->cols - 1; @@ -184,7 +202,7 @@ search_find_next(struct terminal *term) int start_row = term->search.match.row; int start_col = term->search.match.col; - size_t len __attribute__((unused)) = term->search.match_len; + size_t len = term->search.match_len; assert((len == 0 && start_row == -1 && start_col == -1) || (len > 0 && start_row >= 0 && start_col >= 0)); |
