luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://gitlab.com/gambas/gambas

Browse source
This commit is contained in:
gambas 2020-12-22 03:39:25 +01:00
commit daafba28dc
3 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gb.gtk3/src/main.cpp
View file

@ -451,9 +451,22 @@ static void hook_main(int *argc, char ***argv)
{ {
static bool init = false; static bool init = false;
char *env;
if (init) if (init)
return; return;
env = getenv("GB_GUI_PLATFORM");
if (env && *env)
{
if (!strcasecmp(env, "X11"))
putenv((char *)"GDK_BACKEND=x11");
else if (!strcasecmp(env, "WAYLAND"))
putenv((char *)"GDK_BACKEND=wayland");
else
fprintf(stderr, "gb.gtk3: warning: unknown platform: %s\n", env);
}
gApplication::init(argc, argv); gApplication::init(argc, argv);
load_platform(); load_platform();

14
gb.qt5/src/main.cpp
View file

@ -718,11 +718,23 @@ static void hook_main(int *argc, char ***argv)
{ {
QString platform; QString platform;
const char *comp; const char *comp;
char *env;
env = getenv("GB_GUI_PLATFORM");
if (env && *env)
{
if (!strcasecmp(env, "X11"))
putenv((char *)"QT_QPA_PLATFORM=xcb");
else if (!strcasecmp(env, "WAYLAND"))
putenv((char *)"QT_QPA_PLATFORM=wayland");
else
fprintf(stderr, QT_NAME ": warning: unknown platform: %s\n", env);
}
new MyApplication(*argc, *argv); new MyApplication(*argc, *argv);
platform = qApp->platformName(); platform = qApp->platformName();
fprintf(stderr, "platform = %s\n", TO_UTF8(platform));
if (platform == "wayland") if (platform == "wayland")
{ {
comp = "gb.qt5.wayland"; comp = "gb.qt5.wayland";

22
gb.sdl2/src/main.c
View file

@ -131,6 +131,28 @@ static bool event_loop()
static void my_main(int *argc, char **argv) static void my_main(int *argc, char **argv)
{ {
char *env;
const char *driver = NULL;
env = getenv("GB_GUI_PLATFORM");
if (env && *env)
{
if (!strcasecmp(env, "wayland"))
driver = "SDL_VIDEODRIVER=wayland";
else if (!strcasecmp(env, "x11"))
driver = "SDL_VIDEODRIVER=x11";
else
fprintf(stderr, "gb.sdl2: warning: unsupported platform: %s\n", env);
}
if (!driver)
{
if (getenv("WAYLAND_DISPLAY"))
putenv("SDL_VIDEODRIVER=wayland");
}
else
putenv((char *)driver);
init_sdl(); init_sdl();
CLASS_Window = GB.FindClass("Window"); CLASS_Window = GB.FindClass("Window");