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

Merge pull request #121 from pop-os/zombie_jammy

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-05-25 22:51:53 +02:00 • committed by GitHub
commit fb2d6850d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -18,7 +18,7 @@ endif
VENDOR ?= 0 VENDOR ?= 0
ifneq ($(VENDOR),0) ifneq ($(VENDOR),0)
ARGS += --locked ARGS += --offline --locked
endif endif
TARGET_BIN="$(DESTDIR)$(bindir)/$(BINARY)" TARGET_BIN="$(DESTDIR)$(bindir)/$(BINARY)"

3
debian/rules vendored
View file

@ -15,9 +15,6 @@ ifeq ($(VENDOR),1)
ischroot || make vendor ischroot || make vendor
endif endif
override_dh_auto_build:
CARGO_HOME="$$(pwd)/target/cargo" make
override_dh_installinit: override_dh_installinit:
dh_installinit -r dh_installinit -r

2
debian/source/options vendored Normal file
View file

@ -0,0 +1,2 @@
tar-ignore=target
tar-ignore=vendor

45
src/input/mod.rs
View file

@ -1137,24 +1137,33 @@ impl State {
workspace.toggle_floating_window(seat); workspace.toggle_floating_window(seat);
} }
Action::Spawn(command) => { Action::Spawn(command) => {
if let Err(err) = std::process::Command::new("/bin/sh") let wayland_display = self.common.socket.clone();
.arg("-c")
.arg(command.clone()) let display = self
.env("WAYLAND_DISPLAY", &self.common.socket) .common
.env( .xwayland_state
"DISPLAY", .as_ref()
&self .map(|s| format!(":{}", s.display))
.common .unwrap_or_default();
.xwayland_state
.as_ref() std::thread::spawn(move || {
.map(|s| format!(":{}", s.display)) let mut cmd = std::process::Command::new("/bin/sh");
.unwrap_or(String::new()),
) cmd.arg("-c")
.env_remove("COSMIC_SESSION_SOCK") .arg(command.clone())
.spawn() .env("WAYLAND_DISPLAY", &wayland_display)
{ .env("DISPLAY", &display)
warn!(?err, "Failed to spawn \"{}\"", command); .env_remove("COSMIC_SESSION_SOCK");
}
match cmd.spawn() {
Ok(mut child) => {
let _res = child.wait();
}
Err(err) => {
tracing::warn!(?err, "Failed to spawn \"{}\"", command);
}
}
});
} }
} }
} }