🐛 Whoops, I'm supposed to use WAYLAND_DISPLAY, not WAYLAND_SOCKET (thanks @Drakulix!)

This commit is contained in:
Lucy 2022-06-24 20:36:49 -04:00
parent 1350cd4335
commit be2b800716
No known key found for this signature in database
GPG key ID: EBC517FAD666BBF1
3 changed files with 18 additions and 19 deletions

View file

@ -31,22 +31,25 @@ async fn main() -> Result<()> {
info!("Starting cosmic-session");
let token = CancellationToken::new();
let (wayland_socket_tx, wayland_socket_rx) = oneshot::channel();
tokio::spawn(comp::run_compositor(token.child_token(), wayland_socket_tx));
let wayland_socket = wayland_socket_rx
let (wayland_display_tx, wayland_display_rx) = oneshot::channel();
tokio::spawn(comp::run_compositor(
token.child_token(),
wayland_display_tx,
));
let wayland_display = wayland_display_rx
.await
.expect("failed to get WAYLAND_SOCKET");
info!("got WAYLAND_SOCKET: {}", wayland_socket);
.expect("failed to get WAYLAND_DISPLAY");
info!("got WAYLAND_DISPLAY: {}", wayland_display);
tokio::spawn(panel::run_panel(
token.child_token(),
"testing-panel",
wayland_socket.clone(),
wayland_display.clone(),
));
tokio::spawn(panel::run_panel(
token.child_token(),
"testing-dock",
wayland_socket.clone(),
wayland_display.clone(),
));
let mut signals = Signals::new(vec![libc::SIGTERM, libc::SIGINT]).unwrap();