muvm-guest: add support for running as muvm-x11bridge

Signed-off-by: Val Packett <[email protected]>

Author: valpackett

crates/muvm/src/guest/bin/muvm-guest.rs

@@ -10,7 +10,7 @@ use anyhow::{anyhow, Context, Result};
 use muvm::guest::box64::setup_box;
 use muvm::guest::bridge::common::{bridge_loop, bridge_loop_with_listenfd};
 use muvm::guest::bridge::pipewire::{pipewire_sock_path, PipeWireProtocolHandler};
-use muvm::guest::bridge::x11::start_x11bridge;
+use muvm::guest::bridge::x11::{start_x11bridge, X11ProtocolHandler};
 use muvm::guest::fex::setup_fex;
 use muvm::guest::hidpipe::start_hidpipe;
 use muvm::guest::mount::mount_filesystems;
@@ -37,6 +37,10 @@ fn main() -> Result<ExitCode> {
             bridge_loop_with_listenfd::<PipeWireProtocolHandler>(pipewire_sock_path);
             return Ok(());
         },
+        "muvm-x11bridge" => {
+            bridge_loop_with_listenfd::<X11ProtocolHandler>(|| "/tmp/.X11-unix/X1".to_owned());
+            return Ok(ExitCode::SUCCESS);
+        },
         "muvm-remote" => {
             let rt = tokio::runtime::Runtime::new().unwrap();
             let mut command_args = env::args().skip(1);

crates/muvm/src/guest/bridge/x11.rs

@@ -155,7 +155,7 @@ struct CrossDomainFutexDestroy {
     pad: u32,
 }
 
-enum X11ResourceFinalizer {
+pub enum X11ResourceFinalizer {
     Gem(GemHandleFinalizer),
     Futex(u32),
 }
@@ -186,7 +186,7 @@ impl MessageResourceFinalizer for X11ResourceFinalizer {
     }
 }
 
-struct X11ProtocolHandler {
+pub struct X11ProtocolHandler {
     // futex_watchers gets dropped first
     futex_watchers: HashMap<u32, FutexWatcherThread>,
     got_first_req: bool,