From dc754cbc9763b3ea6979ed55bd4e8030fe073078 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Fri, 11 Jan 2019 01:54:49 +0000 Subject: Check DISPLAY environment variable in default_backend This patch changes the default_backend to also check the DISPLAY environment variable. If it is set, there probably is a X server running, so we try to use the zenity backend. Otherwise, the dialog backend is used. --- src/lib.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 3a6a090..80cabb5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -341,9 +341,13 @@ impl DialogBox for Question { /// - If the `DIALOG` environment variable is set to a valid backend name, this backend is used. /// A valid backend name is the name of a struct in the `backends` module implementing the /// `Backend` trait in any case. +/// - If the `DISPLAY` environment variable is set, the first available backend from this list is +/// used: +/// - [`Zenity`][] /// - Otherwise, a [`Dialog`][] instance is returned. /// /// [`Dialog`]: backends/struct.Dialog.html +/// [`Zenity`]: backends/struct.Zenity.html pub fn default_backend() -> Box { if let Ok(backend) = env::var("DIALOG") { if let Some(backend) = backends::from_str(&backend) { @@ -351,5 +355,13 @@ pub fn default_backend() -> Box { } } + if let Ok(display) = env::var("DISPLAY") { + if !display.is_empty() { + if backends::Zenity::is_available() { + return Box::new(backends::Zenity::new()); + } + } + } + Box::new(backends::Dialog::new()) } -- cgit v1.2.1