mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace wl_output_destroy() by wl_output_release() when possible

Browse Source
This commit is contained in:
ManoloFLTK 2023-12-10 12:48:06 +01:00
parent 094ee9e953
commit 861bc339c0
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
View File

@ -1143,8 +1143,13 @@ static void registry_handle_global(void *user_data, struct wl_registry *wl_regis
(Fl_Wayland_Screen_Driver::output*)calloc(1, sizeof *output);
output->id = id;
output->wld_scale = 1;
#ifdef WL_OUTPUT_RELEASE_SINCE_VERSION
const int used_version = WL_OUTPUT_RELEASE_SINCE_VERSION;
#else
const int used_version = 2;
#endif
output->wl_output = (struct wl_output*)wl_registry_bind(wl_registry,
id, &wl_output_interface, 2);
id, &wl_output_interface, fl_min(used_version, version));
output->gui_scale = 1.f;
wl_proxy_set_tag((struct wl_proxy *) output->wl_output, &proxy_tag);
wl_output_add_listener(output->wl_output, &output_listener, output);
@ -1327,7 +1332,14 @@ void Fl_Wayland_Screen_Driver::close_display() {
wl_list_for_each(output, &outputs, link) {
wl_list_remove(&output->link);
screen_count_set( wl_list_length(&outputs) );
if (output->wl_output) wl_output_destroy(output->wl_output);
if (output->wl_output) {
#ifdef WL_OUTPUT_RELEASE_SINCE_VERSION
if (wl_output_get_version(output->wl_output) >= WL_OUTPUT_RELEASE_SINCE_VERSION)
wl_output_release(output->wl_output);
else
#endif
wl_output_destroy(output->wl_output);
}
free(output);
break;
}