Default to using x11bridge instead of sommelier

Replace "direct_x11" with "sommelier" in muvm command line arguments and
default to using x11bridge unless the latter is present.

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

Author: slp

crates/muvm/src/bin/muvm.rs

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

crates/muvm/src/cli_options.rs

@@ -16,7 +16,7 @@ pub struct Options {
     pub root_server_port: u32,
     pub server_port: u32,
     pub fex_images: Vec<String>,
-    pub direct_x11: bool,
+    pub sommelier: bool,
     pub interactive: bool,
     pub command: PathBuf,
     pub command_args: Vec<String>,
@@ -105,9 +105,8 @@ pub fn options() -> OptionParser<Options> {
         .argument("SERVER_PORT")
         .fallback(3334)
         .display_fallback();
-    let direct_x11 = long("direct-x11")
-        .short('x')
-        .help("Use direct X11 forwarding instead of sommelier + XWayland")
+    let sommelier = long("sommelier")
+        .help("Use sommelier + XWayland instead of x11bridge")
         .switch();
     let interactive = long("interactive")
         .short('i')
@@ -129,7 +128,7 @@ pub fn options() -> OptionParser<Options> {
         root_server_port,
         server_port,
         fex_images,
-        direct_x11,
+        sommelier,
         interactive,
         // positionals
         command,