0.4.0

Cargo.lock

@@ -1366,7 +1366,7 @@ dependencies = [
 
 [[package]]
 name = "gta-tools"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "catppuccin-egui",
  "dirs",
@@ -1377,6 +1377,7 @@ dependencies = [
  "serde",
  "serde_json",
  "static_vcruntime",
+ "strum 0.27.1",
  "sysinfo",
  "windows 0.61.1",
  "winreg",
@@ -1845,7 +1846,7 @@ dependencies = [
  "log",
  "rustc-hash",
  "spirv",
- "strum",
+ "strum 0.26.3",
  "termcolor",
  "thiserror 2.0.12",
  "unicode-xid",
@@ -2867,7 +2868,16 @@ version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.26.4",
+]
+
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+dependencies = [
+ "strum_macros 0.27.1",
 ]
 
 [[package]]
@@ -2883,6 +2893,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.100"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gta-tools"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2024"
 
 [dependencies]
@@ -14,6 +14,7 @@ image = { version = "0.25.6", default-features = false, features = ["png"] }
 open = "5.3.2"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
+strum = { version = "0.27.1", features = ["derive"] }
 sysinfo = "0.34.2"
 windows = { version = "0.61.1", features = [
     "Win32_UI_Input_KeyboardAndMouse",

src/features/anti_afk.rs

@@ -1,12 +1,13 @@
+#![allow(clippy::cast_possible_truncation)]
+
 use crate::util::{self, consts::GTA_WINDOW_TITLE};
 use std::time::{Duration, Instant};
 use windows::Win32::UI::Input::KeyboardAndMouse::{
-    KEYBD_EVENT_FLAGS, MAP_VIRTUAL_KEY_TYPE, MapVirtualKeyW, keybd_event,
+    KEYBD_EVENT_FLAGS, MAP_VIRTUAL_KEY_TYPE, MapVirtualKeyW, VK_NUMPAD4, VK_NUMPAD6, keybd_event,
 };
 
 pub const INTERVAL: Duration = Duration::from_secs(60);
-const VK_NUMPAD4: u8 = 0x64;
-const VK_NUMPAD6: u8 = 0x66;
+const PRESS_KEYS: [u8; 2] = [VK_NUMPAD4.0 as u8, VK_NUMPAD6.0 as u8];
 
 #[derive(Debug)]
 pub struct AntiAfk {
@@ -25,30 +26,28 @@ impl Default for AntiAfk {
 
 impl AntiAfk {
     pub fn activate(&mut self) {
-        if util::is_window_focused(GTA_WINDOW_TITLE)
-            && !util::is_key_pressed(VK_NUMPAD4 as i32)
-            && !util::is_key_pressed(VK_NUMPAD6 as i32)
+        if util::win::is_window_focused(GTA_WINDOW_TITLE)
+            && !util::win::is_any_key_pressed(&PRESS_KEYS)
         {
-            send(VK_NUMPAD4);
-            send(VK_NUMPAD6);
+            send(&PRESS_KEYS);
         }
         self.interval = Instant::now();
     }
 }
 
-pub fn send(vk_code: u8) {
-    unsafe {
+pub fn send(vk_codes: &[u8]) {
+    vk_codes.iter().for_each(|vk_code: &u8| unsafe {
         keybd_event(
-            vk_code,
-            u8::try_from(MapVirtualKeyW(u32::from(vk_code), MAP_VIRTUAL_KEY_TYPE(0))).unwrap(),
+            *vk_code,
+            u8::try_from(MapVirtualKeyW(u32::from(*vk_code), MAP_VIRTUAL_KEY_TYPE(0))).unwrap(),
             KEYBD_EVENT_FLAGS(0),
             0,
         );
         keybd_event(
-            vk_code,
-            u8::try_from(MapVirtualKeyW(u32::from(vk_code), MAP_VIRTUAL_KEY_TYPE(0))).unwrap(),
+            *vk_code,
+            u8::try_from(MapVirtualKeyW(u32::from(*vk_code), MAP_VIRTUAL_KEY_TYPE(0))).unwrap(),
             KEYBD_EVENT_FLAGS(2),
             0,
         );
-    }
+    });
 }

src/features/launch.rs

@@ -1,8 +1,9 @@
 use serde::{Deserialize, Serialize};
 use std::{fmt::Display, path::PathBuf, process::Command};
+use strum::EnumIter;
 use winreg::{RegKey, enums::HKEY_LOCAL_MACHINE};
 
-#[derive(Clone, Copy, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Default, Debug, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
 pub enum Platform {
     #[default]
     Steam,

src/gui/mod.rs

@@ -1,61 +1,46 @@
+mod persistent_state;
+mod settings;
+
 use crate::{
     features::{
-        self,
-        anti_afk::AntiAfk,
-        empty_session::EmptySession,
-        force_close::ForceClose,
-        launch::{Launch, Platform},
+        self, anti_afk::AntiAfk, empty_session::EmptySession, force_close::ForceClose,
+        launch::Launch,
     },
+    gui::{persistent_state::PersistentState, settings::Settings},
     util::{
         self,
         consts::{ENHANCED, GTA_WINDOW_TITLE, LEGACY},
-        elevation,
     },
 };
 use eframe::egui;
-use serde::{Deserialize, Serialize};
-use std::{
-    fs::{self, File},
-    io::Write,
-    path::PathBuf,
-    sync::LazyLock,
-    time::{Duration, Instant},
-};
-use sysinfo::System;
-use windows::Win32::Foundation::HANDLE;
+use std::time::{Duration, Instant};
 
-const THEME: catppuccin_egui::Theme = catppuccin_egui::MOCHA;
-const WINDOW_SIZE: [f32; 2] = [240.0, 240.0];
-static CONFIG_PATH: LazyLock<PathBuf> = LazyLock::new(|| {
-    dirs::config_local_dir()
-        .unwrap()
-        .join("GTA Tools")
-        .join("config.json")
-});
-
-#[derive(Serialize, Deserialize)]
-struct PersistentState {
-    launcher: Platform,
-}
+const WINDOW_SIZE: [f32; 2] = [240.0, 245.0];
 
 #[derive(Debug, Default, PartialEq, Eq)]
 pub enum Stage {
     #[default]
     Main,
+    Settings,
     About,
 }
 
 #[allow(clippy::struct_excessive_bools)]
+#[derive(Debug, Default)]
+pub struct Flags {
+    elevated: bool,
+    debug: bool,
+    closing: bool,
+    current_frame: bool,
+}
+
 #[derive(Debug)]
 pub struct App {
+    settings: Settings,
     stage: Stage,
-    closing: bool,
-    debug: bool,
-    initialized: bool,
-    elevated: bool,
-    current_frame: bool,
-    pub sysinfo: System,
-    pub game_handle: HANDLE,
+    flags: Flags,
+    pub sysinfo: sysinfo::System,
+    pub game_handle: windows::Win32::Foundation::HANDLE,
     launch: Launch,
     force_close: ForceClose,
     empty_session: EmptySession,
@@ -65,14 +50,11 @@ pub struct App {
 impl Default for App {
     fn default() -> Self {
         Self {
+            settings: Settings::default(),
             stage: Stage::default(),
-            closing: false,
-            initialized: false,
-            debug: false,
-            elevated: elevation::is_elevated(),
-            current_frame: false,
-            sysinfo: System::new_all(),
-            game_handle: HANDLE::default(),
+            flags: Flags::default(),
+            sysinfo: sysinfo::System::new_all(),
+            game_handle: windows::Win32::Foundation::HANDLE::default(),
             launch: Launch::default(),
             force_close: ForceClose::default(),
             empty_session: EmptySession::default(),
@@ -83,53 +65,48 @@ impl Default for App {
 
 impl eframe::App for App {
     fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        if !self.initialized {
-            catppuccin_egui::set_theme(ctx, THEME);
-            egui_extras::install_image_loaders(ctx);
-            if let Ok(config) = fs::read_to_string(CONFIG_PATH.as_path()) {
-                if let Ok(persistent_state) = serde_json::from_str::<PersistentState>(&config) {
-                    self.launch.selected = persistent_state.launcher;
-                }
-            }
-            ctx.style_mut(|style| style.spacing.item_spacing = egui::vec2(4.0, 4.0));
-            self.initialized = true;
-        }
+        catppuccin_egui::set_theme(ctx, self.settings.theme.into());
         self.run_timers();
         egui::TopBottomPanel::bottom("bottom_panel")
             .exact_height(25.0)
             .show(ctx, |ui| {
                 ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| {
                     ui.selectable_value(&mut self.stage, Stage::Main, "Main");
+                    ui.selectable_value(&mut self.stage, Stage::Settings, "Settings");
                     ui.selectable_value(&mut self.stage, Stage::About, "About");
                     ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
                         let button = ui
-                            .add_enabled(!self.elevated, egui::Button::new("Elevate"))
+                            .add_enabled(!self.flags.elevated, egui::Button::new("Elevate"))
                             .on_hover_text("Relaunch ourselves as administrator.")
                             .on_disabled_hover_text("We are already running elevated.");
                         if button.clicked() {
-                            elevation::elevate(&mut self.closing);
+                            util::win::elevate(util::win::ElevationExitMethod::Gentle(
+                                &mut self.flags.closing,
+                            ));
                         }
                     });
                 });
             });
-        egui::CentralPanel::default().show(ctx, |ui| match self.stage {
+        egui::CentralPanel::default().show(ctx, |ui| {
+            egui::ScrollArea::vertical()
+                .auto_shrink([false, true])
+                .show(ui, |ui| match self.stage {
                     Stage::Main => {
-                self.header(ui, "Game");
                         self.show_game(ctx, ui);
-                self.header(ui, "Session");
                         self.show_session(ctx, ui);
-                self.header(ui, "Network");
                         self.show_network(ctx, ui);
                     }
+                    Stage::Settings => self.show_settings(ctx, ui),
                     Stage::About => self.show_about(ctx, ui),
                 });
+        });
         if check_debug_keycombo_pressed(ctx) {
-            self.debug = !self.debug;
+            self.flags.debug = !self.flags.debug;
         }
         if check_debug_viewport_close_button_pressed(ctx) {
-            self.debug = false;
+            self.flags.debug = false;
         }
-        if self.debug {
+        if self.flags.debug {
             let main_rect = ctx.input(|i| {
                 i.viewport()
                     .clone()
@@ -148,11 +125,11 @@ impl eframe::App for App {
                     .with_icon(load_icon()),
                 |ctx, _class| {
                     if check_debug_keycombo_pressed(ctx) {
-                        self.debug = !self.debug;
+                        self.flags.debug = !self.flags.debug;
                     }
                     egui::CentralPanel::default().show(ctx, |ui| {
                         egui::ScrollArea::both()
-                            .auto_shrink([false, false])
+                            .auto_shrink([false, true])
                             .show(ui, |ui| {
                                 self.show_debug(ctx, ui);
                             });
@@ -161,46 +138,20 @@ impl eframe::App for App {
             );
         }
         ctx.request_repaint_after(Duration::from_millis(100));
-        if self.closing {
+        if self.flags.closing {
             ctx.send_viewport_cmd(egui::ViewportCommand::Close);
         }
     }
 }
 
 impl App {
-    #[allow(clippy::unused_self)]
-    fn header(&self, ui: &mut egui::Ui, text: &str) {
-        ui.horizontal(|ui| {
-            ui.label(text);
-            ui.add(egui::Separator::default().horizontal());
-        });
-    }
-
     fn show_game(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+        header(ui, "Game");
         ui.horizontal(|ui| {
             if ui.button("Launch").clicked() {
                 features::launch::launch(&self.launch.selected);
             };
-            egui::ComboBox::from_label("")
-                .selected_text(self.launch.selected.to_string())
-                .width(120.0)
-                .show_ui(ui, |ui| {
-                    ui.selectable_value(
-                        &mut self.launch.selected,
-                        Platform::Steam,
-                        Platform::Steam.to_string(),
-                    );
-                    ui.selectable_value(
-                        &mut self.launch.selected,
-                        Platform::Rockstar,
-                        Platform::Rockstar.to_string(),
-                    );
-                    ui.selectable_value(
-                        &mut self.launch.selected,
-                        Platform::Epic,
-                        Platform::Epic.to_string(),
-                    );
-                });
+            build_combo_box::<features::launch::Platform>(ui, &mut self.launch.selected, "Launch");
         });
         let force_close_button = ui.add_sized(
             [104.0, 0.0],
@@ -208,24 +159,25 @@ impl App {
         );
         if force_close_button.clicked() && !self.force_close.prompting {
             self.force_close.prompting();
-            self.current_frame = true;
+            self.flags.current_frame = true;
         };
         if self.force_close.prompting
             && self.force_close.interval.elapsed() <= Duration::from_secs(3)
         {
-            if force_close_button.clicked() && !self.current_frame {
+            if force_close_button.clicked() && !self.flags.current_frame {
                 features::force_close::activate(&mut self.sysinfo);
                 self.force_close = ForceClose::default();
             }
         } else {
             self.force_close = ForceClose::default();
         }
-        if self.current_frame {
-            self.current_frame = false;
+        if self.flags.current_frame {
+            self.flags.current_frame = false;
         }
     }
 
     fn show_session(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+        header(ui, "Session");
         ui.add_enabled_ui(!self.empty_session.disabled, |ui| {
             ui.horizontal(|ui| {
                 if ui.button("Empty current session").clicked() {
@@ -242,7 +194,7 @@ impl App {
             if self.anti_afk.enabled {
                 ui.add_space(8.0);
                 ui.add_enabled_ui(false, |ui| {
-                    ui.label(if util::is_window_focused(GTA_WINDOW_TITLE) {
+                    ui.label(if util::win::is_window_focused(GTA_WINDOW_TITLE) {
                         "GTA is focused."
                     } else {
                         "GTA is not focused!"
@@ -257,11 +209,11 @@ impl App {
     }
 
     fn show_network(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+        header(ui, "Network");
         egui::Frame::new()
-            .inner_margin(egui::vec2(4.0, 4.0))
-            .stroke(egui::Stroke::new(1.0, THEME.overlay1))
+            .outer_margin(egui::vec2(0.0, -2.0))
             .show(ui, |ui| {
-                let response = ui.add_enabled_ui(self.elevated, |ui| {
+                let response = ui.add_enabled_ui(self.flags.elevated, |ui| {
                     let label = ui.label("Game's network access");
                     ui.horizontal(|ui| {
                         let available_width = label.rect.width();
@@ -304,10 +256,20 @@ impl App {
                     ));
                 });
             });
-            ui.add(egui::Image::new(egui::include_image!("../assets/icon.png")));
+            ui.add(egui::Image::new(egui::include_image!(
+                "../../assets/icon.png"
+            )));
         });
     }
 
+    fn show_settings(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
+        ui.horizontal(|ui| {
+            ui.label("Theme");
+            build_combo_box::<settings::Theme>(ui, &mut self.settings.theme, "Theme");
+        });
+        ui.checkbox(&mut self.settings.start_elevated, "Always start elevated");
+    }
+
     fn show_debug(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
         ui.collapsing("times", |ui| {
             ui.label(format!(
@@ -351,20 +313,37 @@ impl Drop for App {
         // save any persistent state to config file
         let persistent_state = PersistentState {
             launcher: self.launch.selected,
+            settings: self.settings.clone(),
         };
-        let config_path = CONFIG_PATH.as_path();
-        let config_path_parent = config_path.parent().unwrap();
-        if !config_path_parent.exists() {
-            fs::create_dir(config_path_parent).unwrap();
-        }
-        let mut config_file = File::create(config_path).unwrap();
-        let json = serde_json::to_string_pretty(&persistent_state).unwrap();
-        config_file.write_all(json.as_bytes()).unwrap();
+        persistent_state.set();
         // make sure we are not suspending game
         features::empty_session::deactivate(self);
     }
 }
 
+fn header(ui: &mut egui::Ui, text: &str) {
+    ui.horizontal(|ui| {
+        ui.label(egui::RichText::new(text).font(egui::FontId::new(
+            12.5,
+            egui::FontFamily::Name("Ubuntu-Regular".into()),
+        )));
+        ui.add(egui::Separator::default().horizontal());
+    });
+}
+
+fn build_combo_box<E>(ui: &mut egui::Ui, current_value: &mut E, label: impl std::hash::Hash)
+where
+    E: strum::IntoEnumIterator + std::fmt::Display + std::cmp::PartialEq + Copy,
+{
+    egui::ComboBox::from_id_salt(label)
+        .selected_text(current_value.to_string())
+        .show_ui(ui, |ui| {
+            for v in E::iter() {
+                ui.selectable_value(current_value, v, v.to_string());
+            }
+        });
+}
+
 fn check_debug_keycombo_pressed(ctx: &egui::Context) -> bool {
     ctx.input(|i| i.modifiers.all() && i.key_pressed(egui::Key::D))
 }
@@ -379,17 +358,49 @@ fn check_debug_viewport_close_button_pressed(ctx: &egui::Context) -> bool {
     })
 }
 
-fn load_icon() -> eframe::egui::IconData {
-    let icon = include_bytes!("../assets/icon.png");
+fn load_icon() -> egui::IconData {
+    let icon = include_bytes!("../../assets/icon.png");
     let image = image::load_from_memory(icon).unwrap().into_rgba8();
     let (width, height) = image.dimensions();
-    eframe::egui::IconData {
+    egui::IconData {
         rgba: image.into_raw(),
         width,
         height,
     }
 }
 
+#[allow(clippy::unnecessary_wraps)]
+fn app_creator(
+    cc: &eframe::CreationContext<'_>,
+) -> Result<Box<dyn eframe::App>, Box<dyn std::error::Error + Send + Sync>> {
+    let mut app = Box::<App>::default();
+    if let Some(persistent_state) = PersistentState::get() {
+        app.launch.selected = persistent_state.launcher;
+        app.settings = persistent_state.settings;
+    };
+    let elevated = util::win::is_elevated();
+    if app.settings.start_elevated && !elevated {
+        util::win::elevate(util::win::ElevationExitMethod::Forced);
+    }
+    app.flags.elevated = elevated;
+    egui_extras::install_image_loaders(&cc.egui_ctx);
+    cc.egui_ctx.style_mut(|style| {
+        style.spacing.item_spacing = egui::vec2(4.0, 4.0);
+        style.interaction.selectable_labels = false;
+    });
+    let mut fonts = egui::FontDefinitions::default();
+    fonts.font_data.insert(
+        "Ubuntu-Regular".to_string(),
+        egui::FontData::from_static(include_bytes!("../../assets/Ubuntu-Regular.ttf")).into(),
+    );
+    fonts.families.insert(
+        egui::FontFamily::Name("Ubuntu-Regular".into()),
+        vec!["Ubuntu-Regular".to_string()],
+    );
+    cc.egui_ctx.set_fonts(fonts);
+    Ok(app)
+}
+
 pub fn run() {
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default()
@@ -400,10 +411,5 @@ pub fn run() {
         centered: true,
         ..Default::default()
     };
-    eframe::run_native(
-        "GTA Tools",
-        options,
-        Box::new(|_cc| Ok(Box::<App>::default())),
-    )
-    .unwrap();
+    eframe::run_native("GTA Tools", options, Box::new(app_creator)).unwrap();
 }

src/gui/persistent_state.rs

@@ -0,0 +1,40 @@
+use crate::{features::launch::Platform, gui::settings::Settings};
+use serde::{Deserialize, Serialize};
+use std::{
+    fs::{self, File},
+    io::Write,
+    path::PathBuf,
+    sync::LazyLock,
+};
+
+static CONFIG_PATH: LazyLock<PathBuf> = LazyLock::new(|| {
+    dirs::config_local_dir()
+        .unwrap()
+        .join("GTA Tools")
+        .join("config.json")
+});
+
+#[derive(Serialize, Deserialize)]
+pub struct PersistentState {
+    pub launcher: Platform,
+    pub settings: Settings,
+}
+
+impl PersistentState {
+    pub fn get() -> Option<Self> {
+        fs::read_to_string(CONFIG_PATH.as_path())
+            .ok()
+            .and_then(|config| serde_json::from_str::<Self>(&config).ok())
+    }
+
+    pub fn set(&self) {
+        let config_path = CONFIG_PATH.as_path();
+        let config_path_parent = config_path.parent().unwrap();
+        if !config_path_parent.exists() {
+            fs::create_dir(config_path_parent).unwrap();
+        }
+        let mut config_file = File::create(config_path).unwrap();
+        let json = serde_json::to_string_pretty(&self).unwrap();
+        config_file.write_all(json.as_bytes()).unwrap();
+    }
+}

src/gui/settings.rs

@@ -0,0 +1,56 @@
+use serde::{Deserialize, Serialize};
+use std::fmt::Display;
+use strum::EnumIter;
+
+#[allow(clippy::enum_variant_names)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
+pub enum Theme {
+    CatppuccinLatte,
+    CatppuccinFrappe,
+    CatppuccinMacchiato,
+    CatppuccinMocha,
+}
+
+impl From<Theme> for catppuccin_egui::Theme {
+    fn from(val: Theme) -> Self {
+        match val {
+            Theme::CatppuccinLatte => catppuccin_egui::LATTE,
+            Theme::CatppuccinFrappe => catppuccin_egui::FRAPPE,
+            Theme::CatppuccinMacchiato => catppuccin_egui::MACCHIATO,
+            Theme::CatppuccinMocha => catppuccin_egui::MOCHA,
+        }
+    }
+}
+
+impl Display for Theme {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let x = match self {
+            Self::CatppuccinLatte => "Catppuccin Latte",
+            Self::CatppuccinFrappe => "Catppuccin Frappe",
+            Self::CatppuccinMacchiato => "Catppuccin Macchiato",
+            Self::CatppuccinMocha => "Catppuccin Mocha",
+        };
+        write!(f, "{x}")
+    }
+}
+
+impl Theme {
+    pub fn to_catppuccin(self) -> catppuccin_egui::Theme {
+        self.into()
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Settings {
+    pub theme: Theme,
+    pub start_elevated: bool,
+}
+
+impl Default for Settings {
+    fn default() -> Self {
+        Self {
+            theme: Theme::CatppuccinMocha,
+            start_elevated: false,
+        }
+    }
+}

src/main.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+#![windows_subsystem = "windows"]
 
 mod features;
 mod gui;

src/util/elevation.rs

@@ -1,45 +0,0 @@
-use windows::{
-    Win32::Foundation::{CloseHandle, HANDLE},
-    Win32::Security::{GetTokenInformation, TOKEN_ELEVATION, TOKEN_QUERY, TokenElevation},
-    Win32::System::Threading::{GetCurrentProcess, OpenProcessToken},
-    Win32::UI::{Shell::ShellExecuteW, WindowsAndMessaging::SW_HIDE},
-    core::{HSTRING, PCWSTR},
-};
-
-pub fn elevate(closing: &mut bool) {
-    let exe = std::env::current_exe().unwrap();
-    unsafe {
-        ShellExecuteW(
-            None,
-            &HSTRING::from("runas"),
-            &HSTRING::from(exe.as_path()),
-            PCWSTR::null(),
-            PCWSTR::null(),
-            SW_HIDE,
-        );
-    }
-    *closing = true;
-}
-
-pub fn is_elevated() -> bool {
-    unsafe {
-        let mut token: HANDLE = HANDLE::default();
-        if OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token).is_ok() {
-            let mut elevation = TOKEN_ELEVATION::default();
-            let size = u32::try_from(std::mem::size_of::<TOKEN_ELEVATION>()).unwrap();
-            let mut ret_size = size;
-            let result = GetTokenInformation(
-                token,
-                TokenElevation,
-                Some((&raw mut elevation).cast()),
-                size,
-                &mut ret_size,
-            );
-            CloseHandle(token).unwrap();
-            if result.is_ok() && elevation.TokenIsElevated != 0 {
-                return true;
-            }
-        }
-        false
-    }
-}

src/util/mod.rs

@@ -1,22 +1,3 @@
 pub mod consts;
 pub mod countdown;
-pub mod elevation;
-
-use windows::Win32::UI::{
-    Input::KeyboardAndMouse::GetAsyncKeyState,
-    WindowsAndMessaging::{GetForegroundWindow, GetWindowTextW},
-};
-
-pub fn is_window_focused(target_title: &str) -> bool {
-    unsafe {
-        let hwnd = GetForegroundWindow();
-        let mut buffer: [u16; 512] = [0; 512];
-        let length = GetWindowTextW(hwnd, &mut buffer);
-        let current_title = String::from_utf16_lossy(&buffer[..length as usize]);
-        current_title == target_title
-    }
-}
-
-pub fn is_key_pressed(key: i32) -> bool {
-    unsafe { (GetAsyncKeyState(key) as i32 & 0x8000) != 0 }
-}
+pub mod win;

src/util/win.rs

@@ -0,0 +1,75 @@
+use windows::{
+    Win32::{
+        Foundation::{CloseHandle, HANDLE},
+        Security::{GetTokenInformation, TOKEN_ELEVATION, TOKEN_QUERY, TokenElevation},
+        System::Threading::{GetCurrentProcess, OpenProcessToken},
+        UI::{
+            Input::KeyboardAndMouse::GetAsyncKeyState,
+            Shell::ShellExecuteW,
+            WindowsAndMessaging::{GetForegroundWindow, GetWindowTextW, SW_NORMAL},
+        },
+    },
+    core::{HSTRING, PCWSTR},
+};
+
+pub enum ElevationExitMethod<'a> {
+    Gentle(&'a mut bool),
+    Forced,
+}
+
+#[allow(clippy::cast_sign_loss)]
+pub fn is_window_focused(target_title: &str) -> bool {
+    unsafe {
+        let hwnd = GetForegroundWindow();
+        let mut buffer: [u16; 512] = [0; 512];
+        let length = GetWindowTextW(hwnd, &mut buffer);
+        let current_title = String::from_utf16_lossy(&buffer[..length as usize]);
+        current_title == target_title
+    }
+}
+
+pub fn is_any_key_pressed(keys: &[u8]) -> bool {
+    keys.iter()
+        .any(|&key| unsafe { (i32::from(GetAsyncKeyState(i32::from(key))) & 0x8000) != 0 })
+}
+
+pub fn elevate(closing: ElevationExitMethod) {
+    let exe = std::env::current_exe().unwrap();
+    unsafe {
+        ShellExecuteW(
+            None,
+            &HSTRING::from("runas"),
+            &HSTRING::from(exe.as_path()),
+            PCWSTR::null(),
+            PCWSTR::null(),
+            SW_NORMAL,
+        );
+    }
+    match closing {
+        ElevationExitMethod::Gentle(closing) => *closing = true,
+        ElevationExitMethod::Forced => std::process::exit(0),
+    }
+}
+
+pub fn is_elevated() -> bool {
+    unsafe {
+        let mut token: HANDLE = HANDLE::default();
+        if OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token).is_ok() {
+            let mut elevation = TOKEN_ELEVATION::default();
+            let size = u32::try_from(std::mem::size_of::<TOKEN_ELEVATION>()).unwrap();
+            let mut ret_size = size;
+            let result = GetTokenInformation(
+                token,
+                TokenElevation,
+                Some((&raw mut elevation).cast()),
+                size,
+                &mut ret_size,
+            );
+            CloseHandle(token).unwrap();
+            if result.is_ok() && elevation.TokenIsElevated != 0 {
+                return true;
+            }
+        }
+        false
+    }
+}