Skip to content

Initialise GTK before the Linux tray, run headless if it cannot start #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onyxhq-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Initialise GTK before the Linux tray, run headless if it cannot start #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ vello_cpu = { version = "0.1", default-features = false, features = ["std", "u8_
tray-icon = { version = "0.24.2", default-features = false, features = ["gtk"] }

[target.'cfg(target_os = "linux")'.dependencies]
# tray-icon's GTK menu needs gtk::init() on the main thread before it is built.
gtk = "0.18"
# X11 overlay banner and foreground-window lookup. Pure Rust; no system
# libraries beyond what eframe/tray-icon already require.
x11rb = "0.13"
Expand Down
19 changes: 17 additions & 2 deletions src/desktop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,29 @@ fn headless_requested() -> bool {
fn gui_available() -> bool {
#[cfg(target_os = "linux")]
{
env::var_os("WAYLAND_DISPLAY").is_some() || env::var_os("DISPLAY").is_some()
(env::var_os("WAYLAND_DISPLAY").is_some() || env::var_os("DISPLAY").is_some())
&& gtk_ready()
}
#[cfg(not(target_os = "linux"))]
{
true
}
}

/// The tray menu is built with GTK, which panics on first use unless it was
/// initialised on this thread. If it cannot start there is no tray, so Bridge
/// runs headless instead of crash-looping (issue #26).
#[cfg(target_os = "linux")]
fn gtk_ready() -> bool {
match gtk::init() {
Ok(()) => true,
Err(error) => {
tracing::warn!(%error, "GTK could not start");
false
}
}
}

/// Serves the Bridge runtime without a window: drains notices as native
/// notifications, applies update restarts, and blocks on Ctrl-C.
fn run_headless(
Expand Down Expand Up @@ -1094,7 +1109,7 @@ pub fn run() -> Result<()> {
if headless_requested() || !gui_available() {
if !headless_requested() {
tracing::warn!(
"no display found (set WAYLAND_DISPLAY or DISPLAY for the tray panel); running headless: HTTP API, HID, and game profiles still work"
"no usable display for the tray panel (set WAYLAND_DISPLAY or DISPLAY, and GTK must start); running headless: HTTP API, HID, and game profiles still work"
);
}
let Some((server, snapshots, commands, updates, _panel_requests, _show_panel)) =
Expand Down
Loading