[WIP] Implement a Wayland DisplayServer

.github/workflows/linux_builds.yml

@@ -114,8 +114,8 @@ jobs:
           # The actual dependencies
           sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \
               libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \
-              libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip \
-              llvm libspeechd-dev speech-dispatcher
+              libdbus-1-dev libudev-dev libxi-dev libxkbcommon-dev libxrandr-dev \
+              libwayland-dev yasm xvfb wget unzip llvm libspeechd-dev speech-dispatcher
 
       - name: Setup Godot build cache
         uses: ./.github/actions/godot-cache

drivers/vulkan/SCsub

@@ -17,8 +17,11 @@ if env["platform"] == "android":
     env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_ANDROID_KHR"])
 elif env["platform"] == "ios":
     env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_IOS_MVK"])
-elif env["platform"] == "linuxbsd" and env["x11"]:
-    env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_XLIB_KHR"])
+elif env["platform"] == "linuxbsd":
+    if env["x11"]:
+        env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_XLIB_KHR"])
+    if env["wayland"]:
+        env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_WAYLAND_KHR"])
 elif env["platform"] == "macos":
     env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_MACOS_MVK"])
 elif env["platform"] == "windows":

modules/openxr/SCsub

@@ -40,6 +40,9 @@ elif env["platform"] == "linuxbsd":
     if env["x11"]:
         env_thirdparty.AppendUnique(CPPDEFINES=["XR_USE_PLATFORM_XLIB"])
 
+    if env["wayland"]:
+        env_thirdparty.AppendUnique(CPPDEFINES=["XR_USE_PLATFORM_WAYLAND"])
+
     # FIXME: Review what needs to be set for Android and macOS.
     env_thirdparty.AppendUnique(CPPDEFINES=["HAVE_SECURE_GETENV"])
 elif env["platform"] == "windows":

platform/linuxbsd/SCsub

@@ -5,6 +5,8 @@ Import("env")
 from platform_methods import run_in_subprocess
 import platform_linuxbsd_builders
 
+thirdparty_dir = "#thirdparty"
+
 common_linuxbsd = [
     "crash_handler_linuxbsd.cpp",
     "os_linuxbsd.cpp",
@@ -13,15 +15,10 @@ common_linuxbsd = [
 ]
 
 if env["x11"]:
-    common_linuxbsd += [
-        "gl_manager_x11.cpp",
-        "detect_prime_x11.cpp",
-        "display_server_x11.cpp",
-        "key_mapping_x11.cpp",
-    ]
-
-    if env["vulkan"]:
-        common_linuxbsd.append("vulkan_context_x11.cpp")
+    common_linuxbsd += SConscript("x11/SCsub")
+
+if env["wayland"]:
+    common_linuxbsd += SConscript("wayland/SCsub")
 
 if env["speechd"]:
     common_linuxbsd.append(["speechd-so_wrap.c", "tts_linux.cpp"])

platform/linuxbsd/detect.py

@@ -43,6 +43,7 @@ def get_opts():
         BoolVariable("speechd", "Detect and use Speech Dispatcher for Text-to-Speech support", True),
         BoolVariable("udev", "Use udev for gamepad connection callbacks", True),
         BoolVariable("x11", "Enable X11 display", True),
+        BoolVariable("wayland", "Enable Wayland display", True),
         BoolVariable("debug_symbols", "Add debugging symbols to release/release_debug builds", True),
         BoolVariable("separate_debug_symbols", "Create a separate file containing debugging symbols", False),
         BoolVariable("touch", "Enable touch events", True),
@@ -209,6 +210,11 @@ def configure(env):
         env.ParseConfig("pkg-config xrender --cflags --libs")
         env.ParseConfig("pkg-config xi --cflags --libs")
 
+    if env["wayland"]:
+        env.ParseConfig("pkg-config wayland-client --cflags --libs")
+        env.ParseConfig("pkg-config wayland-cursor --cflags --libs")
+        env.ParseConfig("pkg-config xkbcommon --cflags --libs")
+
     if env["touch"]:
         env.Append(CPPDEFINES=["TOUCH_ENABLED"])
 
@@ -352,6 +358,12 @@ def configure(env):
             env.Exit(255)
         env.Append(CPPDEFINES=["X11_ENABLED"])
 
+    if env["wayland"]:
+        if not env["vulkan"]:
+            print("Error: Wayland support requires vulkan=yes")
+            env.Exit(255)
+        env.Append(CPPDEFINES=["WAYLAND_ENABLED"])
+
     env.Append(CPPDEFINES=["UNIX_ENABLED"])
     env.Append(CPPDEFINES=[("_FILE_OFFSET_BITS", 64)])