mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-17 05:33:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: don’t (can’t) use cursor-shape-v1 when user has set a custom cursor

Browse source 
Well, we _could_, but we’d have to reverse map the string to a
cursor-shape-v1 enum value. Let’s not do that, for now at least.
This commit is contained in:
Daniel Eklöf 2023-06-27 18:40:44 +02:00
parent 9155948ac8
commit ddd6004b27
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
terminal.c
View file

@ -3126,19 +3126,24 @@ term_xcursor_update_for_seat(struct terminal *term, struct seat *seat)
enum cursor_shape shape = CURSOR_SHAPE_NONE;
switch (term->active_surface) {
case TERM_SURF_GRID: {
bool have_custom_cursor =
render_xcursor_is_valid(seat, term->mouse_user_cursor);
case TERM_SURF_GRID:
if (seat->pointer.hidden)
shape = CURSOR_SHAPE_HIDDEN;
shape = seat->pointer.hidden ? CURSOR_SHAPE_HIDDEN
: have_custom_cursor ? CURSOR_SHAPE_CUSTOM //term->mouse_user_cursor
: term->is_searching ? CURSOR_SHAPE_LEFT_PTR
: (seat->mouse.col >= 0 &&
seat->mouse.row >= 0 &&
term_mouse_grabbed(term, seat)) ? CURSOR_SHAPE_TEXT
: CURSOR_SHAPE_LEFT_PTR;
else if (render_xcursor_is_valid(seat, term->mouse_user_cursor))
shape = CURSOR_SHAPE_CUSTOM;
else if (seat->mouse.col >= 0 &&
seat->mouse.row >= 0 &&
term_mouse_grabbed(term, seat))
{
shape = CURSOR_SHAPE_TEXT;
}
else
shape = CURSOR_SHAPE_LEFT_PTR;
break;
}
case TERM_SURF_TITLE:
case TERM_SURF_BUTTON_MINIMIZE:
case TERM_SURF_BUTTON_MAXIMIZE: