diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-04 18:28:40 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-04 18:28:40 +0000 |
| commit | 1d9cd8cc04effe88f450fe36186869452fa930fc (patch) | |
| tree | 4414b085b22ec4f7ae6264fd04995ab0456370f8 /terminal.c | |
| parent | Merge branch 'reset-term-ime-on-text-input-leave' (diff) | |
| parent | changelog: some mouse events never being sent to the client application (diff) | |
Merge branch 'mouse-events-never-sent-to-client'
Diffstat (limited to 'terminal.c')
| -rw-r--r-- | terminal.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -2431,9 +2431,10 @@ term_mouse_grabbed(const struct terminal *term, struct seat *seat) /* * Mouse is grabbed by us, regardless of whether mouse tracking has been enabled or not. */ - return seat->kbd_focus == term && - seat->kbd.shift && - !seat->kbd.alt && /*!seat->kbd.ctrl &&*/ !seat->kbd.meta; + return term->mouse_tracking == MOUSE_NONE || + (seat->kbd_focus == term && + seat->kbd.shift && + !seat->kbd.alt && /*!seat->kbd.ctrl &&*/ !seat->kbd.meta); } void @@ -2569,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); |
