haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GTK: Add workarounds for broadway and allow wayland GDK backend. 

For testing. X11 backend is still used unless GDK_BACKEND=wayland
is set explicitly.
This commit is contained in:
Alex Shvartzkop 2023-06-13 09:42:20 +03:00
parent a87fada9e5
commit 3c742c71a0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/kiplatform/gtk/environment.cpp
View File

@ -20,6 +20,7 @@
#include <glib.h>
#include <gio/gio.h>
#include <gdk/gdk.h>
#include <kiplatform/environment.h>
#include <wx/filename.h>
#include <wx/utils.h>
@ -35,9 +36,20 @@ void KIPLATFORM::ENV::Init()
if( wxGetEnv( wxT( "XDG_CURRENT_DESKTOP" ), &wm ) && wm.CmpNoCase( wxT( "Unity" ) ) == 0 )
wxSetEnv ( wxT("UBUNTU_MENUPROXY" ), wxT( "0" ) );
// Force the use of X11 backend (or wayland-x11 compatibility layer). This is
// required until wxWidgets supports the Wayland compositors
wxSetEnv( wxT( "GDK_BACKEND" ), wxT( "x11" ) );
wxString gdkBackend;
wxGetEnv( wxT( "GDK_BACKEND" ), &gdkBackend );
if( gdkBackend == wxT( "broadway" ) )
{
// Work around static setter in wx
gdk_set_allowed_backends( "broadway" );
}
else if( gdkBackend != wxT( "wayland" ) )
{
// Force the use of X11 backend (or wayland-x11 compatibility layer). This is
// required until wxWidgets supports the Wayland compositors
wxSetEnv( wxT( "GDK_BACKEND" ), wxT( "x11" ) );
}
// Set GTK2-style input instead of xinput2. This disables touchscreen and smooth
// scrolling. It's needed to ensure that we are not getting multiple mouse scroll