Intelligently enable Wayland in SDL

MFEK · Mar 13, 2023 · bd588ab · bd588ab
1 parent e1cadb8
commit bd588ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/user_interface/egui_manager.rs → src/user_interface/egui_manager/mod.rs b/src/user_interface/egui_manager.rs → src/user_interface/egui_manager/mod.rs
diff --git a/src/user_interface/sdl.rs b/src/user_interface/sdl.rs
@@ -18,6 +18,13 @@ impl Interface {
         filename: &str,
         viewport: &mut Viewport,
     ) -> (Sdl, Window, RCHandle<GrDirectContext>, GLContext) {
+        const WL_ENV: &'static str = "WAYLAND_DISPLAY";
+        if let Some(_) = std::env::var_os(WL_ENV) {
+            let (k, v) = ("SDL_VIDEODRIVER", "wayland");
+            std::env::set_var(k, v);
+            log::info!("Setting {k} to {v} as we see in env {}={}. If this fails, set {k} to `x11`!", WL_ENV, std::env::var(WL_ENV).unwrap());
+        }
+
         // SDL initialization
         let sdl_context = sdl2::init().expect("Failed to initialize sdl2");
         let video_subsystem = sdl_context