aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-11 16:18:18 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-11 16:18:18 +0000
commit4ad7fdc19c386fada4e1f8401d6da95f2930c201 (patch)
treef79012e93e785e71083f8a658f5e2f21ab9a44f9
parentinput: auto-scroll: apply scrollback.multiplier to the interval divisor (diff)
selection: auto-scroll: add SELECTION_SCROLL_NOT as a scroll ‘direction’
-rw-r--r--input.c29
-rw-r--r--selection.c11
-rw-r--r--terminal.h2
3 files changed, 32 insertions, 10 deletions
diff --git a/input.c b/input.c
index b862408b..a486ca8b 100644
--- a/input.c
+++ b/input.c
@@ -1327,16 +1327,32 @@ wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
/* Cursor is inside the grid, i.e. *not* in the margins */
const bool cursor_is_on_grid = seat->mouse.col >= 0 && seat->mouse.row >= 0;
- const bool scroll_up = y < term->margins.top;
- const bool scroll_down = y > term->height - term->margins.bottom;
+ enum selection_scroll_direction auto_scroll_direction
+ = y < term->margins.top ? SELECTION_SCROLL_UP
+ : y > term->height - term->margins.bottom ? SELECTION_SCROLL_DOWN
+ : SELECTION_SCROLL_NOT;
- if (!scroll_up && !scroll_down)
+ if (auto_scroll_direction == SELECTION_SCROLL_NOT)
selection_stop_scroll_timer(term);
/* Update selection */
if (!term->is_searching) {
- if (scroll_up || scroll_down) {
- int distance = scroll_up
+ if (auto_scroll_direction != SELECTION_SCROLL_NOT) {
+ /*
+ * Start ‘selection auto-scrolling’
+ *
+ * The speed of the scrolling is proportional to the
+ * distance between the mouse and the grid; the
+ * further away the mouse is, the fast we scroll.
+ *
+ * Note that the speed is measures in ‘intervals (in
+ * ns) between each timed scroll of a single line’.
+ *
+ * Thus, the further away the mouse is, the smaller
+ * interval value we use.
+ */
+
+ int distance = auto_scroll_direction == SELECTION_SCROLL_UP
? term->margins.top - y
: y - (term->height - term->margins.bottom);
@@ -1346,8 +1362,7 @@ wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
selection_start_scroll_timer(
term, 400000000 / (divisor > 0 ? divisor : 1),
- scroll_up ? SELECTION_SCROLL_UP : SELECTION_SCROLL_DOWN,
- selection_col);
+ auto_scroll_direction, selection_col);
}
if (cursor_is_on_new_cell || term->selection.end.row < 0)
diff --git a/selection.c b/selection.c
index c774c713..20ed011c 100644
--- a/selection.c
+++ b/selection.c
@@ -817,6 +817,9 @@ fdm_scroll_timer(struct fdm *fdm, int fd, int events, void *data)
}
switch (term->selection.auto_scroll.direction) {
+ case SELECTION_SCROLL_NOT:
+ return true;
+
case SELECTION_SCROLL_UP:
for (uint64_t i = 0; i < expiration_count; i++)
cmd_scrollback_up(term, 1);
@@ -838,6 +841,8 @@ void
selection_start_scroll_timer(struct terminal *term, int interval_ns,
enum selection_scroll_direction direction, int col)
{
+ assert(direction != SELECTION_SCROLL_NOT);
+
if (!term->selection.ongoing)
return;
@@ -875,7 +880,6 @@ selection_start_scroll_timer(struct terminal *term, int interval_ns,
term->selection.auto_scroll.direction = direction;
term->selection.auto_scroll.col = col;
-
return;
err:
@@ -886,11 +890,14 @@ err:
void
selection_stop_scroll_timer(struct terminal *term)
{
- if (term->selection.auto_scroll.fd < 0)
+ if (term->selection.auto_scroll.fd < 0) {
+ assert(term->selection.auto_scroll.direction == SELECTION_SCROLL_NOT);
return;
+ }
fdm_del(term->fdm, term->selection.auto_scroll.fd);
term->selection.auto_scroll.fd = -1;
+ term->selection.auto_scroll.direction = SELECTION_SCROLL_NOT;
}
static void
diff --git a/terminal.h b/terminal.h
index 0a71abb4..544d67a7 100644
--- a/terminal.h
+++ b/terminal.h
@@ -182,7 +182,7 @@ enum cursor_style { CURSOR_BLOCK, CURSOR_UNDERLINE, CURSOR_BAR };
enum selection_kind { SELECTION_NONE, SELECTION_NORMAL, SELECTION_BLOCK };
enum selection_direction {SELECTION_UNDIR, SELECTION_LEFT, SELECTION_RIGHT};
-enum selection_scroll_direction {SELECTION_SCROLL_UP, SELECTION_SCROLL_DOWN};
+enum selection_scroll_direction {SELECTION_SCROLL_NOT, SELECTION_SCROLL_UP, SELECTION_SCROLL_DOWN};
struct ptmx_buffer {
void *data;