Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-02-05 15:59:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update libdecor to commit 060fe761 dated 1-dec-2023

Browse Source
This commit is contained in:
ManoloFLTK
2023-12-02 16:59:21 +01:00
parent d8dac2a088
commit 0aa8e28be0
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libdecor/src/plugins/cairo/libdecor-cairo.c
View File

@@ -296,6 +296,9 @@ synthesize_pointer_leave(struct seat *seat);
static bool
own_proxy(struct wl_proxy *proxy)
{
if (!proxy)
return false;
return (wl_proxy_get_tag(proxy) == &libdecor_cairo_proxy_tag);
}
@@ -387,7 +390,11 @@ libdecor_plugin_cairo_destroy(struct libdecor_plugin *plugin)
wl_list_for_each_safe(output, output_tmp,
&plugin_cairo->output_list, link) {
wl_output_destroy(output->wl_output);
if (wl_output_get_version (output->wl_output) >=
WL_OUTPUT_RELEASE_SINCE_VERSION)
wl_output_release(output->wl_output);
else
wl_output_destroy(output->wl_output);
free(output);
}
@@ -2570,7 +2577,8 @@ init_wl_output(struct libdecor_plugin_cairo *plugin_cairo,
output->id = id;
output->wl_output =
wl_registry_bind(plugin_cairo->wl_registry,
id, &wl_output_interface, 2);
id, &wl_output_interface,
MIN (version, 3));
wl_proxy_set_tag((struct wl_proxy *) output->wl_output,
&libdecor_cairo_proxy_tag);
wl_output_add_listener(output->wl_output, &output_listener, output);

18
libdecor/src/plugins/gtk/libdecor-gtk.c
View File

@@ -330,6 +330,9 @@ static const char *libdecor_gtk_proxy_tag = "libdecor-gtk";
static bool
own_proxy(struct wl_proxy *proxy)
{
if (!proxy)
return false;
return (wl_proxy_get_tag(proxy) == &libdecor_gtk_proxy_tag);
}
@@ -423,7 +426,11 @@ libdecor_plugin_gtk_destroy(struct libdecor_plugin *plugin)
wl_list_for_each_safe(output, output_tmp,
&plugin_gtk->output_list, link) {
wl_output_destroy(output->wl_output);
if (wl_output_get_version (output->wl_output) >=
WL_OUTPUT_RELEASE_SINCE_VERSION)
wl_output_release(output->wl_output);
else
wl_output_destroy(output->wl_output);
free(output);
}
@@ -2651,7 +2658,8 @@ init_wl_output(struct libdecor_plugin_gtk *plugin_gtk,
output->id = id;
output->wl_output =
wl_registry_bind(plugin_gtk->wl_registry,
id, &wl_output_interface, 2);
id, &wl_output_interface,
MIN (version, 3));
wl_proxy_set_tag((struct wl_proxy *) output->wl_output,
&libdecor_gtk_proxy_tag);
wl_output_add_listener(output->wl_output, &output_listener, output);
@@ -2811,10 +2819,8 @@ libdecor_plugin_new(struct libdecor *context)
gtk_disable_setlocale();
if (!gtk_init_check(NULL, NULL)) {
libdecor_notify_plugin_error(
plugin_gtk->context,
LIBDECOR_ERROR_COMPOSITOR_INCOMPATIBLE,
"GTK cannot connect to Wayland compositor");
fprintf(stderr, "libdecor-gtk-WARNING: Failed to initialize GTK\n");
libdecor_plugin_gtk_destroy(&plugin_gtk->plugin);
return NULL;
}