aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2021-11-19 14:02:48 +0000
committerJonas Ådahl <jadahl@gmail.com>2021-11-29 15:26:40 +0000
commit5c2557b42116dd6d0f86c90b2cf04cd43f80a36e (patch)
treed4d1d51f24fe9f16ef6c179ddd2cff6e19a76f60 /terminal.c
parentMerge branch 'letter-spacing-regression' (diff)
terminal: Make seat xcursor update focus aware
When term_xcursor_update_for_seat() was called on e.g. keyboard focus loss, it'd update the curret xcursor to 'text' even if it was e.g. on top of the window title, or resize areas. This makes the function a bit more focus aware, and will not be so eager to set the text xcursor.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c43
1 files changed, 35 insertions, 8 deletions
diff --git a/terminal.c b/terminal.c
index df8128fc..83204675 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3015,14 +3015,41 @@ term_mouse_motion(struct terminal *term, int button, int row, int col,
void
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
- : (seat->mouse.col >= 0 &&
- seat->mouse.row >= 0 &&
- term_mouse_grabbed(term, seat)) ? XCURSOR_TEXT
- : term->is_searching ? XCURSOR_TEXT
- : XCURSOR_LEFT_PTR;
+ const char *xcursor;
+
+ switch (term->active_surface) {
+ case TERM_SURF_GRID: {
+ xcursor = seat->pointer.hidden ? XCURSOR_HIDDEN
+ : term->is_searching ? XCURSOR_LEFT_PTR
+ : (seat->mouse.col >= 0 &&
+ seat->mouse.row >= 0 &&
+ term_mouse_grabbed(term, seat)) ? XCURSOR_TEXT
+ : term->is_searching ? XCURSOR_TEXT
+ : XCURSOR_LEFT_PTR;
+ break;
+ }
+ case TERM_SURF_SEARCH:
+ case TERM_SURF_SCROLLBACK_INDICATOR:
+ case TERM_SURF_RENDER_TIMER:
+ case TERM_SURF_JUMP_LABEL:
+ case TERM_SURF_TITLE:
+ case TERM_SURF_BUTTON_MINIMIZE:
+ case TERM_SURF_BUTTON_MAXIMIZE:
+ case TERM_SURF_BUTTON_CLOSE:
+ xcursor = XCURSOR_LEFT_PTR;
+ break;
+
+ case TERM_SURF_BORDER_LEFT:
+ case TERM_SURF_BORDER_RIGHT:
+ case TERM_SURF_BORDER_TOP:
+ case TERM_SURF_BORDER_BOTTOM:
+ xcursor = xcursor_for_csd_border(term, seat->mouse.x, seat->mouse.y);
+ break;
+
+ case TERM_SURF_NONE:
+ default:
+ return;
+ }
render_xcursor_set(seat, term, xcursor);
}