config: add app-id window criteria

jay-config/src/_private.rs

@@ -115,4 +115,5 @@ pub enum WindowCriterionIpc {
 #[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq)]
 pub enum WindowCriterionStringField {
     Title,
+    AppId,
 }

jay-config/src/_private/client.rs

@@ -1655,6 +1655,8 @@ impl ConfigClient {
             }
             WindowCriterion::Title(t) => string!(t, Title, false),
             WindowCriterion::TitleRegex(t) => string!(t, Title, true),
+            WindowCriterion::AppId(t) => string!(t, AppId, false),
+            WindowCriterion::AppIdRegex(t) => string!(t, AppId, true),
         };
         let res = self.send_with_response(&ClientMessage::CreateWindowMatcher { criterion });
         get_response!(

jay-config/src/window.rs

@@ -240,6 +240,10 @@ pub enum WindowCriterion<'a> {
     Title(&'a str),
     /// Matches the title of the window with a regular expression.
     TitleRegex(&'a str),
+    /// Matches the app-id of the window verbatim.
+    AppId(&'a str),
+    /// Matches the app-id of the window with a regular expression.
+    AppIdRegex(&'a str),
 }
 
 impl WindowCriterion<'_> {

src/config/handler.rs

@@ -1989,6 +1989,7 @@ impl ConfigProxyHandler {
                 };
                 match *field {
                     WindowCriterionStringField::Title => mgr.title(needle),
+                    WindowCriterionStringField::AppId => mgr.app_id(needle),
                 }
             }
             WindowCriterionIpc::Types(t) => mgr.kind(*t),

src/criteria/tlm.rs

@@ -10,7 +10,9 @@ use {
             crit_leaf::{CritLeafEvent, CritLeafMatcher},
             crit_matchers::critm_constant::CritMatchConstant,
             tlm::tlm_matchers::{
-                tlmm_client::TlmMatchClient, tlmm_kind::TlmMatchKind, tlmm_string::TlmMatchTitle,
+                tlmm_client::TlmMatchClient,
+                tlmm_kind::TlmMatchKind,
+                tlmm_string::{TlmMatchAppId, TlmMatchTitle},
             },
         },
         state::State,
@@ -29,6 +31,7 @@ bitflags! {
     TL_CHANGED_DESTROYED   = 1 << 0,
     TL_CHANGED_NEW         = 1 << 1,
     TL_CHANGED_TITLE       = 1 << 2,
+    TL_CHANGED_APP_ID      = 1 << 3,
 }
 
 type TlmFixedRootMatcher<T> = FixedRootMatcher<ToplevelData, T>;
@@ -48,6 +51,7 @@ pub struct RootMatchers {
     kinds: TlmRootMatcherMap<TlmMatchKind>,
     clients: CopyHashMap<CritMatcherId, Weak<TlmMatchClient>>,
     title: TlmRootMatcherMap<TlmMatchTitle>,
+    app_id: TlmRootMatcherMap<TlmMatchAppId>,
 }
 
 pub async fn handle_tl_changes(state: Rc<State>) {
@@ -143,6 +147,7 @@ impl TlMatcherManager {
             };
         }
         conditional!(TL_CHANGED_TITLE, title);
+        conditional!(TL_CHANGED_APP_ID, app_id);
         false
     }
 
@@ -210,12 +215,17 @@ impl TlMatcherManager {
             };
         }
         conditional!(TL_CHANGED_TITLE, title);
+        conditional!(TL_CHANGED_APP_ID, app_id);
     }
 
     pub fn title(&self, string: CritLiteralOrRegex) -> Rc<TlmUpstreamNode> {
         self.root(TlmMatchTitle::new(string))
     }
 
+    pub fn app_id(&self, string: CritLiteralOrRegex) -> Rc<TlmUpstreamNode> {
+        self.root(TlmMatchAppId::new(string))
+    }
+
     pub fn kind(&self, kind: WindowType) -> Rc<TlmUpstreamNode> {
         self.root(TlmMatchKind::new(kind))
     }

src/criteria/tlm/tlm_matchers/tlmm_string.rs

@@ -9,8 +9,10 @@ use crate::{
 pub type TlmMatchString<T> = CritMatchString<ToplevelData, T>;
 
 pub type TlmMatchTitle = TlmMatchString<TitleAccess>;
+pub type TlmMatchAppId = TlmMatchString<AppIdAccess>;
 
 pub struct TitleAccess;
+pub struct AppIdAccess;
 
 impl StringAccess<ToplevelData> for TitleAccess {
     fn with_string(data: &ToplevelData, f: impl FnOnce(&str) -> bool) -> bool {
@@ -21,3 +23,13 @@ impl StringAccess<ToplevelData> for TitleAccess {
         &roots.title
     }
 }
+
+impl StringAccess<ToplevelData> for AppIdAccess {
+    fn with_string(data: &ToplevelData, f: impl FnOnce(&str) -> bool) -> bool {
+        f(&data.app_id.borrow())
+    }
+
+    fn nodes(roots: &RootMatchers) -> &TlmRootMatcherMap<TlmMatchString<Self>> {
+        &roots.app_id
+    }
+}

src/tree/toplevel.rs

@@ -3,7 +3,10 @@ use {
         client::{Client, ClientId},
         criteria::{
             CritDestroyListener, CritMatcherId,
-            tlm::{TL_CHANGED_DESTROYED, TL_CHANGED_NEW, TL_CHANGED_TITLE, TlMatcherChange},
+            tlm::{
+                TL_CHANGED_APP_ID, TL_CHANGED_DESTROYED, TL_CHANGED_NEW, TL_CHANGED_TITLE,
+                TlMatcherChange,
+            },
         },
         ifs::{
             ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
@@ -498,11 +501,16 @@ impl ToplevelData {
     }
 
     pub fn set_app_id(&self, app_id: &str) {
-        *self.app_id.borrow_mut() = app_id.to_string();
+        let dst = &mut *self.app_id.borrow_mut();
+        if *dst == app_id {
+            return;
+        }
+        *dst = app_id.to_string();
         for handle in self.handles.lock().values() {
             handle.send_app_id(app_id);
             handle.send_done();
         }
+        self.property_changed(TL_CHANGED_APP_ID)
     }
 
     pub fn set_fullscreen(

toml-config/src/config.rs

@@ -257,6 +257,8 @@ pub struct WindowMatch {
     pub client: Option<ClientMatch>,
     pub title: Option<String>,
     pub title_regex: Option<String>,
+    pub app_id: Option<String>,
+    pub app_id_regex: Option<String>,
 }
 
 #[derive(Debug, Clone)]

toml-config/src/config/parsers/window_match.rs

@@ -44,27 +44,33 @@ impl Parser for WindowMatchParser<'_> {
         table: &IndexMap<Spanned<String>, Spanned<Value>>,
     ) -> ParseResult<Self> {
         let mut ext = Extractor::new(self.0, span, table);
-        let ((
+        let (
-            name,
+            (
-            not_val,
+                name,
-            all_val,
+                not_val,
-            any_val,
+                all_val,
-            exactly_val,
+                any_val,
-            types_val,
+                exactly_val,
-            client_val,
+                types_val,
-            title,
+                client_val,
-            title_regex,
+                title,
-        ),) = ext.extract(((
+                title_regex,
-            opt(str("name")),
+            ),
-            opt(val("not")),
+            (app_id, app_id_regex),
-            opt(arr("all")),
+        ) = ext.extract((
-            opt(arr("any")),
+            (
-            opt(val("exactly")),
+                opt(str("name")),
-            opt(val("types")),
+                opt(val("not")),
-            opt(val("client")),
+                opt(arr("all")),
-            opt(str("title")),
+                opt(arr("any")),
-            opt(str("title-regex")),
+                opt(val("exactly")),
-        ),))?;
+                opt(val("types")),
+                opt(val("client")),
+                opt(str("title")),
+                opt(str("title-regex")),
+            ),
+            (opt(str("app-id")), opt(str("app-id-regex"))),
+        ))?;
         let mut not = None;
         if let Some(value) = not_val {
             not = Some(Box::new(value.parse(&mut WindowMatchParser(self.0))?));
@@ -106,6 +112,8 @@ impl Parser for WindowMatchParser<'_> {
             },
             title: title.despan_into(),
             title_regex: title_regex.despan_into(),
+            app_id: app_id.despan_into(),
+            app_id_regex: app_id_regex.despan_into(),
             types,
             client,
         })

toml-config/src/rules.rs

@@ -257,6 +257,8 @@ impl Rule for WindowRule {
         }
         value!(Title, title);
         value!(TitleRegex, title_regex);
+        value!(AppId, app_id);
+        value!(AppIdRegex, app_id_regex);
         Some(())
     }
 

toml-spec/spec/spec.generated.json

@@ -1787,6 +1787,14 @@
         "title-regex": {
           "type": "string",
           "description": "Matches the title of the window with a regular expression."
+        },
+        "app-id": {
+          "type": "string",
+          "description": "Matches the app-id of the window verbatim."
+        },
+        "app-id-regex": {
+          "type": "string",
+          "description": "Matches the app-id of the window with a regular expression."
         }
       },
       "required": []

toml-spec/spec/spec.generated.md

@@ -4022,6 +4022,18 @@ The table has the following fields:
 
   The value of this field should be a string.
 
+- `app-id` (optional):
+
+  Matches the app-id of the window verbatim.
+
+  The value of this field should be a string.
+
+- `app-id-regex` (optional):
+
+  Matches the app-id of the window with a regular expression.
+
+  The value of this field should be a string.
+
 
 <a name="types-WindowMatchExactly"></a>
 ### `WindowMatchExactly`

toml-spec/spec/spec.yaml

@@ -3475,6 +3475,14 @@ WindowMatch:
       kind: string
       required: false
       description: Matches the title of the window with a regular expression.
+    app-id:
+      kind: string
+      required: false
+      description: Matches the app-id of the window verbatim.
+    app-id-regex:
+      kind: string
+      required: false
+      description: Matches the app-id of the window with a regular expression.
 
 
 WindowMatchExactly: