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

libdecor: prevent crash using bullt-in libdecor with GDK_BACKEND=x11 (#1029)

Browse Source
This commit is contained in:
ManoloFLTK 2024-08-01 18:55:10 +02:00
parent 53469038ce
commit 48ec9ea660
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libdecor/build/fl_libdecor.c
View File

@ -23,6 +23,7 @@
#endif #endif
#include <dlfcn.h> #include <dlfcn.h>
#include <stdlib.h>
static void *dlopen_corrected(const char *, int); static void *dlopen_corrected(const char *, int);
#define dlopen(A, B) dlopen_corrected(A, B) #define dlopen(A, B) dlopen_corrected(A, B)
#include "fl_libdecor.h" #include "fl_libdecor.h"
@ -126,7 +127,20 @@ struct libdecor *fl_libdecor_new(struct wl_display *wl_display, const struct lib
// no plug-in was found by dlopen(), use built-in plugin instead // no plug-in was found by dlopen(), use built-in plugin instead
// defined in the source code of the built-in plugin: libdecor-cairo.c or libdecor-gtk.c // defined in the source code of the built-in plugin: libdecor-cairo.c or libdecor-gtk.c
extern const struct libdecor_plugin_description libdecor_plugin_description; extern const struct libdecor_plugin_description libdecor_plugin_description;
#if HAVE_GTK
bool gdk_caution = false;
if (getenv("GDK_BACKEND") && strcmp(getenv("GDK_BACKEND"), "x11") == 0) {
// Environment variable GDK_BACKEND=x11 makes the .constructor below fail
// for the built-in GTK plugin and then FLTK crashes (#1029).
// Temporarily unset GDK_BACKEND to prevent that.
gdk_caution = true;
unsetenv("GDK_BACKEND");
}
#endif
context->plugin = libdecor_plugin_description.constructor(context); context->plugin = libdecor_plugin_description.constructor(context);
#if HAVE_GTK
if (gdk_caution) putenv("GDK_BACKEND=x11");
#endif
} }
wl_display_flush(wl_display); wl_display_flush(wl_display);