diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-02 08:52:22 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-02 08:52:22 +0000 |
| commit | eff8481cdc6c37407faaa3167ea6f6897b12f544 (patch) | |
| tree | 70ec70db35ff9877e83b10a24072947158609a96 | |
| parent | input: don’t execute mouse bindings when the application is grabbing the mouse (diff) | |
selection: remove selection_enabled()
Its name did not reflect its semantics. Since it was only used in a
single place, “inline” it there, and get rid of it.
| -rw-r--r-- | selection.c | 10 | ||||
| -rw-r--r-- | selection.h | 1 | ||||
| -rw-r--r-- | terminal.c | 5 |
3 files changed, 4 insertions, 12 deletions
diff --git a/selection.c b/selection.c index e9c3fce6..90c6c392 100644 --- a/selection.c +++ b/selection.c @@ -34,16 +34,6 @@ static const char *const mime_type_map[] = { }; bool -selection_enabled(const struct terminal *term, struct seat *seat) -{ - return - seat->mouse.col >= 0 && seat->mouse.row >= 0 && - (term->mouse_tracking == MOUSE_NONE || - term_mouse_grabbed(term, seat) || - term->is_searching); -} - -bool selection_on_rows(const struct terminal *term, int row_start, int row_end) { LOG_DBG("on rows: %d-%d, range: %d-%d (offset=%d)", diff --git a/selection.h b/selection.h index aa027d3e..241ec262 100644 --- a/selection.h +++ b/selection.h @@ -8,7 +8,6 @@ extern const struct wl_data_device_listener data_device_listener; extern const struct zwp_primary_selection_device_v1_listener primary_selection_device_listener; -bool selection_enabled(const struct terminal *term, struct seat *seat); void selection_start( struct terminal *term, int col, int row, enum selection_kind new_kind, bool spaces_only); @@ -2570,7 +2570,10 @@ term_xcursor_update_for_seat(struct terminal *term, struct seat *seat) const char *xcursor = seat->pointer.hidden ? XCURSOR_HIDDEN : term->is_searching ? XCURSOR_LEFT_PTR - : selection_enabled(term, seat) ? XCURSOR_TEXT + : (seat->mouse.col >= 0 && + seat->mouse.row >= 0 && + term_mouse_grabbed(term, seat)) ? XCURSOR_TEXT + : term->is_searching ? XCURSOR_TEXT : XCURSOR_LEFT_PTR; render_xcursor_set(seat, term, xcursor); |
