From e79f4b22d809d12b5f09543872443d0fa818fee2 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Sat, 4 Jan 2025 09:34:44 +0300 Subject: Pass activation token in alacritty msg create-window Fixes #8337. --- alacritty/src/main.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'alacritty/src/main.rs') diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs index 6bbf8dfd..5382e475 100644 --- a/alacritty/src/main.rs +++ b/alacritty/src/main.rs @@ -55,6 +55,8 @@ mod gl { #[cfg(unix)] use crate::cli::MessageOptions; +#[cfg(not(any(target_os = "macos", windows)))] +use crate::cli::SocketMessage; use crate::cli::{Options, Subcommands}; use crate::config::monitor::ConfigMonitor; use crate::config::UiConfig; @@ -89,7 +91,13 @@ fn main() -> Result<(), Box> { /// `msg` subcommand entrypoint. #[cfg(unix)] -fn msg(options: MessageOptions) -> Result<(), Box> { +#[allow(unused_mut)] +fn msg(mut options: MessageOptions) -> Result<(), Box> { + #[cfg(not(any(target_os = "macos", windows)))] + if let SocketMessage::CreateWindow(window_options) = &mut options.message { + window_options.activation_token = + env::var("XDG_ACTIVATION_TOKEN").or_else(|_| env::var("DESKTOP_STARTUP_ID")).ok(); + } ipc::send_message(options.socket, options.message).map_err(|err| err.into()) } -- cgit