-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f84d57d
commit edfa77e
Showing
27 changed files
with
2,254 additions
and
57 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| **WayVR acts as a bridge between Wayland applications and wlx-overlay-s panels, allowing you to display your applications within a VR environment. Internally, WayVR utilizes Smithay to run a Wayland compositor.** | ||
|
|
||
| # Features | ||
|
|
||
| - Display Wayland applications without GPU overhead (zero-copy via dma-buf) | ||
| - Mouse input | ||
| - Precision scrolling support | ||
| - XWayland "support" via `cage` | ||
|
|
||
| # Supported hardware | ||
|
|
||
| ### Confirmed working GPUs | ||
|
|
||
| - Navi 32 family: AMD Radeon RX 7800 XT **\*** | ||
| - Navi 23 family: AMD Radeon RX 6600 XT | ||
| - Navi 21 family: AMD Radeon Pro W6800, AMD Radeon RX 6800 XT | ||
| - Nvidia GTX 16 Series | ||
| - _Your GPU here? (Let us know!)_ | ||
|
|
||
| **\*** - With dmabuf modifier mitigation (probably Mesa bug) | ||
|
|
||
| # Supported software | ||
|
|
||
| - Basically all Qt applications (they work out of the box) | ||
| - Most XWayland applications via `cage` | ||
|
|
||
| # Known issues | ||
|
|
||
| - Context menus are not functional in most cases yet | ||
|
|
||
| - Due to unknown circumstances, dma-buf textures may display various graphical glitches due to invalid dma-buf tiling modifier. Please report your GPU model when filing an issue. Alternatively, you can run wlx-overlay-s with `LIBGL_ALWAYS_SOFTWARE=1` to mitigate that (only the Smithay compositor will run in software renderer mode, wlx will still be accelerated). | ||
|
|
||
| - Potential data race in the rendering pipeline - A texture could be displayed during the clear-and-blit process in the compositor, causing minor artifacts (no fence sync support yet). | ||
|
|
||
| - Even though some applications support Wayland, some still check for the `DISPLAY` environment variable and an available X11 server, throwing an error. This can be fixed by running `cage`. | ||
|
|
||
| - GNOME still insists on rendering client-side decorations instead of server-side ones. This results in all GTK applications looking odd due to additional window shadows. [Fix here, "Client-side decorations"](https://wiki.archlinux.org/title/GTK) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| use std::{io::Read, os::unix::net::UnixStream, sync::Arc}; | ||
|
|
||
| use smithay::{ | ||
| backend::input::Keycode, | ||
| input::{keyboard::KeyboardHandle, pointer::PointerHandle}, | ||
| reexports::wayland_server, | ||
| utils::SerialCounter, | ||
| }; | ||
|
|
||
| use super::{ | ||
| comp::{self}, | ||
| display, | ||
| }; | ||
|
|
||
| pub struct WayVRClient { | ||
| pub client: wayland_server::Client, | ||
| pub display_handle: display::DisplayHandle, | ||
| pub pid: i32, | ||
| } | ||
|
|
||
| pub struct WayVRManager { | ||
| pub state: comp::Application, | ||
| pub seat_keyboard: KeyboardHandle<comp::Application>, | ||
| pub seat_pointer: PointerHandle<comp::Application>, | ||
| pub serial_counter: SerialCounter, | ||
| pub wayland_env: super::WaylandEnv, | ||
|
|
||
| display: wayland_server::Display<comp::Application>, | ||
| listener: wayland_server::ListeningSocket, | ||
|
|
||
| pub clients: Vec<WayVRClient>, | ||
| } | ||
|
|
||
| fn get_display_auth_from_pid(pid: i32) -> anyhow::Result<String> { | ||
| let path = format!("/proc/{}/environ", pid); | ||
| let mut env_data = String::new(); | ||
| std::fs::File::open(path)?.read_to_string(&mut env_data)?; | ||
|
|
||
| let lines: Vec<&str> = env_data.split('\0').filter(|s| !s.is_empty()).collect(); | ||
|
|
||
| for line in lines { | ||
| if let Some((key, value)) = line.split_once('=') { | ||
| if key == "WAYVR_DISPLAY_AUTH" { | ||
| return Ok(String::from(value)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| anyhow::bail!("Failed to get display auth from PID {}", pid); | ||
| } | ||
|
|
||
| impl WayVRManager { | ||
| pub fn new( | ||
| state: comp::Application, | ||
| display: wayland_server::Display<comp::Application>, | ||
| seat_keyboard: KeyboardHandle<comp::Application>, | ||
| seat_pointer: PointerHandle<comp::Application>, | ||
| ) -> anyhow::Result<Self> { | ||
| let (wayland_env, listener) = create_wayland_listener()?; | ||
|
|
||
| Ok(Self { | ||
| state, | ||
| display, | ||
| seat_keyboard, | ||
| seat_pointer, | ||
| listener, | ||
| wayland_env, | ||
| serial_counter: SerialCounter::new(), | ||
| clients: Vec::new(), | ||
| }) | ||
| } | ||
|
|
||
| fn accept_connection( | ||
| &mut self, | ||
| stream: UnixStream, | ||
| displays: &mut display::DisplayVec, | ||
| ) -> anyhow::Result<()> { | ||
| let client = self | ||
| .display | ||
| .handle() | ||
| .insert_client(stream, Arc::new(comp::ClientState::default())) | ||
| .unwrap(); | ||
|
|
||
| let creds = client.get_credentials(&self.display.handle())?; | ||
| let auth_key = get_display_auth_from_pid(creds.pid)?; | ||
|
|
||
| for (idx, cell) in displays.vec.iter().enumerate() { | ||
| if let Some(cell) = &cell { | ||
| let display = &cell.obj; | ||
| if display.auth_key_matches(auth_key.as_str()) { | ||
| let display_handle = display::DisplayVec::get_handle(cell, idx); | ||
|
|
||
| self.clients.push(WayVRClient { | ||
| client, | ||
| display_handle, | ||
| pid: creds.pid, | ||
| }); | ||
| return Ok(()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| anyhow::bail!("Process auth key is invalid or selected display is non-existent"); | ||
| } | ||
|
|
||
| fn accept_connections(&mut self, displays: &mut display::DisplayVec) -> anyhow::Result<()> { | ||
| if let Some(stream) = self.listener.accept()? { | ||
| if let Err(e) = self.accept_connection(stream, displays) { | ||
| log::error!("Failed to accept connection: {}", e); | ||
| } | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| pub fn tick_wayland(&mut self, displays: &mut display::DisplayVec) -> anyhow::Result<()> { | ||
| if let Err(e) = self.accept_connections(displays) { | ||
| log::error!("accept_connections failed: {}", e); | ||
| } | ||
|
|
||
| self.display.dispatch_clients(&mut self.state)?; | ||
| self.display.flush_clients()?; | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| pub fn send_key(&mut self, virtual_key: u32, down: bool) { | ||
| let state = if down { | ||
| smithay::backend::input::KeyState::Pressed | ||
| } else { | ||
| smithay::backend::input::KeyState::Released | ||
| }; | ||
|
|
||
| self.seat_keyboard.input::<(), _>( | ||
| &mut self.state, | ||
| Keycode::new(virtual_key), | ||
| state, | ||
| self.serial_counter.next_serial(), | ||
| 0, | ||
| |_, _, _| smithay::input::keyboard::FilterResult::Forward, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const STARTING_WAYLAND_ADDR_IDX: u32 = 20; | ||
|
|
||
| fn create_wayland_listener() -> anyhow::Result<(super::WaylandEnv, wayland_server::ListeningSocket)> | ||
| { | ||
| let mut env = super::WaylandEnv { | ||
| display_num: STARTING_WAYLAND_ADDR_IDX, | ||
| }; | ||
|
|
||
| let listener = loop { | ||
| let display_str = env.display_num_string(); | ||
| log::debug!("Trying to open socket \"{}\"", display_str); | ||
| match wayland_server::ListeningSocket::bind(display_str.as_str()) { | ||
| Ok(listener) => { | ||
| log::debug!("Listening to {}", display_str); | ||
| break listener; | ||
| } | ||
| Err(e) => { | ||
| log::debug!( | ||
| "Failed to open socket \"{}\" (reason: {}), trying next...", | ||
| display_str, | ||
| e | ||
| ); | ||
|
|
||
| env.display_num += 1; | ||
| if env.display_num > STARTING_WAYLAND_ADDR_IDX + 20 { | ||
| // Highly unlikely for the user to have 20 Wayland displays enabled at once. Return error instead. | ||
| anyhow::bail!("Failed to create wayland-server socket") | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| Ok((env, listener)) | ||
| } |
Oops, something went wrong.