StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

fix: launch env vars to launch as much stuff in wayland as possible

Browse Source
This commit is contained in:
Nova
2023-05-01 00:05:00 -04:00
parent 9072c34d50
commit 2f5760c902
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.rs
View File

@@ -180,6 +180,11 @@ fn main() -> Result<()> {
.file_name() .file_name()
.expect("Stardust socket path not found"), .expect("Stardust socket path not found"),
) )
.env("GDK_BACKEND", "wayland")
.env("QT_QPA_PLATFORM", "wayland")
.env("MOZ_ENABLE_WAYLAND", "1")
.env("CLUTTER_BACKEND", "wayland")
.env("SDL_VIDEODRIVER", "wayland")
.spawn(); .spawn();
} }

13
src/nodes/startup.rs
View File

@@ -120,7 +120,7 @@ pub fn create_startup_settings_flex(
Ok(()) Ok(())
} }
macro_rules! env_insert { macro_rules! var_env_insert {
($env:ident, $name:ident) => { ($env:ident, $name:ident) => {
$env.insert(stringify!($name).to_string(), $name.get().unwrap().clone()); $env.insert(stringify!($name).to_string(), $name.get().unwrap().clone());
}; };
@@ -131,9 +131,16 @@ pub fn get_connection_environment_flex(
_data: &[u8], _data: &[u8],
) -> Result<Vec<u8>> { ) -> Result<Vec<u8>> {
let mut env: FxHashMap<String, String> = FxHashMap::default(); let mut env: FxHashMap<String, String> = FxHashMap::default();
env_insert!(env, STARDUST_INSTANCE); var_env_insert!(env, STARDUST_INSTANCE);
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
env_insert!(env, WAYLAND_DISPLAY); {
var_env_insert!(env, WAYLAND_DISPLAY);
env.insert("GDK_BACKEND".to_string(), "wayland".to_string());
env.insert("QT_QPA_PLATFORM".to_string(), "wayland".to_string());
env.insert("MOZ_ENABLE_WAYLAND".to_string(), "1".to_string());
env.insert("CLUTTER_BACKEND".to_string(), "wayland".to_string());
env.insert("SDL_VIDEODRIVER".to_string(), "wayland".to_string());
}
Ok(serialize(env)?) Ok(serialize(env)?)
} }