diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2023-08-07 14:53:58 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2023-08-07 14:53:58 +0000 |
| commit | 1faad5add7df9f9e8df262c48b58cc36b9af91a0 (patch) | |
| tree | a8020d0903f63bc7f1bc85ca3f97c32edfb1be1b /terminal.c | |
| parent | Merge branch 'releases/1.15' (diff) | |
| parent | wayland: cursor-shape-v1 is now always available (diff) | |
Merge branch 'wayland-protocols-1.32'
Closes #1391
Diffstat (limited to 'terminal.c')
| -rw-r--r-- | terminal.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -2080,11 +2080,7 @@ term_font_size_reset(struct terminal *term) bool term_fractional_scaling(const struct terminal *term) { -#if defined(HAVE_FRACTIONAL_SCALE) return term->wl->fractional_scale_manager != NULL && term->window->scale > 0.; -#else - return false; -#endif } bool @@ -3180,12 +3176,8 @@ term_xcursor_update_for_seat(struct terminal *term, struct seat *seat) if (seat->pointer.hidden) shape = CURSOR_SHAPE_HIDDEN; -#if defined(HAVE_CURSOR_SHAPE) - else if (cursor_string_to_server_shape(term->mouse_user_cursor) != 0 -#else - else if (false -#endif - || render_xcursor_is_valid(seat, term->mouse_user_cursor)) + else if (cursor_string_to_server_shape(term->mouse_user_cursor) != 0 || + render_xcursor_is_valid(seat, term->mouse_user_cursor)) { shape = CURSOR_SHAPE_CUSTOM; } |
