enh(wm): improve matching system

Author: eythaann

changelog.md

@@ -6,6 +6,10 @@
 
 - add new cli command to tranlate resource texts.
 
+### enhancements
+
+- improve window manager matching system.
+
 ## [2.4.6]
 
 ### features

libs/core/src/state/settings_by_app.rs

@@ -5,17 +5,23 @@ use serde_alias::serde_alias;
 use ts_rs::TS;
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
 #[ts(repr(enum = name))]
 pub enum AppExtraFlag {
+    /// Mark this app as non interactive window.
+    #[serde(alias = "no-interactive")]
+    NoInteractive,
     /// Start the app in the center of the screen as floating in the wm.
-    Float,
-    /// Force manage this app in the wm.
-    Force,
+    #[serde(alias = "float", alias = "wm-float")]
+    WmFloat,
+    /// Forces the management of this app in the wm. (only if it is interactable and not pinned)
+    #[serde(alias = "force", alias = "wm-force")]
+    WmForce,
     /// Unmanage this app in the wm.
-    Unmanage,
+    #[serde(alias = "unmanage", alias = "wm-unmanage")]
+    WmUnmanage,
     /// Pin this app in all the virtual desktops in the wm.
-    Pinned,
+    #[serde(alias = "pinned", alias = "vd-pinned")]
+    VdPinned,
     #[serde(other)]
     Unknown,
 }
@@ -78,7 +84,7 @@ pub struct AppIdentifierCache {
 }
 
 impl AppIdentifier {
-    pub fn perform_cache(&mut self) {
+    pub fn prepare(&mut self) {
         if matches!(self.matching_strategy, MatchingStrategy::Regex) {
             let result = Regex::new(&self.id);
             if let Ok(re) = result {
@@ -89,8 +95,8 @@ impl AppIdentifier {
             self.cache.uppercased_id = Some(self.id.to_uppercase());
         }
 
-        self.and.iter_mut().for_each(|i| i.perform_cache());
-        self.or.iter_mut().for_each(|i| i.perform_cache());
+        self.and.iter_mut().for_each(|i| i.prepare());
+        self.or.iter_mut().for_each(|i| i.prepare());
     }
 
     pub fn uppercased_id(&self) -> &str {
@@ -174,3 +180,48 @@ pub struct AppConfig {
     #[serde(default)]
     pub is_bundled: bool,
 }
+
+impl AppConfig {
+    pub fn prepare(&mut self) {
+        self.identifier.prepare();
+    }
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct AppsConfigurationList(Vec<AppConfig>);
+
+impl AppsConfigurationList {
+    pub fn prepare(&mut self) {
+        self.0.iter_mut().for_each(|config| config.prepare());
+    }
+
+    pub fn search(&self, title: &str, class: &str, exe: &str, path: &str) -> Option<&AppConfig> {
+        self.0
+            .iter()
+            .find(|&config| config.identifier.validate(title, class, exe, path))
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &AppConfig> {
+        self.0.iter()
+    }
+
+    pub fn clear(&mut self) {
+        self.0.clear();
+    }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn extend(&mut self, configs: Vec<AppConfig>) {
+        self.0.extend(configs);
+    }
+
+    pub fn as_slice(&self) -> &[AppConfig] {
+        &self.0
+    }
+}

package-lock.json

@@ -1,11 +1,12 @@
-use seelen_core::system_state::UserAppWindow;
+use seelen_core::{state::AppExtraFlag, system_state::UserAppWindow};
 use windows::Win32::UI::WindowsAndMessaging::{
     WS_CHILD, WS_EX_APPWINDOW, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_MINIMIZEBOX,
 };
 
 use crate::{
     hook::HookManager,
     modules::apps::application::{UserAppsEvent, UserAppsManager, USER_APPS_MANAGER},
+    state::application::FULL_STATE,
     utils::spawn_named_thread,
     windows_api::{
         window::{event::WinEvent, Window},
@@ -166,5 +167,12 @@ pub fn is_interactable_and_not_hidden(window: &Window) -> bool {
         return false;
     }
 
+    let guard = FULL_STATE.load();
+    if let Some(config) = guard.get_app_config_by_window(window.hwnd()) {
+        if config.options.contains(&AppExtraFlag::NoInteractive) {
+            return false;
+        }
+    }
+
     true
 }

src/background/modules/apps/application/windows.rs

@@ -9,7 +9,7 @@ impl FullState {
     pub(super) fn emit_settings_by_app(&self) -> Result<()> {
         get_app_handle().emit(
             SeelenEvent::StateSettingsByAppChanged,
-            &self.settings_by_app,
+            self.settings_by_app.as_slice(),
         )?;
         Ok(())
     }

src/background/state/application/events.rs

@@ -21,10 +21,13 @@ use notify_debouncer_full::{
 use parking_lot::Mutex;
 use seelen_core::{
     resource::ResourceKind,
-    state::{CssStyles, LauncherHistory, Profile, SluPopupConfig, SluPopupContent, WegItems},
+    state::{
+        AppsConfigurationList, CssStyles, LauncherHistory, Profile, SluPopupConfig,
+        SluPopupContent, WegItems,
+    },
 };
 use std::{
-    collections::{HashSet, VecDeque},
+    collections::HashSet,
     path::{Path, PathBuf},
     sync::Arc,
     time::Duration,
@@ -50,7 +53,7 @@ pub struct FullState {
     // ======== data ========
     pub profiles: Vec<Profile>,
     pub settings: Settings,
-    pub settings_by_app: VecDeque<AppConfig>,
+    pub settings_by_app: AppsConfigurationList,
     pub weg_items: WegItems,
     pub toolbar_items: Placeholder,
     pub launcher_history: LauncherHistory,
@@ -67,7 +70,7 @@ impl FullState {
             // ======== data ========
             profiles: Vec::new(),
             settings: Settings::default(),
-            settings_by_app: VecDeque::new(),
+            settings_by_app: AppsConfigurationList::default(),
             weg_items: WegItems::default(),
             toolbar_items: Self::initial_toolbar_items(),
             launcher_history: LauncherHistory::default(),
@@ -327,9 +330,7 @@ impl FullState {
             self.settings_by_app.extend(apps);
         }
 
-        self.settings_by_app
-            .iter_mut()
-            .for_each(|app| app.identifier.perform_cache());
+        self.settings_by_app.prepare();
         Ok(())
     }
 

src/background/state/application/mod.rs

@@ -15,7 +15,7 @@ use state::{WmWorkspaceState, WM_STATE};
 use tauri::Emitter;
 use windows::Win32::{
     Foundation::HWND,
-    UI::WindowsAndMessaging::{WS_CAPTION, WS_EX_TOPMOST},
+    UI::WindowsAndMessaging::{WS_EX_TOPMOST, WS_SIZEBOX},
 };
 
 use crate::{
@@ -30,27 +30,39 @@ use crate::{
 };
 
 impl WindowManagerV2 {
-    fn is_manageable_window(hwnd: HWND) -> bool {
+    fn should_be_managed(hwnd: HWND) -> bool {
         let window = Window::from(hwnd);
-        window.is_interactable_and_not_hidden()
-        // Ignore windows without a title bar, and top most windows normally are widgets or tools so they should not be managed
-        && (WindowsApi::get_styles(hwnd).contains(WS_CAPTION) && !WindowsApi::get_ex_styles(hwnd).contains(WS_EX_TOPMOST))
-        && !window.is_cloaked()
-    }
+        if !window.is_interactable_and_not_hidden() {
+            return false;
+        }
 
-    fn should_be_managed(hwnd: HWND) -> bool {
         if let Some(config) = FULL_STATE.load().get_app_config_by_window(hwnd) {
-            if config.options.contains(&AppExtraFlag::Force) {
+            if config.options.contains(&AppExtraFlag::VdPinned) {
+                return false;
+            }
+
+            if config.options.contains(&AppExtraFlag::WmForce) {
                 return true;
             }
 
-            if config.options.contains(&AppExtraFlag::Unmanage)
-                || config.options.contains(&AppExtraFlag::Pinned)
-            {
+            if config.options.contains(&AppExtraFlag::WmUnmanage) {
                 return false;
             }
         }
-        Self::is_manageable_window(hwnd)
+
+        let styles = WindowsApi::get_styles(hwnd);
+        // Ignore windows that are not resizable
+        if !styles.contains(WS_SIZEBOX) {
+            return false;
+        }
+
+        let ex_styles = WindowsApi::get_ex_styles(hwnd);
+        // Top most windows normally are widgets or tools that should not be managed
+        if ex_styles.contains(WS_EX_TOPMOST) {
+            return false;
+        }
+
+        true
     }
 
     fn is_managed(window: &Window) -> bool {

src/background/widgets/window_manager/mod.rs

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/Seelen-Inc/slu-lib/refs/heads/master/gen/schemas/settings_by_app.schema.json
 - name: Snipping Tool
   identifier:
     id: SnippingTool.exe
@@ -73,3 +72,21 @@
     matchingStrategy: Equals
   options:
     - unmanage
+
+- name: System Background Apps
+  identifier:
+    id: Windows\SystemApps
+    kind: Path
+    matchingStrategy: Contains
+  options:
+    - no-interactive
+    - unmanage
+
+- name: Idle Windows Settings
+  identifier:
+    id: Windows\ImmersiveControlPanel
+    kind: Path
+    matchingStrategy: Contains
+  options:
+    - no-interactive
+    - unmanage

src/static/apps_templates/system.yml

@@ -23,11 +23,11 @@ apps_configurations:
     ok_edit: Opdateer
     ok_readonly: Wysig as nuut
     options:
-      float: Dryf
-      force: Kragbestuur
-      hidden: Verberg van die beskuldigdebalk/taakbalk
-      pinned: Vasgaan
-      unmanage: Onhandiging
+      NoInteractive: Geen interaktief nie
+      VdPinned: Wys in alle werkruimtes
+      WmFloat: Twm - Begin dryf
+      WmForce: Twm - Force Bestuur
+      WmUnmanage: Twm - Onbestuur
     options_label: Ekstra opsies
     title_create: Skep {{name}}
     title_edit: Redigering {{name}}

src/ui/react/settings/i18n/translations/af.yml

@@ -23,11 +23,11 @@ apps_configurations:
     ok_edit: ዝመና
     ok_readonly: እንደ አዲስ ያርትዑ
     options:
-      float: ተንሳፋፊ
-      force: ኃይል ማስተዳደር
-      hidden: ከ Dock / Actorbar ይደብቁ
-      pinned: ተያይ ated ል
-      unmanage: አለመግባባት
+      NoInteractive: በይነተገናኝ የለም
+      VdPinned: በሁሉም የስራ ቦታዎች ውስጥ አሳይ
+      WmFloat: Twm - ተንሳፋፊ ጅምር
+      WmForce: Twm - ኃይል ያስተዳድሩ
+      WmUnmanage: Twm - አለመግባባት
     options_label: ተጨማሪ አማራጮች
     title_create: '{{{ስም} መፍጠር}}'
     title_edit: አርት editing {{ስም}}}