aboutsummaryrefslogtreecommitdiff
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
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.
-rw-r--r--CHANGELOG.md9
-rw-r--r--input.c40
-rw-r--r--selection.c7
3 files changed, 39 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 117dbdc5..eafaed22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,15 @@
* [1.2.0](#1-2-0)
## 1.4.4
+### Changed
+
+* Mouse cursor is now always a `left_ptr` when inside the margins, to
+ indicate it is not possible to start a selection.
+
+
+### Fixed
+
+* Crash when starting a selection inside the margins.
## 1.4.3
diff --git a/input.c b/input.c
index c7f4b073..7fa62570 100644
--- a/input.c
+++ b/input.c
@@ -1023,11 +1023,16 @@ wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
int y = wl_fixed_to_int(surface_y) * term->scale;
switch ((term->active_surface = term_surface_kind(term, surface))) {
- case TERM_SURF_GRID:
- seat->mouse.col = x / term->cell_width;
- seat->mouse.row = y / term->cell_height;
+ case TERM_SURF_GRID: {
+ int col = (x - term->margins.left) / term->cell_width;
+ int row = (y - term->margins.top) / term->cell_height;
+
+ seat->mouse.col = col >= 0 && col < term->cols ? col : -1;
+ seat->mouse.row = row >= 0 && row < term->rows ? row : -1;
+
term_xcursor_update(term);
break;
+ }
case TERM_SURF_SEARCH:
case TERM_SURF_TITLE:
@@ -1165,26 +1170,31 @@ wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
break;
case TERM_SURF_GRID: {
+ term_xcursor_update(term);
+
int col = (x - term->margins.left) / term->cell_width;
int row = (y - term->margins.top) / term->cell_height;
- if (col < 0 || row < 0 || col >= term->cols || row >= term->rows)
- return;
+ int old_col = seat->mouse.col;
+ int old_row = seat->mouse.row;
+
+ seat->mouse.col = col >= 0 && col < term->cols ? col : -1;
+ seat->mouse.row = row >= 0 && row < term->rows ? row : -1;
+
+ if (seat->mouse.col < 0 || seat->mouse.row < 0)
+ break;
bool update_selection = seat->mouse.button == BTN_LEFT || seat->mouse.button == BTN_RIGHT;
bool update_selection_early = term->selection.end.row == -1;
if (update_selection && update_selection_early)
- selection_update(term, col, row);
+ selection_update(term, seat->mouse.col, seat->mouse.row);
- if (col == seat->mouse.col && row == seat->mouse.row)
+ if (old_col == seat->mouse.col && old_row == seat->mouse.row)
break;
- seat->mouse.col = col;
- seat->mouse.row = row;
-
if (update_selection && !update_selection_early)
- selection_update(term, col, row);
+ selection_update(term, seat->mouse.col, seat->mouse.row);
if (!term_mouse_grabbed(term, seat)) {
term_mouse_motion(
@@ -1360,9 +1370,11 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
if (selection_enabled(term, seat)) {
switch (seat->mouse.count) {
case 1:
- selection_start(
- term, seat->mouse.col, seat->mouse.row,
- seat->kbd.ctrl ? SELECTION_BLOCK : SELECTION_NORMAL);
+ if (seat->mouse.col >= 0 && seat->mouse.row >= 0) {
+ selection_start(
+ term, seat->mouse.col, seat->mouse.row,
+ seat->kbd.ctrl ? SELECTION_BLOCK : SELECTION_NORMAL);
+ }
break;
case 2:
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