config: add urgency window criteria

jay-config/src/_private.rs

@@ -112,6 +112,7 @@ pub enum WindowCriterionIpc {
     Client(ClientMatcher),
     Floating,
     Visible,
+    Urgent,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq)]

jay-config/src/_private/client.rs

@@ -1659,6 +1659,7 @@ impl ConfigClient {
             WindowCriterion::AppIdRegex(t) => string!(t, AppId, true),
             WindowCriterion::Floating => WindowCriterionIpc::Floating,
             WindowCriterion::Visible => WindowCriterionIpc::Visible,
+            WindowCriterion::Urgent => WindowCriterionIpc::Urgent,
         };
         let res = self.send_with_response(&ClientMessage::CreateWindowMatcher { criterion });
         get_response!(

jay-config/src/window.rs

@@ -248,6 +248,8 @@ pub enum WindowCriterion<'a> {
     Floating,
     /// Matches if the window is visible.
     Visible,
+    /// Matches if the window has the urgency flag set.
+    Urgent,
 }
 
 impl WindowCriterion<'_> {

src/config/handler.rs

@@ -1999,6 +1999,7 @@ impl ConfigProxyHandler {
             }
             WindowCriterionIpc::Floating => mgr.floating(),
             WindowCriterionIpc::Visible => mgr.visible(),
+            WindowCriterionIpc::Urgent => mgr.urgent(),
         };
         let cached = Rc::new(CachedCriterion {
             crit: criterion.clone(),

src/criteria/tlm.rs

@@ -16,6 +16,7 @@ use {
                 tlmm_floating::TlmMatchFloating,
                 tlmm_kind::TlmMatchKind,
                 tlmm_string::{TlmMatchAppId, TlmMatchTitle},
+                tlmm_urgent::TlmMatchUrgent,
                 tlmm_visible::TlmMatchVisible,
             },
         },
@@ -42,6 +43,7 @@ bitflags! {
     TL_CHANGED_APP_ID      = 1 << 3,
     TL_CHANGED_FLOATING    = 1 << 4,
     TL_CHANGED_VISIBLE     = 1 << 5,
+    TL_CHANGED_URGENT      = 1 << 6,
 }
 
 type TlmFixedRootMatcher<T> = FixedRootMatcher<ToplevelData, T>;
@@ -53,6 +55,7 @@ pub struct TlMatcherManager {
     constant: TlmFixedRootMatcher<CritMatchConstant<ToplevelData>>,
     floating: TlmFixedRootMatcher<TlmMatchFloating>,
     visible: TlmFixedRootMatcher<TlmMatchVisible>,
+    urgent: TlmFixedRootMatcher<TlmMatchUrgent>,
     matchers: Rc<RootMatchers>,
 }
 
@@ -105,6 +108,7 @@ impl TlMatcherManager {
             constant: CritMatchConstant::create(&matchers, ids),
             floating: bool!(TlmMatchFloating),
             visible: bool!(TlmMatchVisible),
+            urgent: bool!(TlmMatchUrgent),
             changes: Default::default(),
             leaf_events: Default::default(),
             ids: ids.clone(),
@@ -173,6 +177,7 @@ impl TlMatcherManager {
         conditional!(TL_CHANGED_APP_ID, app_id);
         fixed_conditional!(TL_CHANGED_FLOATING, floating);
         fixed_conditional!(TL_CHANGED_VISIBLE, visible);
+        fixed_conditional!(TL_CHANGED_URGENT, urgent);
         false
     }
 
@@ -241,6 +246,7 @@ impl TlMatcherManager {
         conditional!(TL_CHANGED_APP_ID, app_id);
         fixed_conditional!(TL_CHANGED_FLOATING, floating);
         fixed_conditional!(TL_CHANGED_VISIBLE, visible);
+        fixed_conditional!(TL_CHANGED_URGENT, urgent);
     }
 
     pub fn title(&self, string: CritLiteralOrRegex) -> Rc<TlmUpstreamNode> {
@@ -266,6 +272,10 @@ impl TlMatcherManager {
     pub fn visible(&self) -> Rc<TlmUpstreamNode> {
         self.visible[true].clone()
     }
+
+    pub fn urgent(&self) -> Rc<TlmUpstreamNode> {
+        self.urgent[true].clone()
+    }
 }
 
 impl CritTarget for ToplevelData {

src/criteria/tlm/tlm_matchers.rs

@@ -21,4 +21,5 @@ pub mod tlmm_client;
 pub mod tlmm_floating;
 pub mod tlmm_kind;
 pub mod tlmm_string;
+pub mod tlmm_urgent;
 pub mod tlmm_visible;

src/criteria/tlm/tlm_matchers/tlmm_urgent.rs

@@ -0,0 +1,11 @@
+use crate::{criteria::crit_graph::CritFixedRootCriterion, tree::ToplevelData};
+
+pub struct TlmMatchUrgent(pub bool);
+
+fixed_root_criterion!(TlmMatchUrgent, urgent);
+
+impl CritFixedRootCriterion<ToplevelData> for TlmMatchUrgent {
+    fn matches(&self, data: &ToplevelData) -> bool {
+        data.wants_attention.get()
+    }
+}

src/tree/container.rs

@@ -1152,7 +1152,7 @@ impl ContainerNode {
     fn mod_attention_requests(&self, set: bool) {
         let propagate = self.attention_requests.adj(set);
         if set || propagate {
-            self.toplevel_data.wants_attention.set(set);
+            self.toplevel_data.set_wants_attention(set);
         }
         if propagate {
             if let Some(parent) = self.toplevel_data.parent.get() {

src/tree/toplevel.rs

@@ -5,7 +5,7 @@ use {
             CritDestroyListener, CritMatcherId,
             tlm::{
                 TL_CHANGED_APP_ID, TL_CHANGED_DESTROYED, TL_CHANGED_FLOATING, TL_CHANGED_NEW,
-                TL_CHANGED_TITLE, TL_CHANGED_VISIBLE, TlMatcherChange,
+                TL_CHANGED_TITLE, TL_CHANGED_URGENT, TL_CHANGED_VISIBLE, TlMatcherChange,
             },
         },
         ifs::{
@@ -647,7 +647,7 @@ impl ToplevelData {
         if !self.requested_attention.replace(false) {
             return;
         }
-        self.wants_attention.set(false);
+        self.set_wants_attention(false);
         if let Some(parent) = self.parent.get() {
             parent.cnode_child_attention_request_changed(node, false);
         }
@@ -660,12 +660,18 @@ impl ToplevelData {
         if self.requested_attention.replace(true) {
             return;
         }
-        self.wants_attention.set(true);
+        self.set_wants_attention(true);
         if let Some(parent) = self.parent.get() {
             parent.cnode_child_attention_request_changed(node, true);
         }
     }
 
+    pub fn set_wants_attention(&self, value: bool) {
+        if self.wants_attention.replace(value) != value {
+            self.property_changed(TL_CHANGED_URGENT);
+        }
+    }
+
     pub fn output(&self) -> Rc<OutputNode> {
         match self.output_opt() {
             None => self.state.dummy_output.get().unwrap(),

toml-config/src/config.rs

@@ -261,6 +261,7 @@ pub struct WindowMatch {
     pub app_id_regex: Option<String>,
     pub floating: Option<bool>,
     pub visible: Option<bool>,
+    pub urgent: Option<bool>,
 }
 
 #[derive(Debug, Clone)]

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

@@ -56,7 +56,7 @@ impl Parser for WindowMatchParser<'_> {
                 title,
                 title_regex,
             ),
-            (app_id, app_id_regex, floating, visible),
+            (app_id, app_id_regex, floating, visible, urgent),
         ) = ext.extract((
             (
                 opt(str("name")),
@@ -74,6 +74,7 @@ impl Parser for WindowMatchParser<'_> {
                 opt(str("app-id-regex")),
                 opt(bol("floating")),
                 opt(bol("visible")),
+                opt(bol("urgent")),
             ),
         ))?;
         let mut not = None;
@@ -121,6 +122,7 @@ impl Parser for WindowMatchParser<'_> {
             app_id_regex: app_id_regex.despan_into(),
             floating: floating.despan(),
             visible: visible.despan(),
+            urgent: urgent.despan(),
             types,
             client,
         })

toml-config/src/rules.rs

@@ -260,6 +260,7 @@ impl Rule for WindowRule {
         value!(AppIdRegex, app_id_regex);
         bool!(Floating, floating);
         bool!(Visible, visible);
+        bool!(Urgent, urgent);
         Some(())
     }
 

toml-spec/spec/spec.generated.json

@@ -1803,6 +1803,10 @@
         "visible": {
           "type": "boolean",
           "description": "Matches if the window is/isn't visible."
+        },
+        "urgent": {
+          "type": "boolean",
+          "description": "Matches if the window has/hasn't the urgency flag set."
         }
       },
       "required": []

toml-spec/spec/spec.generated.md

@@ -4046,6 +4046,12 @@ The table has the following fields:
 
   The value of this field should be a boolean.
 
+- `urgent` (optional):
+
+  Matches if the window has/hasn't the urgency flag set.
+
+  The value of this field should be a boolean.
+
 
 <a name="types-WindowMatchExactly"></a>
 ### `WindowMatchExactly`

toml-spec/spec/spec.yaml

@@ -3491,6 +3491,10 @@ WindowMatch:
       kind: boolean
       required: false
       description: Matches if the window is/isn't visible.
+    urgent:
+      kind: boolean
+      required: false
+      description: Matches if the window has/hasn't the urgency flag set.
 
 
 WindowMatchExactly: