mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-22 08:56:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove calls to assert to check runtime errors in rootston

Browse source
This commit is contained in:
emersion 2017-10-21 13:25:39 +02:00
parent c8570d0e42
commit f2c4b80620
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rootston/input.c
View file

@ -74,15 +74,34 @@ struct roots_input *input_create(struct roots_server *server,
assert(server->desktop);
struct roots_input *input = calloc(1, sizeof(struct roots_input));
assert(input);
if (input == NULL) {
return NULL;
}
input->config = config;
input->server = server;
assert(input->theme = wlr_xcursor_theme_load("default", 16));
assert(input->xcursor = wlr_xcursor_theme_get_cursor(input->theme, "left_ptr"));
input->theme = wlr_xcursor_theme_load("default", 16);
if (input->theme == NULL) {
wlr_log(L_ERROR, "Cannot load xcursor theme");
free(input);
return NULL;
}
input->xcursor = wlr_xcursor_theme_get_cursor(input->theme, "left_ptr");
if (input->xcursor == NULL) {
wlr_log(L_ERROR, "Cannot load xcursor from theme");
wlr_xcursor_theme_destroy(input->theme);
free(input);
return NULL;
}
assert(input->wl_seat = wlr_seat_create(server->wl_display, "seat0"));
input->wl_seat = wlr_seat_create(server->wl_display, "seat0");
if (input->wl_seat == NULL) {
wlr_log(L_ERROR, "Cannot create seat");
wlr_xcursor_theme_destroy(input->theme);
free(input);
return NULL;
}
wlr_seat_set_capabilities(input->wl_seat, WL_SEAT_CAPABILITY_KEYBOARD
| WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_TOUCH);