mirror of
https://github.com/fltk/fltk.git
synced 2026-02-06 00:01:57 +08:00
Update libdecor to commit 060fe761 dated 1-dec-2023
This commit is contained in:
@@ -30,7 +30,7 @@ Current versions of bundled libraries (as of November 29, 2023):
|
||||
nanosvg abcd277ea4 [1] 2022-12-22 1.4.0
|
||||
png libpng-1.6.40 2023-06-21 1.4.0
|
||||
zlib zlib-1.3 2023-08-18 1.4.0
|
||||
libdecor cc58dd2a [2] 2023-11-02 1.4.0
|
||||
libdecor 060fe761 [2] 2023-12-01 1.4.0
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Previous versions of bundled libraries (FLTK 1.3.x):
|
||||
|
||||
@@ -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,6 +390,10 @@ libdecor_plugin_cairo_destroy(struct libdecor_plugin *plugin)
|
||||
|
||||
wl_list_for_each_safe(output, output_tmp,
|
||||
&plugin_cairo->output_list, link) {
|
||||
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);
|
||||
|
||||
@@ -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,6 +426,10 @@ libdecor_plugin_gtk_destroy(struct libdecor_plugin *plugin)
|
||||
|
||||
wl_list_for_each_safe(output, output_tmp,
|
||||
&plugin_gtk->output_list, link) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user