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

Merge branch 'fallback-mouse-cursor'

Browse source 
Closes #738
This commit is contained in:
Daniel Eklöf 2022-02-07 18:07:35 +01:00
commit c9da1dc152
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -42,7 +42,7 @@
### Added ### Added
* OSC-22 - set xcursor pointer. * OSC-22 - set xcursor pointer.
* Add "xterm" as fallback cursor where "text" is not available.
### Changed ### Changed

6
pgo/pgo.c
View file

@ -68,6 +68,12 @@ void render_refresh(struct terminal *term) {}
void render_refresh_csd(struct terminal *term) {} void render_refresh_csd(struct terminal *term) {}
void render_refresh_title(struct terminal *term) {} void render_refresh_title(struct terminal *term) {}
bool
render_xcursor_is_valid(const struct seat *seat, const char *cursor)
{
return true;
}
bool bool
render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor) render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor)
{ {

8
render.c
View file

@ -4017,8 +4017,12 @@ render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor
seat->pointer.theme, xcursor); seat->pointer.theme, xcursor);
if (seat->pointer.cursor == NULL) { if (seat->pointer.cursor == NULL) {
LOG_ERR("failed to load xcursor pointer '%s'", xcursor); seat->pointer.cursor = wl_cursor_theme_get_cursor(
return false; seat->pointer.theme, XCURSOR_TEXT_FALLBACK );
if (seat->pointer.cursor == NULL) {
LOG_ERR("failed to load xcursor pointer '%s', and fallback '%s'", xcursor, XCURSOR_TEXT_FALLBACK);
return false;
}
} }
} else } else
seat->pointer.cursor = NULL; seat->pointer.cursor = NULL;

1
terminal.c
View file

@ -48,6 +48,7 @@
const char *const XCURSOR_HIDDEN = "hidden"; const char *const XCURSOR_HIDDEN = "hidden";
const char *const XCURSOR_LEFT_PTR = "left_ptr"; const char *const XCURSOR_LEFT_PTR = "left_ptr";
const char *const XCURSOR_TEXT = "text"; const char *const XCURSOR_TEXT = "text";
const char *const XCURSOR_TEXT_FALLBACK = "xterm";
//const char *const XCURSOR_HAND2 = "hand2"; //const char *const XCURSOR_HAND2 = "hand2";
const char *const XCURSOR_TOP_LEFT_CORNER = "top_left_corner"; const char *const XCURSOR_TOP_LEFT_CORNER = "top_left_corner";
const char *const XCURSOR_TOP_RIGHT_CORNER = "top_right_corner"; const char *const XCURSOR_TOP_RIGHT_CORNER = "top_right_corner";

1
terminal.h
View file

@ -664,6 +664,7 @@ struct terminal {
extern const char *const XCURSOR_HIDDEN; extern const char *const XCURSOR_HIDDEN;
extern const char *const XCURSOR_LEFT_PTR; extern const char *const XCURSOR_LEFT_PTR;
extern const char *const XCURSOR_TEXT; extern const char *const XCURSOR_TEXT;
extern const char *const XCURSOR_TEXT_FALLBACK;
//extern const char *const XCURSOR_HAND2; //extern const char *const XCURSOR_HAND2;
extern const char *const XCURSOR_TOP_LEFT_CORNER; extern const char *const XCURSOR_TOP_LEFT_CORNER;
extern const char *const XCURSOR_TOP_RIGHT_CORNER; extern const char *const XCURSOR_TOP_RIGHT_CORNER;