From bcd111d203f9e421b43e4e31fc750b0515b10d61 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 9 Jul 2019 16:26:36 +0200 Subject: wip: initial scroll back support Can scroll up and down, and stops when the beginning/end of history is reached. However, it probably breaks when the entire scrollback buffer has been filled - we need to detect when the view has wrapped around to the current terminal offset. The detection of when we've reached the bottom of the history is also flawed, and only works when we overshoot the bottom with at least a page. Resizing the windows while in a view most likely doesn't work. The view will not detect a wrapped around scrollback buffer. I.e. if the user has scrolled back, and is stationary at a view, but there is still output being produced. Then eventually the scrollback buffer will wrap around. In this case, the correct thing to do is make the view start following the beginning of the history. Right now it doesn't, meaning once the scrollback buffer wraps around, you'll start seeing command output... --- commands.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 commands.c (limited to 'commands.c') diff --git a/commands.c b/commands.c new file mode 100644 index 00000000..dea9b36e --- /dev/null +++ b/commands.c @@ -0,0 +1,61 @@ +#include "commands.h" + +#define LOG_MODULE "commands" +#define LOG_ENABLE_DBG 1 +#include "log.h" +#include "terminal.h" +#include "render.h" +#include "grid.h" + +#define max(x, y) ((x) > (y) ? (x) : (y)) + +void +cmd_scrollback_up(struct terminal *term) +{ + assert(term->grid->offset >= 0); + int new_view = (term->grid->view + term->grid->num_rows - term->rows) % term->grid->num_rows; + + LOG_WARN("%d" ,new_view); + assert(new_view >= 0); + assert(new_view < term->grid->num_rows); + + while (!term->grid->rows[new_view]->initialized) + new_view = (new_view + 1) % term->grid->num_rows; + + LOG_DBG("scrollback UP: %d -> %d (offset = %d, rows = %d)", + term->grid->view, new_view, term->grid->offset, term->grid->num_rows); + term->grid->view = new_view; + + for (int i = 0; i < term->rows; i++) + grid_row_in_view(term->grid, i)->dirty = true; + + if (term->frame_callback == NULL) + grid_render(term); +} + +void +cmd_scrollback_down(struct terminal *term) +{ + assert(term->grid->offset >= 0); + int new_view = (term->grid->view + term->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; + } + + LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, rows = %d)", + term->grid->view, new_view, term->grid->offset, term->grid->num_rows); + term->grid->view = new_view; + + for (int i = 0; i < term->rows; i++) + grid_row_in_view(term->grid, i)->dirty = true; + + if (term->frame_callback == NULL) + grid_render(term); +} -- cgit v1.3 From b058e6384ab5349cbf78bf471d581a83f531e30a Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 09:15:37 +0200 Subject: scrollback: initial support for mouse scrolling --- commands.c | 34 +++++++++++++++++++++++++--------- commands.h | 4 ++-- input.c | 16 ++++++++++++++-- 3 files changed, 41 insertions(+), 13 deletions(-) (limited to 'commands.c') 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); diff --git a/commands.h b/commands.h index 865cd83f..644523b0 100644 --- a/commands.h +++ b/commands.h @@ -2,5 +2,5 @@ #include "terminal.h" -void cmd_scrollback_up(struct terminal *term); -void cmd_scrollback_down(struct terminal *term); +void cmd_scrollback_up(struct terminal *term, int rows); +void cmd_scrollback_down(struct terminal *term, int rows); diff --git a/input.c b/input.c index a7aba971..f9e7f92b 100644 --- a/input.c +++ b/input.c @@ -143,12 +143,12 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, if (effective_mods == shift) { if (sym == XKB_KEY_Page_Up) { - cmd_scrollback_up(term); + cmd_scrollback_up(term, term->rows); found_map = true; } else if (sym == XKB_KEY_Page_Down) { - cmd_scrollback_down(term); + cmd_scrollback_down(term, term->rows); found_map = true; } } @@ -342,6 +342,18 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { + struct terminal *term = data; + + /* TODO: generate button event for BTN_FORWARD/BTN_BACK? */ + + if (axis != WL_POINTER_AXIS_VERTICAL_SCROLL) + return; + + int amount = wl_fixed_to_int(value); + if (amount < 0) + cmd_scrollback_up(term, -amount); + else + cmd_scrollback_down(term, amount); } static void -- cgit v1.3 From 1d338f8477d64502c71d06e2ee994084f5935054 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 09:29:36 +0200 Subject: scrollback: don't scroll past scrollback history --- commands.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 47bbb4a8..7e29c6e5 100644 --- a/commands.c +++ b/commands.c @@ -8,6 +8,7 @@ #include "grid.h" #define max(x, y) ((x) > (y) ? (x) : (y)) +#define min(x, y) ((x) < (y) ? (x) : (y)) void cmd_scrollback_up(struct terminal *term, int rows) @@ -15,10 +16,12 @@ cmd_scrollback_up(struct terminal *term, int rows) if (term->grid == &term->alt) return; + rows = min(rows, term->grid->num_rows - term->rows); + assert(term->grid->offset >= 0); - int new_view = (term->grid->view + term->grid->num_rows - rows) % term->grid->num_rows; + assert(rows <= term->rows); - LOG_WARN("%d" ,new_view); + int new_view = (term->grid->view + term->grid->num_rows - rows) % term->grid->num_rows; assert(new_view >= 0); assert(new_view < term->grid->num_rows); @@ -26,6 +29,17 @@ cmd_scrollback_up(struct terminal *term, int rows) while (!term->grid->rows[new_view]->initialized) new_view = (new_view + 1) % term->grid->num_rows; + /* Don't scroll past scrollback history */ + int end = (term->grid->offset + term->rows) % term->grid->num_rows; + if (end >= term->grid->offset) { + /* Not wrapped */ + if (new_view >= term->grid->offset && new_view < end) + new_view = end; + } else { + if (new_view >= term->grid->offset || new_view < end) + new_view = end; + } + LOG_DBG("scrollback UP: %d -> %d (offset = %d, rows = %d)", term->grid->view, new_view, term->grid->offset, term->grid->num_rows); term->grid->view = new_view; @@ -43,10 +57,11 @@ cmd_scrollback_down(struct terminal *term, int rows) if (term->grid == &term->alt) return; + rows = min(rows, term->grid->num_rows - term->rows); + assert(term->grid->offset >= 0); - int new_view = (term->grid->view + rows) % term->grid->num_rows; - LOG_WARN("%d" ,new_view); + int new_view = (term->grid->view + rows) % term->grid->num_rows; assert(new_view >= 0); assert(new_view < term->grid->num_rows); @@ -65,6 +80,18 @@ cmd_scrollback_down(struct terminal *term, int rows) } } while (!all_initialized); + /* Don't scroll past scrollback history */ + int end = (term->grid->offset + term->rows) % 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; + } + + LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, rows = %d)", term->grid->view, new_view, term->grid->offset, term->grid->num_rows); term->grid->view = new_view; -- cgit v1.3 From ed0fd2d4427748309e8a66d2d2dc20e7fb04a4e5 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 09:30:35 +0200 Subject: scrollback: don't redraw if view doesn't change --- commands.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 7e29c6e5..f66609cb 100644 --- a/commands.c +++ b/commands.c @@ -42,6 +42,10 @@ cmd_scrollback_up(struct terminal *term, int rows) LOG_DBG("scrollback UP: %d -> %d (offset = %d, rows = %d)", term->grid->view, new_view, term->grid->offset, term->grid->num_rows); + + if (new_view == term->grid->view) + return; + term->grid->view = new_view; for (int i = 0; i < term->rows; i++) @@ -94,6 +98,10 @@ cmd_scrollback_down(struct terminal *term, int rows) LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, rows = %d)", term->grid->view, new_view, term->grid->offset, term->grid->num_rows); + + if (new_view == term->grid->view) + return; + term->grid->view = new_view; for (int i = 0; i < term->rows; i++) -- cgit v1.3 From 18c61a9a2abddf1688fcbe6ac2c63d7faffcf7f2 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 09:55:53 +0200 Subject: scrollback: fix off-by-one when grid size matches terminal/window size --- commands.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index f66609cb..006e537c 100644 --- a/commands.c +++ b/commands.c @@ -30,13 +30,13 @@ cmd_scrollback_up(struct terminal *term, int rows) new_view = (new_view + 1) % term->grid->num_rows; /* Don't scroll past scrollback history */ - int end = (term->grid->offset + term->rows) % term->grid->num_rows; + 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) + if (new_view >= term->grid->offset && new_view <= end) new_view = end; } else { - if (new_view >= term->grid->offset || new_view < end) + if (new_view >= term->grid->offset || new_view <= end) new_view = end; } @@ -85,13 +85,13 @@ cmd_scrollback_down(struct terminal *term, int rows) } while (!all_initialized); /* Don't scroll past scrollback history */ - int end = (term->grid->offset + term->rows) % term->grid->num_rows; + 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) + if (new_view >= term->grid->offset && new_view <= end) new_view = term->grid->offset; } else { - if (new_view >= term->grid->offset || new_view < end) + if (new_view >= term->grid->offset || new_view <= end) new_view = term->grid->offset; } -- cgit v1.3 From d8d4b343626807e421ff95c032041165bae65597 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 14:28:20 +0200 Subject: scrollback: fix scrolling outside initialized lines in new terminal --- commands.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 006e537c..dcf2a3f6 100644 --- a/commands.c +++ b/commands.c @@ -29,6 +29,16 @@ cmd_scrollback_up(struct terminal *term, int rows) while (!term->grid->rows[new_view]->initialized) new_view = (new_view + 1) % term->grid->num_rows; + if (new_view == term->grid->view) { + /* + * This happens when scrolling up in a newly opened terminal; + * every single line (except those already visible) are + * uninitalized, and the loop above will bring us back to + * where we started. + */ + return; + } + /* Don't scroll past scrollback history */ int end = (term->grid->offset + term->rows - 1) % term->grid->num_rows; if (end >= term->grid->offset) { -- cgit v1.3 From a01efd07e36d1eb5180b70cd6aa21984337c5aba Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 14:42:48 +0200 Subject: scrollback: don't allow more scrolling when already at the top or bottom --- commands.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index dcf2a3f6..19b2100c 100644 --- a/commands.c +++ b/commands.c @@ -44,14 +44,14 @@ cmd_scrollback_up(struct terminal *term, int rows) if (end >= term->grid->offset) { /* Not wrapped */ if (new_view >= term->grid->offset && new_view <= end) - new_view = end; + new_view = end + 1; } else { if (new_view >= term->grid->offset || new_view <= end) - new_view = end; + new_view = end + 1; } - LOG_DBG("scrollback UP: %d -> %d (offset = %d, rows = %d)", - term->grid->view, new_view, term->grid->offset, term->grid->num_rows); + LOG_DBG("scrollback UP: %d -> %d (offset = %d, end = %d, rows = %d)", + term->grid->view, new_view, term->grid->offset, end, term->grid->num_rows); if (new_view == term->grid->view) return; @@ -71,6 +71,9 @@ cmd_scrollback_down(struct terminal *term, int rows) if (term->grid == &term->alt) return; + if (term->grid->view == term->grid->offset) + return; + rows = min(rows, term->grid->num_rows - term->rows); assert(term->grid->offset >= 0); @@ -106,8 +109,8 @@ cmd_scrollback_down(struct terminal *term, int rows) } - LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, rows = %d)", - term->grid->view, new_view, term->grid->offset, term->grid->num_rows); + LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, end = %d, rows = %d)", + term->grid->view, new_view, term->grid->offset, end, term->grid->num_rows); if (new_view == term->grid->view) return; -- cgit v1.3 From 607755536f85eb3506adf63ec59df54fb8dc4021 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 14:43:46 +0200 Subject: scrollback: use term_damage_view() --- commands.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 19b2100c..db316f82 100644 --- a/commands.c +++ b/commands.c @@ -58,9 +58,7 @@ cmd_scrollback_up(struct terminal *term, int rows) term->grid->view = new_view; - for (int i = 0; i < term->rows; i++) - grid_row_in_view(term->grid, i)->dirty = true; - + term_damage_view(term); if (term->frame_callback == NULL) grid_render(term); } @@ -117,9 +115,7 @@ cmd_scrollback_down(struct terminal *term, int rows) term->grid->view = new_view; - for (int i = 0; i < term->rows; i++) - grid_row_in_view(term->grid, i)->dirty = true; - + term_damage_view(term); if (term->frame_callback == NULL) grid_render(term); } -- cgit v1.3 From 5144fcba0c261a2164321a573b9a591a33f9fc44 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 14:45:00 +0200 Subject: scrollback: disable debug logging --- commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index db316f82..472cf880 100644 --- a/commands.c +++ b/commands.c @@ -1,7 +1,7 @@ #include "commands.h" #define LOG_MODULE "commands" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "terminal.h" #include "render.h" -- cgit v1.3