mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: fix wlr_xcursor_manager_load() ret val

Browse source 
Return value changed in wlroots 0.11.0
This commit is contained in:
Johan Malm 2020-08-11 21:07:23 +01:00
parent f003abf608
commit ce2dc46855
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/server.c
View file

@ -165,13 +165,6 @@ void server_init(struct server *server)
} }
wlr_cursor_attach_output_layout(server->cursor, server->output_layout); wlr_cursor_attach_output_layout(server->cursor, server->output_layout);
// This is done below
// server->cursor_mgr = wlr_xcursor_manager_create(NULL, XCURSOR_SIZE);
// if (!server->cursor_mgr) {
// wlr_log(WLR_ERROR, "cannot create xcursor manager");
// exit(EXIT_FAILURE);
//}
server->cursor_motion.notify = cursor_motion; server->cursor_motion.notify = cursor_motion;
wl_signal_add(&server->cursor->events.motion, &server->cursor_motion); wl_signal_add(&server->cursor->events.motion, &server->cursor_motion);
server->cursor_motion_absolute.notify = cursor_motion_absolute; server->cursor_motion_absolute.notify = cursor_motion_absolute;
@ -245,10 +238,8 @@ void server_init(struct server *server)
server->cursor_mgr = server->cursor_mgr =
wlr_xcursor_manager_create(XCURSOR_DEFAULT, XCURSOR_SIZE); wlr_xcursor_manager_create(XCURSOR_DEFAULT, XCURSOR_SIZE);
if (!server->cursor_mgr) { if (!server->cursor_mgr)
wlr_log(WLR_ERROR, "cannot create xwayland xcursor manager"); wlr_log(WLR_ERROR, "cannot create xwayland xcursor manager");
exit(EXIT_FAILURE);
}
if (setenv("DISPLAY", server->xwayland->display_name, true) < 0) if (setenv("DISPLAY", server->xwayland->display_name, true) < 0)
wlr_log_errno(WLR_ERROR, "unable to set DISPLAY for xwayland"); wlr_log_errno(WLR_ERROR, "unable to set DISPLAY for xwayland");
@ -256,7 +247,7 @@ void server_init(struct server *server)
wlr_log(WLR_DEBUG, "xwayland is running on display %s", wlr_log(WLR_DEBUG, "xwayland is running on display %s",
server->xwayland->display_name); server->xwayland->display_name);
if (wlr_xcursor_manager_load(server->cursor_mgr, 1)) if (!wlr_xcursor_manager_load(server->cursor_mgr, 1))
wlr_log(WLR_ERROR, "cannot load xwayland xcursor theme"); wlr_log(WLR_ERROR, "cannot load xwayland xcursor theme");
struct wlr_xcursor *xcursor; struct wlr_xcursor *xcursor;