accelerators sservice
This commit is contained in:
307
src-tauri/src/services/accelerators.rs
Normal file
307
src-tauri/src/services/accelerators.rs
Normal file
@@ -0,0 +1,307 @@
|
||||
use device_query::Keycode;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Type)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum AcceleratorAction {
|
||||
SceneInteractivity,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Type)]
|
||||
pub struct KeyboardAccelerator {
|
||||
#[serde(default)]
|
||||
pub modifiers: Vec<AcceleratorModifier>,
|
||||
#[serde(default)]
|
||||
pub key: Option<AcceleratorKey>,
|
||||
}
|
||||
|
||||
impl KeyboardAccelerator {
|
||||
pub fn normalized(mut self) -> Self {
|
||||
self.modifiers.sort_unstable();
|
||||
self.modifiers.dedup();
|
||||
|
||||
if self.modifiers.is_empty() {
|
||||
return Self::default();
|
||||
}
|
||||
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Type)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum AcceleratorModifier {
|
||||
Cmd,
|
||||
Alt,
|
||||
Ctrl,
|
||||
Shift,
|
||||
}
|
||||
|
||||
impl Default for KeyboardAccelerator {
|
||||
fn default() -> Self {
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
Self {
|
||||
modifiers: vec![AcceleratorModifier::Cmd],
|
||||
key: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
{
|
||||
Self {
|
||||
modifiers: vec![AcceleratorModifier::Alt],
|
||||
key: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn default_accelerator_for_action(action: AcceleratorAction) -> KeyboardAccelerator {
|
||||
match action {
|
||||
AcceleratorAction::SceneInteractivity => KeyboardAccelerator::default(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn default_accelerators() -> std::collections::BTreeMap<AcceleratorAction, KeyboardAccelerator>
|
||||
{
|
||||
let mut map = std::collections::BTreeMap::new();
|
||||
map.insert(
|
||||
AcceleratorAction::SceneInteractivity,
|
||||
default_accelerator_for_action(AcceleratorAction::SceneInteractivity),
|
||||
);
|
||||
map
|
||||
}
|
||||
|
||||
pub fn normalize_accelerators(
|
||||
mut accelerators: std::collections::BTreeMap<AcceleratorAction, KeyboardAccelerator>,
|
||||
) -> std::collections::BTreeMap<AcceleratorAction, KeyboardAccelerator> {
|
||||
for value in accelerators.values_mut() {
|
||||
*value = value.clone().normalized();
|
||||
}
|
||||
|
||||
for action in [AcceleratorAction::SceneInteractivity] {
|
||||
accelerators
|
||||
.entry(action)
|
||||
.or_insert_with(|| default_accelerator_for_action(action));
|
||||
}
|
||||
|
||||
accelerators
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Type)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum AcceleratorKey {
|
||||
A,
|
||||
B,
|
||||
C,
|
||||
D,
|
||||
E,
|
||||
F,
|
||||
G,
|
||||
H,
|
||||
I,
|
||||
J,
|
||||
K,
|
||||
L,
|
||||
M,
|
||||
N,
|
||||
O,
|
||||
P,
|
||||
Q,
|
||||
R,
|
||||
S,
|
||||
T,
|
||||
U,
|
||||
V,
|
||||
W,
|
||||
X,
|
||||
Y,
|
||||
Z,
|
||||
Num0,
|
||||
Num1,
|
||||
Num2,
|
||||
Num3,
|
||||
Num4,
|
||||
Num5,
|
||||
Num6,
|
||||
Num7,
|
||||
Num8,
|
||||
Num9,
|
||||
F1,
|
||||
F2,
|
||||
F3,
|
||||
F4,
|
||||
F5,
|
||||
F6,
|
||||
F7,
|
||||
F8,
|
||||
F9,
|
||||
F10,
|
||||
F11,
|
||||
F12,
|
||||
Enter,
|
||||
Space,
|
||||
Escape,
|
||||
Tab,
|
||||
Backspace,
|
||||
Delete,
|
||||
Insert,
|
||||
Home,
|
||||
End,
|
||||
PageUp,
|
||||
PageDown,
|
||||
ArrowUp,
|
||||
ArrowDown,
|
||||
ArrowLeft,
|
||||
ArrowRight,
|
||||
Minus,
|
||||
Equal,
|
||||
LeftBracket,
|
||||
RightBracket,
|
||||
BackSlash,
|
||||
Semicolon,
|
||||
Apostrophe,
|
||||
Comma,
|
||||
Dot,
|
||||
Slash,
|
||||
Grave,
|
||||
}
|
||||
|
||||
fn contains_any(keys: &[Keycode], candidates: &[Keycode]) -> bool {
|
||||
candidates.iter().any(|candidate| keys.contains(candidate))
|
||||
}
|
||||
|
||||
fn has_modifier(keys: &[Keycode], modifier: AcceleratorModifier) -> bool {
|
||||
match modifier {
|
||||
AcceleratorModifier::Cmd => contains_any(
|
||||
keys,
|
||||
&[
|
||||
Keycode::Command,
|
||||
Keycode::RCommand,
|
||||
Keycode::LMeta,
|
||||
Keycode::RMeta,
|
||||
],
|
||||
),
|
||||
AcceleratorModifier::Alt => contains_any(
|
||||
keys,
|
||||
&[
|
||||
Keycode::LAlt,
|
||||
Keycode::RAlt,
|
||||
Keycode::LOption,
|
||||
Keycode::ROption,
|
||||
],
|
||||
),
|
||||
AcceleratorModifier::Ctrl => contains_any(keys, &[Keycode::LControl, Keycode::RControl]),
|
||||
AcceleratorModifier::Shift => contains_any(keys, &[Keycode::LShift, Keycode::RShift]),
|
||||
}
|
||||
}
|
||||
|
||||
fn keycodes_for(key: AcceleratorKey) -> &'static [Keycode] {
|
||||
match key {
|
||||
AcceleratorKey::A => &[Keycode::A],
|
||||
AcceleratorKey::B => &[Keycode::B],
|
||||
AcceleratorKey::C => &[Keycode::C],
|
||||
AcceleratorKey::D => &[Keycode::D],
|
||||
AcceleratorKey::E => &[Keycode::E],
|
||||
AcceleratorKey::F => &[Keycode::F],
|
||||
AcceleratorKey::G => &[Keycode::G],
|
||||
AcceleratorKey::H => &[Keycode::H],
|
||||
AcceleratorKey::I => &[Keycode::I],
|
||||
AcceleratorKey::J => &[Keycode::J],
|
||||
AcceleratorKey::K => &[Keycode::K],
|
||||
AcceleratorKey::L => &[Keycode::L],
|
||||
AcceleratorKey::M => &[Keycode::M],
|
||||
AcceleratorKey::N => &[Keycode::N],
|
||||
AcceleratorKey::O => &[Keycode::O],
|
||||
AcceleratorKey::P => &[Keycode::P],
|
||||
AcceleratorKey::Q => &[Keycode::Q],
|
||||
AcceleratorKey::R => &[Keycode::R],
|
||||
AcceleratorKey::S => &[Keycode::S],
|
||||
AcceleratorKey::T => &[Keycode::T],
|
||||
AcceleratorKey::U => &[Keycode::U],
|
||||
AcceleratorKey::V => &[Keycode::V],
|
||||
AcceleratorKey::W => &[Keycode::W],
|
||||
AcceleratorKey::X => &[Keycode::X],
|
||||
AcceleratorKey::Y => &[Keycode::Y],
|
||||
AcceleratorKey::Z => &[Keycode::Z],
|
||||
AcceleratorKey::Num0 => &[Keycode::Key0],
|
||||
AcceleratorKey::Num1 => &[Keycode::Key1],
|
||||
AcceleratorKey::Num2 => &[Keycode::Key2],
|
||||
AcceleratorKey::Num3 => &[Keycode::Key3],
|
||||
AcceleratorKey::Num4 => &[Keycode::Key4],
|
||||
AcceleratorKey::Num5 => &[Keycode::Key5],
|
||||
AcceleratorKey::Num6 => &[Keycode::Key6],
|
||||
AcceleratorKey::Num7 => &[Keycode::Key7],
|
||||
AcceleratorKey::Num8 => &[Keycode::Key8],
|
||||
AcceleratorKey::Num9 => &[Keycode::Key9],
|
||||
AcceleratorKey::F1 => &[Keycode::F1],
|
||||
AcceleratorKey::F2 => &[Keycode::F2],
|
||||
AcceleratorKey::F3 => &[Keycode::F3],
|
||||
AcceleratorKey::F4 => &[Keycode::F4],
|
||||
AcceleratorKey::F5 => &[Keycode::F5],
|
||||
AcceleratorKey::F6 => &[Keycode::F6],
|
||||
AcceleratorKey::F7 => &[Keycode::F7],
|
||||
AcceleratorKey::F8 => &[Keycode::F8],
|
||||
AcceleratorKey::F9 => &[Keycode::F9],
|
||||
AcceleratorKey::F10 => &[Keycode::F10],
|
||||
AcceleratorKey::F11 => &[Keycode::F11],
|
||||
AcceleratorKey::F12 => &[Keycode::F12],
|
||||
AcceleratorKey::Enter => &[Keycode::Enter, Keycode::NumpadEnter],
|
||||
AcceleratorKey::Space => &[Keycode::Space],
|
||||
AcceleratorKey::Escape => &[Keycode::Escape],
|
||||
AcceleratorKey::Tab => &[Keycode::Tab],
|
||||
AcceleratorKey::Backspace => &[Keycode::Backspace],
|
||||
AcceleratorKey::Delete => &[Keycode::Delete],
|
||||
AcceleratorKey::Insert => &[Keycode::Insert],
|
||||
AcceleratorKey::Home => &[Keycode::Home],
|
||||
AcceleratorKey::End => &[Keycode::End],
|
||||
AcceleratorKey::PageUp => &[Keycode::PageUp],
|
||||
AcceleratorKey::PageDown => &[Keycode::PageDown],
|
||||
AcceleratorKey::ArrowUp => &[Keycode::Up],
|
||||
AcceleratorKey::ArrowDown => &[Keycode::Down],
|
||||
AcceleratorKey::ArrowLeft => &[Keycode::Left],
|
||||
AcceleratorKey::ArrowRight => &[Keycode::Right],
|
||||
AcceleratorKey::Minus => &[Keycode::Minus],
|
||||
AcceleratorKey::Equal => &[Keycode::Equal],
|
||||
AcceleratorKey::LeftBracket => &[Keycode::LeftBracket],
|
||||
AcceleratorKey::RightBracket => &[Keycode::RightBracket],
|
||||
AcceleratorKey::BackSlash => &[Keycode::BackSlash],
|
||||
AcceleratorKey::Semicolon => &[Keycode::Semicolon],
|
||||
AcceleratorKey::Apostrophe => &[Keycode::Apostrophe],
|
||||
AcceleratorKey::Comma => &[Keycode::Comma],
|
||||
AcceleratorKey::Dot => &[Keycode::Dot],
|
||||
AcceleratorKey::Slash => &[Keycode::Slash],
|
||||
AcceleratorKey::Grave => &[Keycode::Grave],
|
||||
}
|
||||
}
|
||||
|
||||
fn has_key(keys: &[Keycode], key: AcceleratorKey) -> bool {
|
||||
contains_any(keys, keycodes_for(key))
|
||||
}
|
||||
|
||||
fn pressed_modifiers(keys: &[Keycode]) -> Vec<AcceleratorModifier> {
|
||||
let mut modifiers = Vec::new();
|
||||
|
||||
for modifier in [
|
||||
AcceleratorModifier::Cmd,
|
||||
AcceleratorModifier::Alt,
|
||||
AcceleratorModifier::Ctrl,
|
||||
AcceleratorModifier::Shift,
|
||||
] {
|
||||
if has_modifier(keys, modifier) {
|
||||
modifiers.push(modifier);
|
||||
}
|
||||
}
|
||||
|
||||
modifiers
|
||||
}
|
||||
|
||||
pub fn is_accelerator_active(keys: &[Keycode], accelerator: &KeyboardAccelerator) -> bool {
|
||||
if pressed_modifiers(keys) != accelerator.modifiers {
|
||||
return false;
|
||||
}
|
||||
|
||||
accelerator.key.map_or(true, |key| has_key(keys, key))
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
mod store;
|
||||
mod window;
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use serde::{Deserialize, Deserializer, Serialize};
|
||||
use specta::Type;
|
||||
use thiserror::Error;
|
||||
@@ -8,216 +10,65 @@ use thiserror::Error;
|
||||
pub use store::{load_app_config, save_app_config};
|
||||
pub use window::open_config_window;
|
||||
|
||||
#[derive(Default, Serialize, Deserialize, Clone, Debug, Type)]
|
||||
pub use crate::services::accelerators::{
|
||||
default_accelerator_for_action, default_accelerators, normalize_accelerators,
|
||||
AcceleratorAction, KeyboardAccelerator,
|
||||
};
|
||||
|
||||
#[derive(Serialize, Clone, Debug, Type)]
|
||||
pub struct AppConfig {
|
||||
pub api_base_url: Option<String>,
|
||||
pub debug_mode: bool,
|
||||
#[serde(default)]
|
||||
pub scene_interactivity_hotkey: SceneInteractivityHotkey,
|
||||
pub accelerators: BTreeMap<AcceleratorAction, KeyboardAccelerator>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone, Debug, PartialEq, Eq, Type)]
|
||||
pub struct SceneInteractivityHotkey {
|
||||
#[serde(default)]
|
||||
pub modifiers: Vec<SceneInteractivityModifier>,
|
||||
#[serde(default)]
|
||||
pub key: Option<SceneInteractivityKey>,
|
||||
}
|
||||
|
||||
impl SceneInteractivityHotkey {
|
||||
impl AppConfig {
|
||||
pub fn normalized(mut self) -> Self {
|
||||
self.modifiers.sort_unstable();
|
||||
self.modifiers.dedup();
|
||||
|
||||
if self.modifiers.is_empty() {
|
||||
return Self::default();
|
||||
}
|
||||
|
||||
self.accelerators = normalize_accelerators(self.accelerators);
|
||||
self
|
||||
}
|
||||
|
||||
fn from_legacy(value: LegacySceneInteractivityHotkey) -> Self {
|
||||
let modifiers = match value {
|
||||
LegacySceneInteractivityHotkey::CmdAlt => {
|
||||
vec![
|
||||
SceneInteractivityModifier::Cmd,
|
||||
SceneInteractivityModifier::Alt,
|
||||
]
|
||||
}
|
||||
LegacySceneInteractivityHotkey::CmdCtrl => {
|
||||
vec![
|
||||
SceneInteractivityModifier::Cmd,
|
||||
SceneInteractivityModifier::Ctrl,
|
||||
]
|
||||
}
|
||||
LegacySceneInteractivityHotkey::AltCtrl => {
|
||||
vec![
|
||||
SceneInteractivityModifier::Alt,
|
||||
SceneInteractivityModifier::Ctrl,
|
||||
]
|
||||
}
|
||||
LegacySceneInteractivityHotkey::Cmd => vec![SceneInteractivityModifier::Cmd],
|
||||
LegacySceneInteractivityHotkey::Alt => vec![SceneInteractivityModifier::Alt],
|
||||
LegacySceneInteractivityHotkey::Ctrl => vec![SceneInteractivityModifier::Ctrl],
|
||||
};
|
||||
pub fn accelerator_for(&self, action: AcceleratorAction) -> KeyboardAccelerator {
|
||||
self.accelerators
|
||||
.get(&action)
|
||||
.cloned()
|
||||
.unwrap_or_else(|| default_accelerator_for_action(action))
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for AppConfig {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
modifiers,
|
||||
key: None,
|
||||
api_base_url: None,
|
||||
debug_mode: false,
|
||||
accelerators: default_accelerators(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'de> Deserialize<'de> for SceneInteractivityHotkey {
|
||||
impl<'de> Deserialize<'de> for AppConfig {
|
||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||
where
|
||||
D: Deserializer<'de>,
|
||||
{
|
||||
#[derive(Deserialize)]
|
||||
struct SceneInteractivityHotkeyV2 {
|
||||
struct AppConfigSerde {
|
||||
api_base_url: Option<String>,
|
||||
#[serde(default)]
|
||||
modifiers: Vec<SceneInteractivityModifier>,
|
||||
debug_mode: bool,
|
||||
#[serde(default)]
|
||||
key: Option<SceneInteractivityKey>,
|
||||
accelerators: BTreeMap<AcceleratorAction, KeyboardAccelerator>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(untagged)]
|
||||
enum SceneInteractivityHotkeySerde {
|
||||
V2(SceneInteractivityHotkeyV2),
|
||||
Legacy(LegacySceneInteractivityHotkey),
|
||||
}
|
||||
|
||||
let value = SceneInteractivityHotkeySerde::deserialize(deserializer)?;
|
||||
let normalized = match value {
|
||||
SceneInteractivityHotkeySerde::V2(v2) => Self {
|
||||
modifiers: v2.modifiers,
|
||||
key: v2.key,
|
||||
}
|
||||
.normalized(),
|
||||
SceneInteractivityHotkeySerde::Legacy(legacy) => Self::from_legacy(legacy).normalized(),
|
||||
};
|
||||
|
||||
Ok(normalized)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Type)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum SceneInteractivityModifier {
|
||||
Cmd,
|
||||
Alt,
|
||||
Ctrl,
|
||||
Shift,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Type)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum SceneInteractivityKey {
|
||||
A,
|
||||
B,
|
||||
C,
|
||||
D,
|
||||
E,
|
||||
F,
|
||||
G,
|
||||
H,
|
||||
I,
|
||||
J,
|
||||
K,
|
||||
L,
|
||||
M,
|
||||
N,
|
||||
O,
|
||||
P,
|
||||
Q,
|
||||
R,
|
||||
S,
|
||||
T,
|
||||
U,
|
||||
V,
|
||||
W,
|
||||
X,
|
||||
Y,
|
||||
Z,
|
||||
Num0,
|
||||
Num1,
|
||||
Num2,
|
||||
Num3,
|
||||
Num4,
|
||||
Num5,
|
||||
Num6,
|
||||
Num7,
|
||||
Num8,
|
||||
Num9,
|
||||
F1,
|
||||
F2,
|
||||
F3,
|
||||
F4,
|
||||
F5,
|
||||
F6,
|
||||
F7,
|
||||
F8,
|
||||
F9,
|
||||
F10,
|
||||
F11,
|
||||
F12,
|
||||
Enter,
|
||||
Space,
|
||||
Escape,
|
||||
Tab,
|
||||
Backspace,
|
||||
Delete,
|
||||
Insert,
|
||||
Home,
|
||||
End,
|
||||
PageUp,
|
||||
PageDown,
|
||||
ArrowUp,
|
||||
ArrowDown,
|
||||
ArrowLeft,
|
||||
ArrowRight,
|
||||
Minus,
|
||||
Equal,
|
||||
LeftBracket,
|
||||
RightBracket,
|
||||
BackSlash,
|
||||
Semicolon,
|
||||
Apostrophe,
|
||||
Comma,
|
||||
Dot,
|
||||
Slash,
|
||||
Grave,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
enum LegacySceneInteractivityHotkey {
|
||||
CmdAlt,
|
||||
CmdCtrl,
|
||||
AltCtrl,
|
||||
Cmd,
|
||||
Alt,
|
||||
Ctrl,
|
||||
}
|
||||
|
||||
impl Default for SceneInteractivityHotkey {
|
||||
fn default() -> Self {
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
Self {
|
||||
modifiers: vec![SceneInteractivityModifier::Cmd],
|
||||
key: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
{
|
||||
Self {
|
||||
modifiers: vec![SceneInteractivityModifier::Alt],
|
||||
key: None,
|
||||
}
|
||||
let value = AppConfigSerde::deserialize(deserializer)?;
|
||||
|
||||
Ok(Self {
|
||||
api_base_url: value.api_base_url,
|
||||
debug_mode: value.debug_mode,
|
||||
accelerators: value.accelerators,
|
||||
}
|
||||
.normalized())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ use url::Url;
|
||||
|
||||
use crate::get_app_handle;
|
||||
|
||||
use super::{AppConfig, ClientConfigError, SceneInteractivityHotkey};
|
||||
use super::{AppConfig, ClientConfigError};
|
||||
|
||||
const CONFIG_FILENAME: &str = "client_config.json";
|
||||
const DEFAULT_API_BASE_URL: &str = "https://api.friendolls.adamcv.com";
|
||||
@@ -48,16 +48,14 @@ fn sanitize(mut config: AppConfig) -> AppConfig {
|
||||
.or_else(|| Some(DEFAULT_API_BASE_URL.to_string()))
|
||||
.map(|v| strip_trailing_slash(&v));
|
||||
|
||||
config.scene_interactivity_hotkey = config.scene_interactivity_hotkey.normalized();
|
||||
|
||||
config
|
||||
config.normalized()
|
||||
}
|
||||
|
||||
pub fn default_app_config() -> AppConfig {
|
||||
AppConfig {
|
||||
api_base_url: Some(DEFAULT_API_BASE_URL.to_string()),
|
||||
debug_mode: false,
|
||||
scene_interactivity_hotkey: SceneInteractivityHotkey::default(),
|
||||
..AppConfig::default()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ pub mod app_data;
|
||||
pub mod app_events;
|
||||
pub mod app_menu;
|
||||
pub mod app_update;
|
||||
pub mod accelerators;
|
||||
pub mod auth;
|
||||
pub mod client_config;
|
||||
pub mod cursor;
|
||||
|
||||
@@ -2,7 +2,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::Arc;
|
||||
use std::thread;
|
||||
|
||||
use device_query::{DeviceQuery, DeviceState, Keycode};
|
||||
use device_query::{DeviceQuery, DeviceState};
|
||||
use once_cell::sync::OnceCell;
|
||||
use tauri::Manager;
|
||||
use tauri_specta::Event as _;
|
||||
@@ -11,10 +11,8 @@ use tracing::{error, info, warn};
|
||||
use crate::{
|
||||
get_app_handle, lock_r,
|
||||
services::{
|
||||
app_events::SceneInteractiveChanged,
|
||||
client_config::{
|
||||
SceneInteractivityHotkey, SceneInteractivityKey, SceneInteractivityModifier,
|
||||
},
|
||||
accelerators::is_accelerator_active, app_events::SceneInteractiveChanged,
|
||||
client_config::AcceleratorAction,
|
||||
},
|
||||
state::FDOLL,
|
||||
};
|
||||
@@ -38,135 +36,6 @@ fn scene_interactive_state() -> Arc<AtomicBool> {
|
||||
.clone()
|
||||
}
|
||||
|
||||
fn has_modifier(keys: &[Keycode], modifier: SceneInteractivityModifier) -> bool {
|
||||
match modifier {
|
||||
SceneInteractivityModifier::Cmd => {
|
||||
keys.contains(&Keycode::Command)
|
||||
|| keys.contains(&Keycode::RCommand)
|
||||
|| keys.contains(&Keycode::LMeta)
|
||||
|| keys.contains(&Keycode::RMeta)
|
||||
}
|
||||
SceneInteractivityModifier::Alt => {
|
||||
keys.contains(&Keycode::LAlt)
|
||||
|| keys.contains(&Keycode::RAlt)
|
||||
|| keys.contains(&Keycode::LOption)
|
||||
|| keys.contains(&Keycode::ROption)
|
||||
}
|
||||
SceneInteractivityModifier::Ctrl => {
|
||||
keys.contains(&Keycode::LControl) || keys.contains(&Keycode::RControl)
|
||||
}
|
||||
SceneInteractivityModifier::Shift => {
|
||||
keys.contains(&Keycode::LShift) || keys.contains(&Keycode::RShift)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn has_key(keys: &[Keycode], key: SceneInteractivityKey) -> bool {
|
||||
match key {
|
||||
SceneInteractivityKey::A => keys.contains(&Keycode::A),
|
||||
SceneInteractivityKey::B => keys.contains(&Keycode::B),
|
||||
SceneInteractivityKey::C => keys.contains(&Keycode::C),
|
||||
SceneInteractivityKey::D => keys.contains(&Keycode::D),
|
||||
SceneInteractivityKey::E => keys.contains(&Keycode::E),
|
||||
SceneInteractivityKey::F => keys.contains(&Keycode::F),
|
||||
SceneInteractivityKey::G => keys.contains(&Keycode::G),
|
||||
SceneInteractivityKey::H => keys.contains(&Keycode::H),
|
||||
SceneInteractivityKey::I => keys.contains(&Keycode::I),
|
||||
SceneInteractivityKey::J => keys.contains(&Keycode::J),
|
||||
SceneInteractivityKey::K => keys.contains(&Keycode::K),
|
||||
SceneInteractivityKey::L => keys.contains(&Keycode::L),
|
||||
SceneInteractivityKey::M => keys.contains(&Keycode::M),
|
||||
SceneInteractivityKey::N => keys.contains(&Keycode::N),
|
||||
SceneInteractivityKey::O => keys.contains(&Keycode::O),
|
||||
SceneInteractivityKey::P => keys.contains(&Keycode::P),
|
||||
SceneInteractivityKey::Q => keys.contains(&Keycode::Q),
|
||||
SceneInteractivityKey::R => keys.contains(&Keycode::R),
|
||||
SceneInteractivityKey::S => keys.contains(&Keycode::S),
|
||||
SceneInteractivityKey::T => keys.contains(&Keycode::T),
|
||||
SceneInteractivityKey::U => keys.contains(&Keycode::U),
|
||||
SceneInteractivityKey::V => keys.contains(&Keycode::V),
|
||||
SceneInteractivityKey::W => keys.contains(&Keycode::W),
|
||||
SceneInteractivityKey::X => keys.contains(&Keycode::X),
|
||||
SceneInteractivityKey::Y => keys.contains(&Keycode::Y),
|
||||
SceneInteractivityKey::Z => keys.contains(&Keycode::Z),
|
||||
SceneInteractivityKey::Num0 => keys.contains(&Keycode::Key0),
|
||||
SceneInteractivityKey::Num1 => keys.contains(&Keycode::Key1),
|
||||
SceneInteractivityKey::Num2 => keys.contains(&Keycode::Key2),
|
||||
SceneInteractivityKey::Num3 => keys.contains(&Keycode::Key3),
|
||||
SceneInteractivityKey::Num4 => keys.contains(&Keycode::Key4),
|
||||
SceneInteractivityKey::Num5 => keys.contains(&Keycode::Key5),
|
||||
SceneInteractivityKey::Num6 => keys.contains(&Keycode::Key6),
|
||||
SceneInteractivityKey::Num7 => keys.contains(&Keycode::Key7),
|
||||
SceneInteractivityKey::Num8 => keys.contains(&Keycode::Key8),
|
||||
SceneInteractivityKey::Num9 => keys.contains(&Keycode::Key9),
|
||||
SceneInteractivityKey::F1 => keys.contains(&Keycode::F1),
|
||||
SceneInteractivityKey::F2 => keys.contains(&Keycode::F2),
|
||||
SceneInteractivityKey::F3 => keys.contains(&Keycode::F3),
|
||||
SceneInteractivityKey::F4 => keys.contains(&Keycode::F4),
|
||||
SceneInteractivityKey::F5 => keys.contains(&Keycode::F5),
|
||||
SceneInteractivityKey::F6 => keys.contains(&Keycode::F6),
|
||||
SceneInteractivityKey::F7 => keys.contains(&Keycode::F7),
|
||||
SceneInteractivityKey::F8 => keys.contains(&Keycode::F8),
|
||||
SceneInteractivityKey::F9 => keys.contains(&Keycode::F9),
|
||||
SceneInteractivityKey::F10 => keys.contains(&Keycode::F10),
|
||||
SceneInteractivityKey::F11 => keys.contains(&Keycode::F11),
|
||||
SceneInteractivityKey::F12 => keys.contains(&Keycode::F12),
|
||||
SceneInteractivityKey::Enter => {
|
||||
keys.contains(&Keycode::Enter) || keys.contains(&Keycode::NumpadEnter)
|
||||
}
|
||||
SceneInteractivityKey::Space => keys.contains(&Keycode::Space),
|
||||
SceneInteractivityKey::Escape => keys.contains(&Keycode::Escape),
|
||||
SceneInteractivityKey::Tab => keys.contains(&Keycode::Tab),
|
||||
SceneInteractivityKey::Backspace => keys.contains(&Keycode::Backspace),
|
||||
SceneInteractivityKey::Delete => keys.contains(&Keycode::Delete),
|
||||
SceneInteractivityKey::Insert => keys.contains(&Keycode::Insert),
|
||||
SceneInteractivityKey::Home => keys.contains(&Keycode::Home),
|
||||
SceneInteractivityKey::End => keys.contains(&Keycode::End),
|
||||
SceneInteractivityKey::PageUp => keys.contains(&Keycode::PageUp),
|
||||
SceneInteractivityKey::PageDown => keys.contains(&Keycode::PageDown),
|
||||
SceneInteractivityKey::ArrowUp => keys.contains(&Keycode::Up),
|
||||
SceneInteractivityKey::ArrowDown => keys.contains(&Keycode::Down),
|
||||
SceneInteractivityKey::ArrowLeft => keys.contains(&Keycode::Left),
|
||||
SceneInteractivityKey::ArrowRight => keys.contains(&Keycode::Right),
|
||||
SceneInteractivityKey::Minus => keys.contains(&Keycode::Minus),
|
||||
SceneInteractivityKey::Equal => keys.contains(&Keycode::Equal),
|
||||
SceneInteractivityKey::LeftBracket => keys.contains(&Keycode::LeftBracket),
|
||||
SceneInteractivityKey::RightBracket => keys.contains(&Keycode::RightBracket),
|
||||
SceneInteractivityKey::BackSlash => keys.contains(&Keycode::BackSlash),
|
||||
SceneInteractivityKey::Semicolon => keys.contains(&Keycode::Semicolon),
|
||||
SceneInteractivityKey::Apostrophe => keys.contains(&Keycode::Apostrophe),
|
||||
SceneInteractivityKey::Comma => keys.contains(&Keycode::Comma),
|
||||
SceneInteractivityKey::Dot => keys.contains(&Keycode::Dot),
|
||||
SceneInteractivityKey::Slash => keys.contains(&Keycode::Slash),
|
||||
SceneInteractivityKey::Grave => keys.contains(&Keycode::Grave),
|
||||
}
|
||||
}
|
||||
|
||||
fn pressed_modifiers(keys: &[Keycode]) -> Vec<SceneInteractivityModifier> {
|
||||
let mut modifiers = Vec::new();
|
||||
|
||||
for modifier in [
|
||||
SceneInteractivityModifier::Cmd,
|
||||
SceneInteractivityModifier::Alt,
|
||||
SceneInteractivityModifier::Ctrl,
|
||||
SceneInteractivityModifier::Shift,
|
||||
] {
|
||||
if has_modifier(keys, modifier) {
|
||||
modifiers.push(modifier);
|
||||
}
|
||||
}
|
||||
|
||||
modifiers
|
||||
}
|
||||
|
||||
fn is_hotkey_active(keys: &[Keycode], hotkey: SceneInteractivityHotkey) -> bool {
|
||||
if pressed_modifiers(keys) != hotkey.modifiers {
|
||||
return false;
|
||||
}
|
||||
|
||||
hotkey.key.map_or(true, |key| has_key(keys, key))
|
||||
}
|
||||
|
||||
pub(crate) fn start_scene_modifier_listener() {
|
||||
MODIFIER_LISTENER_INIT.get_or_init(|| {
|
||||
let state = scene_interactive_state();
|
||||
@@ -206,9 +75,11 @@ pub(crate) fn start_scene_modifier_listener() {
|
||||
let keys = device_state.get_keys();
|
||||
let hotkey = {
|
||||
let guard = lock_r!(FDOLL);
|
||||
guard.app_config.scene_interactivity_hotkey.clone()
|
||||
guard
|
||||
.app_config
|
||||
.accelerator_for(AcceleratorAction::SceneInteractivity)
|
||||
};
|
||||
let keys_interactive = is_hotkey_active(&keys, hotkey);
|
||||
let keys_interactive = is_accelerator_active(&keys, &hotkey);
|
||||
|
||||
let menus_open = {
|
||||
if let Ok(menus) = get_open_pet_menus().lock() {
|
||||
|
||||
Reference in New Issue
Block a user