From 9e8e7a14b77c294bdea5e7f5c160fe6ad5057b9e Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Sun, 23 Oct 2022 19:48:00 -0400
Subject: [PATCH] wayland-proxy-virtwl

---
 src/main.rs    | 26 +++++++++++++++++++-------
 src/process.rs |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 4a695ee..e646db6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,7 +57,7 @@ async fn main() -> Result<()> {
 		.collect::<Vec<_>>();
 	info!("got environmental variables: {:?}", env_vars);
 
-	let mut sockets = Vec::with_capacity(2);
+	let mut sockets = Vec::with_capacity(3);
 
 	let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars)
 		.wrap_err("failed to create panel socket")?;
@@ -65,6 +65,7 @@ async fn main() -> Result<()> {
 		.start(Process::new().with_executable("cosmic-panel").with_env(env))
 		.await
 		.expect("failed to start panel");
+
 	let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars)
 		.wrap_err("failed to create applet host")?;
 	process_manager
@@ -75,14 +76,11 @@ async fn main() -> Result<()> {
 		)
 		.await
 		.expect("failed to start applet host");
+
 	let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars)
-		.wrap_err("failed to create applet host")?;
+		.wrap_err("failed to create cosmic-bg")?;
 	process_manager
-		.start(
-			Process::new()
-				.with_executable("cosmic-bg")
-				.with_env(env),
-		)
+		.start(Process::new().with_executable("cosmic-bg").with_env(env))
 		.await
 		.expect("failed to start cosmic-bg");
 	socket_tx.send(sockets).unwrap();
@@ -91,6 +89,20 @@ async fn main() -> Result<()> {
 		.await
 		.expect("failed to start settings daemon");
 
+	process_manager
+		.start(
+			Process::new()
+				.with_executable("wayland-proxy-virtwl")
+				.with_args(vec![
+					"--wayland-display",
+					"wayland-0",
+					"--x-display=0",
+					"--xrdb",
+					"Xft.dpi:150",
+				]),
+		)
+		.await
+		.expect("start wayland-proxy-virtwl failed");
 	let (exit_tx, exit_rx) = oneshot::channel();
 	let _ = ConnectionBuilder::session()?
 		.name("com.system76.CosmicSession")?
diff --git a/src/process.rs b/src/process.rs
index c803089..7f381e9 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -3,7 +3,7 @@ use color_eyre::eyre::{ContextCompat, Result, WrapErr};
 use nix::fcntl;
 use std::os::unix::prelude::*;
 
-fn mark_as_not_cloexec(file: &impl AsFd) -> Result<()> {
+pub(crate) fn mark_as_not_cloexec(file: &impl AsFd) -> Result<()> {
 	let raw_fd = file.as_fd().as_raw_fd();
 	let fd_flags = fcntl::FdFlag::from_bits(
 		fcntl::fcntl(raw_fd, fcntl::FcntlArg::F_GETFD)