Added server option to use custom user CSS

src/global_utils.rs

@@ -111,6 +111,7 @@ pub(crate) fn handle_application_args(
 					}
 				}
 			}
+			"style" => continue,
 			e => {
 				eprintln!("Unknown Variant Key: \"{}\"!...", e);
 				return (HandleLocalStatus::FAILURE, actions);

src/server/application.rs

@@ -24,6 +24,15 @@ impl SwayOSDApplication {
 	pub fn new(action_receiver: Receiver<(ArgTypes, String)>) -> Self {
 		let app = Application::new(Some(APPLICATION_NAME), ApplicationFlags::FLAGS_NONE);
 
+		app.add_main_option(
+			"style",
+			glib::Char::from('s' as u8),
+			OptionFlags::NONE,
+			OptionArg::String,
+			"Use a custom Stylesheet file instead of looking for one",
+			Some("<CSS FILE PATH>"),
+		);
+
 		app.add_main_option(
 			"top-margin",
 			glib::Char::from(0),
@@ -33,7 +42,7 @@ impl SwayOSDApplication {
 				"OSD margin from top edge (0.5 would be screen center). Default is {}",
 				*utils::TOP_MARGIN_DEFAULT
 			),
-			Some("from 0.0 to 1.0"),
+			Some("<from 0.0 to 1.0>"),
 		);
 
 		let osd_app = SwayOSDApplication {

src/server/main.rs

@@ -30,7 +30,9 @@ use gtk::{
 	traits::IconThemeExt,
 	CssProvider, IconTheme, StyleContext,
 };
+use std::env::args_os;
 use std::future::pending;
+use std::path::PathBuf;
 use std::str::FromStr;
 use utils::{get_system_css_path, user_style_path};
 use zbus::{dbus_interface, ConnectionBuilder};
@@ -105,7 +107,18 @@ fn main() {
 	}
 
 	// Try loading the users CSS theme
-	if let Some(user_config_path) = user_style_path() {
+	let mut custom_user_css: Option<PathBuf> = None;
+	let mut args = args_os().into_iter();
+	while let Some(arg) = args.next() {
+		match arg.to_str() {
+			Some("-s") | Some("--style") => match args.next() {
+				Some(path) => custom_user_css = path.to_str().map(|s| PathBuf::from(s)),
+				_ => (),
+			},
+			_ => (),
+		}
+	}
+	if let Some(user_config_path) = user_style_path(custom_user_css) {
 		let user_provider = CssProvider::new();
 		user_provider
 			.load_from_path(&user_config_path)

src/server/osd_window.rs

@@ -30,6 +30,7 @@ impl SwayosdWindow {
 	/// Create a new window and assign it to the given application.
 	pub fn new(app: &gtk::Application, display: &gdk::Display, monitor: &gdk::Monitor) -> Self {
 		let window = gtk::ApplicationWindow::new(app);
+		window.set_widget_name("osd");
 		window
 			.style_context()
 			.add_class(&gtk::STYLE_CLASS_OSD.to_string());

src/server/utils.rs

@@ -371,8 +371,13 @@ pub fn get_system_css_path() -> Option<PathBuf> {
 	path
 }
 
-pub fn user_style_path() -> Option<String> {
-	let path = user_config_dir().join("swayosd/style.css");
+pub fn user_style_path(custom_path: Option<PathBuf>) -> Option<String> {
+	let path = user_config_dir().join("swayosd").join("style.css");
+	if let Some(custom_path) = custom_path {
+		if custom_path.exists() {
+			return custom_path.to_str().map(|s| s.to_string());
+		}
+	}
 	if path.exists() {
 		return path.to_str().map(|s| s.to_string());
 	}