aboutsummaryrefslogtreecommitdiff
path: root/selection.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-26 10:31:13 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-29 04:57:22 +0000
commitd675cf872022e0e1bf2100211d7607773de1016c (patch)
tree4d9e2692d0c66ad4cb04721b21d106f6ebf719ab /selection.c
parentchangelog: add 1.4.4 section (diff)
input: margins are not selectable
* Fix col/row calculation in pointer-enter event; we did not take the margins into account. * seat->mouse.col,row are now set to -1 if the cursor is inside the margins. That is, col/row are only ever valid when the mouse is actually over the grid, and not in the margins. * Use regular 'left-ptr' mouse cursor when mouse is inside the margins, to not make the user think he/she can start a selection. Besides making things clearer, this also fixes a crash that occurred if you started a selection in e.g. the right margin.
Diffstat (limited to 'selection.c')
-rw-r--r--selection.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/selection.c b/selection.c
index 354f6f53..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