aboutsummaryrefslogtreecommitdiff
path: root/commands.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-10 07:15:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-10 07:15:37 +0000
commitb058e6384ab5349cbf78bf471d581a83f531e30a (patch)
tree63432eb19230edb3ab83fe5677652d0800c59bb3 /commands.c
parentwip: initial scroll back support (diff)
scrollback: initial support for mouse scrolling
Diffstat (limited to 'commands.c')
-rw-r--r--commands.c34
1 files changed, 25 insertions, 9 deletions
diff --git a/commands.c b/commands.c
index dea9b36e..47bbb4a8 100644
--- a/commands.c
+++ b/commands.c
@@ -10,15 +10,19 @@
#define max(x, y) ((x) > (y) ? (x) : (y))
void
-cmd_scrollback_up(struct terminal *term)
+cmd_scrollback_up(struct terminal *term, int rows)
{
+ if (term->grid == &term->alt)
+ return;
+
assert(term->grid->offset >= 0);
- int new_view = (term->grid->view + term->grid->num_rows - term->rows) % term->grid->num_rows;
+ int new_view = (term->grid->view + term->grid->num_rows - rows) % term->grid->num_rows;
LOG_WARN("%d" ,new_view);
assert(new_view >= 0);
assert(new_view < term->grid->num_rows);
+ /* Avoid scrolling in uninitialized rows */
while (!term->grid->rows[new_view]->initialized)
new_view = (new_view + 1) % term->grid->num_rows;
@@ -34,20 +38,32 @@ cmd_scrollback_up(struct terminal *term)
}
void
-cmd_scrollback_down(struct terminal *term)
+cmd_scrollback_down(struct terminal *term, int rows)
{
+ if (term->grid == &term->alt)
+ return;
+
assert(term->grid->offset >= 0);
- int new_view = (term->grid->view + term->rows) % term->grid->num_rows;
+ int new_view = (term->grid->view + rows) % term->grid->num_rows;
LOG_WARN("%d" ,new_view);
assert(new_view >= 0);
assert(new_view < term->grid->num_rows);
- if (!term->grid->rows[new_view]->initialized) {
- while (!term->grid->rows[new_view]->initialized)
- new_view = (new_view + term->grid->num_rows - 1) % term->grid->num_rows;
- new_view = (new_view + term->grid->num_rows - term->rows + 1) % 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]->initialized) {
+ all_initialized = false;
+ new_view--;
+ break;
+ }
+ }
+ } while (!all_initialized);
LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, rows = %d)",
term->grid->view, new_view, term->grid->offset, term->grid->num_rows);