hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1228 from arandomhuman/misc-mem

Browse source 
Miscellaneous memory leak fixes
This commit is contained in:
emersion 2018-09-03 08:26:59 +02:00 committed by GitHub
commit d22431d969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 75 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/x11/backend.c
View file

@ -163,6 +163,8 @@ static bool backend_start(struct wlr_backend *backend) {
0, 0,
0, 0,
0); 0);
free(reply);
} }
} }
#endif #endif

1
examples/idle.c
View file

@ -129,6 +129,7 @@ int main(int argc, char *argv[]) {
wl_registry_add_listener(registry, &registry_listener, NULL); wl_registry_add_listener(registry, &registry_listener, NULL);
wl_display_dispatch(display); wl_display_dispatch(display);
wl_display_roundtrip(display); wl_display_roundtrip(display);
free(registry);
if (idle_manager == NULL) { if (idle_manager == NULL) {
fprintf(stderr, "display doesn't support idle protocol\n"); fprintf(stderr, "display doesn't support idle protocol\n");

19
examples/multi-pointer.c
View file

@ -239,15 +239,21 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
case WLR_INPUT_DEVICE_POINTER:; case WLR_INPUT_DEVICE_POINTER:;
struct sample_cursor *cursor = calloc(1, sizeof(struct sample_cursor)); struct sample_cursor *cursor = calloc(1, sizeof(struct sample_cursor));
struct sample_pointer *pointer = calloc(1, sizeof(struct sample_pointer)); struct sample_pointer *pointer = calloc(1, sizeof(struct sample_pointer));
pointer->device = device; pointer->device = device;
cursor->sample = sample; cursor->sample = sample;
cursor->device = device; cursor->device = device;
cursor->cursor = wlr_cursor_create(); cursor->cursor = wlr_cursor_create();
@ -324,6 +330,11 @@ int main(int argc, char *argv[]) {
cursor_destroy(cursor); cursor_destroy(cursor);
} }
struct sample_pointer *pointer, *tmp_pointer;
wl_list_for_each_safe(pointer, tmp_pointer, &state.pointers, link) {
free(pointer);
}
wlr_xcursor_theme_destroy(theme); wlr_xcursor_theme_destroy(theme);
wlr_output_layout_destroy(state.layout); wlr_output_layout_destroy(state.layout);
} }

12
examples/output-layout.c
View file

@ -239,8 +239,14 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
default: default:
@ -285,6 +291,6 @@ int main(int argc, char *argv[]) {
wlr_texture_destroy(state.cat_texture); wlr_texture_destroy(state.cat_texture);
wlr_output_layout_destroy(state.layout);
wl_display_destroy(state.display); wl_display_destroy(state.display);
wlr_output_layout_destroy(state.layout);
} }

10
examples/pointer.c
View file

@ -304,8 +304,14 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
default: default:

10
examples/rotation.c
View file

@ -188,8 +188,14 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
default: default:

10
examples/simple.c
View file

@ -141,8 +141,14 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
default: default:

10
examples/tablet.c
View file

@ -297,8 +297,14 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
case WLR_INPUT_DEVICE_TABLET_PAD:; case WLR_INPUT_DEVICE_TABLET_PAD:;

10
examples/touch.c
View file

@ -210,8 +210,14 @@ void new_input_notify(struct wl_listener *listener, void *data) {
wlr_log(WLR_ERROR, "Failed to create XKB context"); wlr_log(WLR_ERROR, "Failed to create XKB context");
exit(1); exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context, struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
wlr_log(WLR_ERROR, "Failed to create XKB keymap");
exit(1);
}
wlr_keyboard_set_keymap(device->keyboard, keymap);
xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
break; break;
case WLR_INPUT_DEVICE_TOUCH:; case WLR_INPUT_DEVICE_TOUCH:;

15
types/tablet_v2/wlr_tablet_v2.c
View file

@ -283,6 +283,7 @@ void wlr_tablet_v2_destroy(struct wlr_tablet_manager_v2 *manager) {
} }
wlr_signal_emit_safe(&manager->events.destroy, manager); wlr_signal_emit_safe(&manager->events.destroy, manager);
wl_list_remove(&manager->display_destroy.link);
wl_global_destroy(manager->wl_global); wl_global_destroy(manager->wl_global);
free(manager); free(manager);
} }
@ -294,13 +295,6 @@ struct wlr_tablet_manager_v2 *wlr_tablet_v2_create(struct wl_display *display) {
return NULL; return NULL;
} }
wl_signal_init(&tablet->events.destroy);
wl_list_init(&tablet->clients);
wl_list_init(&tablet->seats);
tablet->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &tablet->display_destroy);
tablet->wl_global = wl_global_create(display, tablet->wl_global = wl_global_create(display,
&zwp_tablet_manager_v2_interface, TABLET_MANAGER_VERSION, &zwp_tablet_manager_v2_interface, TABLET_MANAGER_VERSION,
tablet, tablet_v2_bind); tablet, tablet_v2_bind);
@ -309,5 +303,12 @@ struct wlr_tablet_manager_v2 *wlr_tablet_v2_create(struct wl_display *display) {
return NULL; return NULL;
} }
wl_signal_init(&tablet->events.destroy);
wl_list_init(&tablet->clients);
wl_list_init(&tablet->seats);
tablet->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &tablet->display_destroy);
return tablet; return tablet;
} }