aboutsummaryrefslogtreecommitdiff
path: root/selection.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-28 18:01:56 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-28 18:01:56 +0000
commit295083059ca8f642437abf44329698d1bbbb0067 (patch)
treee6ebc7f9d0330589a19c420f7ba138438eb8e74c /selection.c
parentchangelog: improved font size consistency across monitors with different DPI (diff)
parentconfig: fix check for scrollback-indicator-format=percentage (diff)
Merge branch 'master' into diagonal-dpi
Diffstat (limited to 'selection.c')
-rw-r--r--selection.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/selection.c b/selection.c
index d5add464..ffe06c27 100644
--- a/selection.c
+++ b/selection.c
@@ -25,9 +25,10 @@ bool
selection_enabled(const struct terminal *term, struct seat *seat)
{
return
- term->mouse_tracking == MOUSE_NONE ||
- term_mouse_grabbed(term, seat) ||
- term->is_searching;
+ seat->mouse.col >= 0 && seat->mouse.row >= 0 &&
+ (term->mouse_tracking == MOUSE_NONE ||
+ term_mouse_grabbed(term, seat) ||
+ term->is_searching);
}
bool
@@ -372,8 +373,8 @@ selection_extend_normal(struct terminal *term, int col, int row, uint32_t serial
if (row < start->row || (row == start->row && col < start->col)) {
/* Extend selection to start *before* current start */
- new_start = (struct coord){col, row};
- new_end = *end;
+ new_start = *end;
+ new_end = (struct coord){col, row};
}
else if (row > end->row || (row == end->row && col > end->col)) {
@@ -391,8 +392,8 @@ selection_extend_normal(struct terminal *term, int col, int row, uint32_t serial
abs(linear - (end->row * term->cols + end->col)))
{
/* Move start point */
- new_start = (struct coord){col, row};
- new_end = *end;
+ new_start = *end;
+ new_end = (struct coord){col, row};
}
else {
@@ -440,13 +441,13 @@ selection_extend_block(struct terminal *term, int col, int row, uint32_t serial)
/* Move one of the top corners */
if (abs(col - top_left.col) < abs(col - top_right.col)) {
- new_start = (struct coord){col, row};
- new_end = bottom_right;
+ new_start = bottom_right;
+ new_end = (struct coord){col, row};
}
else {
- new_start = (struct coord){col, row};
- new_end = bottom_left;
+ new_start = bottom_left;
+ new_end = (struct coord){col, row};
}
}