leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland-proxy-virtwl

Browse source
This commit is contained in:
Ashley Wulber 2022-10-23 19:48:00 -04:00
parent c41c108c4f
commit 9e8e7a14b7
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main.rs
View file

@ -57,7 +57,7 @@ async fn main() -> Result<()> {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
info!("got environmental variables: {:?}", env_vars); 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) let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars)
.wrap_err("failed to create panel socket")?; .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)) .start(Process::new().with_executable("cosmic-panel").with_env(env))
.await .await
.expect("failed to start panel"); .expect("failed to start panel");
let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars) let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars)
.wrap_err("failed to create applet host")?; .wrap_err("failed to create applet host")?;
process_manager process_manager
@ -75,14 +76,11 @@ async fn main() -> Result<()> {
) )
.await .await
.expect("failed to start applet host"); .expect("failed to start applet host");
let (env, _) = comp::create_privileged_socket(&mut sockets, &env_vars) 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 process_manager
.start( .start(Process::new().with_executable("cosmic-bg").with_env(env))
Process::new()
.with_executable("cosmic-bg")
.with_env(env),
)
.await .await
.expect("failed to start cosmic-bg"); .expect("failed to start cosmic-bg");
socket_tx.send(sockets).unwrap(); socket_tx.send(sockets).unwrap();
@ -91,6 +89,20 @@ async fn main() -> Result<()> {
.await .await
.expect("failed to start settings daemon"); .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 (exit_tx, exit_rx) = oneshot::channel();
let _ = ConnectionBuilder::session()? let _ = ConnectionBuilder::session()?
.name("com.system76.CosmicSession")? .name("com.system76.CosmicSession")?

2
src/process.rs
View file

@ -3,7 +3,7 @@ use color_eyre::eyre::{ContextCompat, Result, WrapErr};
use nix::fcntl; use nix::fcntl;
use std::os::unix::prelude::*; 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 raw_fd = file.as_fd().as_raw_fd();
let fd_flags = fcntl::FdFlag::from_bits( let fd_flags = fcntl::FdFlag::from_bits(
fcntl::fcntl(raw_fd, fcntl::FcntlArg::F_GETFD) fcntl::fcntl(raw_fd, fcntl::FcntlArg::F_GETFD)