blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set default cursor image in rootston

This commit is contained in:
emersion 2017-12-11 10:36:22 +01:00
parent 8ccb5b0b66
commit 925497fbea
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/rootston/config.h
View File

@ -51,6 +51,7 @@ struct roots_cursor_config {
char *mapped_output; char *mapped_output;
struct wlr_box *mapped_box; struct wlr_box *mapped_box;
char *theme; char *theme;
char *default_image;
struct wl_list link; struct wl_list link;
}; };

2
include/rootston/cursor.h
View File

@ -20,6 +20,8 @@ struct roots_cursor {
struct roots_seat *seat; struct roots_seat *seat;
struct wlr_cursor *cursor; struct wlr_cursor *cursor;
const char *default_xcursor;
enum roots_cursor_mode mode; enum roots_cursor_mode mode;
// state from input (review if this is necessary) // state from input (review if this is necessary)

4
rootston/config.c
View File

@ -176,6 +176,9 @@ static void config_handle_cursor(struct roots_config *config,
} else if (strcmp(name, "theme") == 0) { } else if (strcmp(name, "theme") == 0) {
free(cc->theme); free(cc->theme);
cc->theme = strdup(value); cc->theme = strdup(value);
} else if (strcmp(name, "default-image") == 0) {
free(cc->default_image);
cc->default_image = strdup(value);
} else { } else {
wlr_log(L_ERROR, "got unknown cursor config: %s", name); wlr_log(L_ERROR, "got unknown cursor config: %s", name);
} }
@ -454,6 +457,7 @@ void roots_config_destroy(struct roots_config *config) {
free(cc->mapped_output); free(cc->mapped_output);
free(cc->mapped_box); free(cc->mapped_box);
free(cc->theme); free(cc->theme);
free(cc->default_image);
free(cc); free(cc);
} }

3
rootston/cursor.c
View File

@ -22,6 +22,7 @@ struct roots_cursor *roots_cursor_create(struct roots_seat *seat) {
free(cursor); free(cursor);
return NULL; return NULL;
} }
cursor->default_xcursor = ROOTS_XCURSOR_DEFAULT;
return cursor; return cursor;
} }
@ -48,7 +49,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
} }
if (set_compositor_cursor) { if (set_compositor_cursor) {
wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
ROOTS_XCURSOR_DEFAULT, cursor->cursor); cursor->default_xcursor, cursor->cursor);
cursor->cursor_client = NULL; cursor->cursor_client = NULL;
} }
if (view) { if (view) {

6
rootston/desktop.c
View File

@ -408,10 +408,14 @@ struct roots_desktop *desktop_create(struct roots_server *server,
desktop->config = config; desktop->config = config;
const char *cursor_theme = NULL; const char *cursor_theme = NULL;
const char *cursor_default = ROOTS_XCURSOR_DEFAULT;
struct roots_cursor_config *cc = struct roots_cursor_config *cc =
roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME); roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME);
if (cc != NULL) { if (cc != NULL) {
cursor_theme = cc->theme; cursor_theme = cc->theme;
if (cc->default_image != NULL) {
cursor_default = cc->default_image;
}
} }
desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme, desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme,
@ -449,7 +453,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
wlr_log(L_ERROR, "Cannot load XWayland XCursor theme"); wlr_log(L_ERROR, "Cannot load XWayland XCursor theme");
} }
struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor( struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(
desktop->xcursor_manager, ROOTS_XCURSOR_DEFAULT, 1); desktop->xcursor_manager, cursor_default, 1);
if (xcursor != NULL) { if (xcursor != NULL) {
struct wlr_xcursor_image *image = xcursor->images[0]; struct wlr_xcursor_image *image = xcursor->images[0];
wlr_xwayland_set_cursor(desktop->xwayland, image->buffer, wlr_xwayland_set_cursor(desktop->xwayland, image->buffer,

5
rootston/seat.c
View File

@ -442,6 +442,9 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) {
roots_config_get_cursor(seat->input->config, seat->seat->name); roots_config_get_cursor(seat->input->config, seat->seat->name);
if (cc != NULL) { if (cc != NULL) {
cursor_theme = cc->theme; cursor_theme = cc->theme;
if (cc->default_image != NULL) {
seat->cursor->default_xcursor = cc->default_image;
}
} }
if (!seat->cursor->xcursor_manager) { if (!seat->cursor->xcursor_manager) {
@ -465,7 +468,7 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) {
} }
wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager, wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager,
ROOTS_XCURSOR_DEFAULT, seat->cursor->cursor); seat->cursor->default_xcursor, seat->cursor->cursor);
wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x, wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
seat->cursor->cursor->y); seat->cursor->cursor->y);
} }