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

✨ Get WAYLAND_SOCKET from comp; run cosmic-panel

Browse source
This commit is contained in:
Lucy 2022-06-24 12:56:38 -04:00
parent 8bf6567a91
commit fb1a832916
No known key found for this signature in database
GPG key ID: EBC517FAD666BBF1
3 changed files with 60 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/comp.rs
View file

@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::process::{ProcessEvent, ProcessHandler};
use tokio::sync::mpsc::unbounded_channel;
use tokio::sync::{mpsc::unbounded_channel, oneshot};
use tokio_util::sync::CancellationToken;
pub async fn run_compositor(token: CancellationToken) {
pub async fn run_compositor(token: CancellationToken, wayland_socket_tx: oneshot::Sender<String>) {
let mut wayland_socket_tx = Some(wayland_socket_tx);
let (tx, mut rx) = unbounded_channel::<ProcessEvent>();
ProcessHandler::new(tx, &token).run("cosmic-comp", vec![]);
let span = info_span!("cosmic-comp");
@ -12,12 +14,21 @@ pub async fn run_compositor(token: CancellationToken) {
ProcessEvent::Started => {
info!("started");
}
ProcessEvent::Stdout(line) => {
// cosmic-comp outputs everything to stderr because slog
ProcessEvent::Stdout(line) | ProcessEvent::Stderr(line) => {
if line.contains("Listening on \"") {
// Message format: Listening on "wayland-0"
if let Some(tx) = wayland_socket_tx.take() {
let socket_name = line
.split('"')
.nth(1)
.expect("failed to get WAYLAND_SOCKET");
tx.send(socket_name.to_string())
.expect("failed to send WAYLAND_SOCKET back to main app");
}
}
info!("{}", line);
}
ProcessEvent::Stderr(line) => {
error!("{}", line);
}
ProcessEvent::Ended(Some(status)) => {
error!("exited with status {}", status);
return;