Remove x11bridge feature gate

Make x11bridge a non-optional component of muvm, in preparation of
making it the default way to proxy graphical apps from the guest to the
host.

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

crates/muvm/src/bin/muvm.rs

@@ -421,7 +421,6 @@ fn main() -> Result<()> {
     );
     env.insert("MUVM_SERVER_COOKIE".to_owned(), cookie.to_string());
 
-    #[cfg(feature = "x11bridge")]
     if options.direct_x11 {
         let display =
             env::var("DISPLAY").context("X11 forwarding requested but DISPLAY is unset")?;

crates/muvm/src/cli_options.rs

@@ -109,14 +109,6 @@ pub fn options() -> OptionParser<Options> {
         .short('x')
         .help("Use direct X11 forwarding instead of sommelier + XWayland")
         .switch();
-
-    #[cfg(not(feature = "x11bridge"))]
-    let direct_x11 = direct_x11
-        .guard(
-            |x| !*x,
-            "--direct-x11 requires the `x11bridge` crate feature",
-        )
-        .hide();
     let interactive = long("interactive")
         .short('i')
         .help("Allocate a tty guest-side and connect it to the current stdin/out")

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

@@ -13,7 +13,6 @@ use muvm::guest::net::configure_network;
 use muvm::guest::socket::setup_socket_proxy;
 use muvm::guest::sommelier::exec_sommelier;
 use muvm::guest::user::setup_user;
-#[cfg(feature = "x11bridge")]
 use muvm::guest::x11::setup_x11_forwarding;
 use rustix::process::{getrlimit, setrlimit, Resource};
 
@@ -81,12 +80,7 @@ fn main() -> Result<()> {
     let pulse_path = pulse_path.join("native");
     setup_socket_proxy(pulse_path, 3333)?;
 
-    #[cfg(feature = "x11bridge")]
-    let direct_x11 = setup_x11_forwarding(run_path)?;
-    #[cfg(not(feature = "x11bridge"))]
-    let direct_x11 = false;
-
-    if !direct_x11 {
+    if !setup_x11_forwarding(run_path)? {
         // Will not return if successful.
         exec_sommelier(&options.command, &options.command_args)
             .context("Failed to execute sommelier")?;

crates/muvm/src/guest/mod.rs

@@ -5,5 +5,4 @@ pub mod net;
 pub mod socket;
 pub mod sommelier;
 pub mod user;
-#[cfg(feature = "x11bridge")]
 pub mod x11;