mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

WebBrowserComponent: Force webkit2gtk to use the X11 backend

Browse source
This commit is contained in:
reuk 2022-10-03 15:28:37 +01:00
parent 9b1b518998
commit 022eb21006
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp
View file

@ -116,6 +116,10 @@ public:
JUCE_GENERATE_FUNCTION_WITH_DEFAULT (g_signal_connect_data, juce_g_signal_connect_data,
(gpointer, const gchar*, GCallback, gpointer, GClosureNotify, GConnectFlags), gulong)
//==============================================================================
JUCE_GENERATE_FUNCTION_WITH_DEFAULT (gdk_set_allowed_backends, juce_gdk_set_allowed_backends,
(const char*), void)
//==============================================================================
JUCE_DECLARE_SINGLETON_SINGLETHREADED_MINIMAL (WebKitSymbols)
@ -182,18 +186,19 @@ private:
bool loadGtkSymbols()
{
return loadSymbols (gtkLib,
makeSymbolBinding (juce_gtk_init, "gtk_init"),
makeSymbolBinding (juce_gtk_plug_new, "gtk_plug_new"),
makeSymbolBinding (juce_gtk_scrolled_window_new, "gtk_scrolled_window_new"),
makeSymbolBinding (juce_gtk_container_add, "gtk_container_add"),
makeSymbolBinding (juce_gtk_widget_show_all, "gtk_widget_show_all"),
makeSymbolBinding (juce_gtk_plug_get_id, "gtk_plug_get_id"),
makeSymbolBinding (juce_gtk_main, "gtk_main"),
makeSymbolBinding (juce_gtk_main_quit, "gtk_main_quit"),
makeSymbolBinding (juce_g_unix_fd_add, "g_unix_fd_add"),
makeSymbolBinding (juce_g_object_ref, "g_object_ref"),
makeSymbolBinding (juce_g_object_unref, "g_object_unref"),
makeSymbolBinding (juce_g_signal_connect_data, "g_signal_connect_data"));
makeSymbolBinding (juce_gtk_init, "gtk_init"),
makeSymbolBinding (juce_gtk_plug_new, "gtk_plug_new"),
makeSymbolBinding (juce_gtk_scrolled_window_new, "gtk_scrolled_window_new"),
makeSymbolBinding (juce_gtk_container_add, "gtk_container_add"),
makeSymbolBinding (juce_gtk_widget_show_all, "gtk_widget_show_all"),
makeSymbolBinding (juce_gtk_plug_get_id, "gtk_plug_get_id"),
makeSymbolBinding (juce_gtk_main, "gtk_main"),
makeSymbolBinding (juce_gtk_main_quit, "gtk_main_quit"),
makeSymbolBinding (juce_g_unix_fd_add, "g_unix_fd_add"),
makeSymbolBinding (juce_g_object_ref, "g_object_ref"),
makeSymbolBinding (juce_g_object_unref, "g_object_unref"),
makeSymbolBinding (juce_g_signal_connect_data, "g_signal_connect_data"),
makeSymbolBinding (juce_gdk_set_allowed_backends, "gdk_set_allowed_backends"));
}
//==============================================================================
@ -348,6 +353,9 @@ public:
{
CommandReceiver::setBlocking (outChannel, true);
// webkit2gtk crashes when using the wayland backend embedded into an x11 window
WebKitSymbols::getInstance()->juce_gdk_set_allowed_backends ("x11");
WebKitSymbols::getInstance()->juce_gtk_init (nullptr, nullptr);
auto* settings = WebKitSymbols::getInstance()->juce_webkit_settings_new();