Add hide command and use indoc

Should resolve #18

Author: vurvdev

Cargo.toml

@@ -28,7 +28,12 @@ log = { version = "0.4.14", optional = true }
 simplelog = { version = "0.11.0", optional = true }
 
 regex = "1.5.4"
-winapi = { version = "0.3.9", features = ["wincon", "consoleapi"] }
+winapi = { version = "0.3.9", features = ["wincon", "consoleapi", "shellapi"] }
+systrayx = "0.4.1"
+
+indoc = "1.0.3"
+
+# When winsafe matures, maybe winapi can be removed
 
 [features]
 default = ["runner", "logging"]

assets/run.ico

@@ -1,5 +1,5 @@
 use crate::sys::{runlua::runLua, statics::*};
-use std::path::Path;
+use std::{path::Path, io::Read};
 
 pub(crate) fn try_process_input() -> std::io::Result<()> {
 	// Loop forever in this thread, since it is separate from Gmod, and take in user input.
@@ -40,15 +40,50 @@ pub(crate) fn try_process_input() -> std::io::Result<()> {
 			}
 		},
 
+		"hide" => unsafe {
+			use std::sync::atomic::{AtomicPtr, Ordering};
+			use winapi::um::{
+				wincon::GetConsoleWindow,
+				winuser::{ShowWindow, SW_HIDE, SW_SHOW},
+			};
+
+			let wind = GetConsoleWindow();
+			ShowWindow(wind, SW_HIDE);
+
+			let mut tray = systrayx::Application::new().unwrap();
+			tray.set_icon_from_buffer(
+				&include_bytes!("../assets/run.ico")[..],
+				32,
+				32
+			).expect("Failed to set icon");
+
+			let ptr = AtomicPtr::new(wind);
+
+			tray.add_menu_item("Open", move |x| {
+				let a = ptr.load(Ordering::Relaxed);
+				ShowWindow(a, SW_SHOW);
+
+				x.quit();
+				Ok::<_, systrayx::Error>(())
+			})
+			.unwrap();
+
+			tray.wait_for_message().unwrap();
+		},
+
 		"help" => {
-			println!("Commands list:");
-			println!("lua_run_cl <code>            | Runs lua code on the currently loaded lua state. Will print if any errors occur.");
-			println!("lua_openscript_cl <file_dir> | Runs a lua script located at file_dir, this dir being an absolute directory on your pc. (Not relative)");
+			indoc::printdoc! {"
+				[Commands]
+
+				lua_run_cl <code>              | Runs lua code on the currently loaded lua state. Will print if any errors occur.
+				lua_openscript_cl <file_dir>   | Runs a lua script located at file_dir, this dir being an absolute directory on your pc. (Not relative)
 
-			println!("lua_run_menu <code>          | Runs lua code in the menu state. Will print if any errors occur.");
-			println!("lua_openscript_menu <code>   | Runs lua code in the menu state. Will print if any errors occur.");
+				lua_run_menu <code>            | Runs lua code in the menu state. Will print if any errors occur.
+				lua_openscript_menu <code>     | Runs lua code in the menu state. Will print if any errors occur.
 
-			println!("help                         | Prints this out.");
+				help                           | Prints this out.
+				hide                           | Hides the console, but remains active.
+			"};
 		}
 		_ => (),
 	}

src/input.rs

@@ -22,11 +22,17 @@ mod sys; // Configs
 static SENDER: OnceCell<mpsc::SyncSender<()>> = OnceCell::new();
 
 use winapi::{
-	shared::minwindef::TRUE,
+	shared::minwindef::{DWORD, FALSE, TRUE},
 	um::{
-		consoleapi::AllocConsole,
+		consoleapi::{AllocConsole, SetConsoleCtrlHandler},
 		errhandlingapi::GetLastError,
-		wincon::{FreeConsole, GetConsoleWindow},
+		wincon::{
+			FreeConsole, GetConsoleWindow, CTRL_CLOSE_EVENT, CTRL_C_EVENT, CTRL_SHUTDOWN_EVENT,
+		},
+		winuser::{
+			CreateMenu, DeleteMenu, GetSystemMenu, ShowWindow, MF_BYCOMMAND, SC_CLOSE, SW_HIDE,
+			SW_SHOW,
+		},
 	},
 };
 
@@ -54,12 +60,25 @@ fn init() -> Result<(), InitializeError> {
 		detours::init()?;
 	}
 
-	debug!("Initialized.");
-	println!("<---> Autorun-rs <--->");
-	println!("Type [help] for the list of commands");
+	indoc::printdoc! {"
+		[Autorun-rs] v{version}
+		Type 'help' for the list of commands
+	", version = env!("CARGO_PKG_VERSION")};
 
 	let (sender, receiver) = mpsc::sync_channel(1);
 
+	// Disable close button and shortcuts
+	// If you want to hide the console use the ``hide`` command.
+	// Currently no way to halt Autorun w/o closing gmod
+	unsafe {
+		let window = GetConsoleWindow();
+		let menu = GetSystemMenu(window, FALSE);
+
+		DeleteMenu(menu, SC_CLOSE as u32, MF_BYCOMMAND);
+
+		SetConsoleCtrlHandler(None, TRUE);
+	}
+
 	thread::spawn(move || loop {
 		use mpsc::TryRecvError::*;
 		if input::try_process_input().is_ok() {