mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up memory leaks

Browse source
This commit is contained in:
Johan Malm 2020-05-19 21:20:58 +01:00
parent d7b9a7238b
commit 3285766446
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
main.c
View file

@ -132,11 +132,13 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
wlr_cursor_attach_output_layout(server.cursor, server.output_layout); wlr_cursor_attach_output_layout(server.cursor, server.output_layout);
server.cursor_mgr = wlr_xcursor_manager_create(NULL, XCURSOR_SIZE);
if (!server.cursor_mgr) { // This is done below
wlr_log(WLR_ERROR, "cannot create xcursor manager"); //server.cursor_mgr = wlr_xcursor_manager_create(NULL, XCURSOR_SIZE);
return 1; //if (!server.cursor_mgr) {
} // wlr_log(WLR_ERROR, "cannot create xcursor manager");
// return 1;
//}
server.cursor_motion.notify = server_cursor_motion; server.cursor_motion.notify = server_cursor_motion;
wl_signal_add(&server.cursor->events.motion, &server.cursor_motion); wl_signal_add(&server.cursor->events.motion, &server.cursor_motion);
@ -272,6 +274,18 @@ int main(int argc, char *argv[])
wl_display_run(server.wl_display); wl_display_run(server.wl_display);
struct output *_output, *_output_tmp;
wl_list_for_each_safe (_output, _output_tmp, &server.outputs, link) {
wl_list_remove(&_output->link);
free(_output);
}
struct output *_keyboard, *_keyboard_tmp;
wl_list_for_each_safe (_keyboard, _keyboard_tmp, &server.keyboards, link) {
wl_list_remove(&_keyboard->link);
free(_keyboard);
}
wlr_cursor_destroy(server.cursor);
wlr_output_layout_destroy(server.output_layout);
wlr_xwayland_destroy(server.xwayland); wlr_xwayland_destroy(server.xwayland);
wlr_xcursor_manager_destroy(server.cursor_mgr); wlr_xcursor_manager_destroy(server.cursor_mgr);
wl_display_destroy_clients(server.wl_display); wl_display_destroy_clients(server.wl_display);