config: add workspace window criteria

src/config/handler.rs

@@ -1994,6 +1994,7 @@ impl ConfigProxyHandler {
                     WindowCriterionStringField::XClass => mgr.class(needle),
                     WindowCriterionStringField::XInstance => mgr.instance(needle),
                     WindowCriterionStringField::XRole => mgr.role(needle),
+                    WindowCriterionStringField::Workspace => mgr.workspace(needle),
                 }
             }
             WindowCriterionIpc::Types(t) => mgr.kind(*t),
@@ -2007,6 +2008,9 @@ impl ConfigProxyHandler {
             WindowCriterionIpc::SeatFocus(seat) => mgr.seat_focus(&*self.get_seat(*seat)?),
             WindowCriterionIpc::Fullscreen => mgr.fullscreen(),
             WindowCriterionIpc::JustMapped => mgr.just_mapped(),
+            WindowCriterionIpc::Workspace(w) => mgr.workspace(CritLiteralOrRegex::Literal(
+                self.get_workspace(*w)?.to_string(),
+            )),
         };
         let cached = Rc::new(CachedCriterion {
             crit: criterion.clone(),

src/criteria/tlm.rs

@@ -20,7 +20,7 @@ use {
                 tlmm_seat_focus::TlmMatchSeatFocus,
                 tlmm_string::{
                     TlmMatchAppId, TlmMatchClass, TlmMatchInstance, TlmMatchRole, TlmMatchTag,
-                    TlmMatchTitle,
+                    TlmMatchTitle, TlmMatchWorkspace,
                 },
                 tlmm_urgent::TlmMatchUrgent,
                 tlmm_visible::TlmMatchVisible,
@@ -57,6 +57,7 @@ bitflags! {
     TL_CHANGED_TAG         = 1 << 10,
     TL_CHANGED_CLASS_INST  = 1 << 11,
     TL_CHANGED_ROLE        = 1 << 12,
+    TL_CHANGED_WORKSPACE   = 1 << 13,
 }
 
 type TlmFixedRootMatcher<T> = FixedRootMatcher<ToplevelData, T>;
@@ -88,6 +89,7 @@ pub struct RootMatchers {
     class: TlmRootMatcherMap<TlmMatchClass>,
     instance: TlmRootMatcherMap<TlmMatchInstance>,
     role: TlmRootMatcherMap<TlmMatchRole>,
+    workspace: TlmRootMatcherMap<TlmMatchWorkspace>,
 }
 
 pub async fn handle_tl_changes(state: Rc<State>) {
@@ -219,6 +221,7 @@ impl TlMatcherManager {
         conditional!(TL_CHANGED_CLASS_INST, class);
         conditional!(TL_CHANGED_CLASS_INST, instance);
         conditional!(TL_CHANGED_ROLE, role);
+        conditional!(TL_CHANGED_WORKSPACE, workspace);
         fixed_conditional!(TL_CHANGED_FLOATING, floating);
         fixed_conditional!(TL_CHANGED_VISIBLE, visible);
         fixed_conditional!(TL_CHANGED_URGENT, urgent);
@@ -295,6 +298,7 @@ impl TlMatcherManager {
         conditional!(TL_CHANGED_CLASS_INST, class);
         conditional!(TL_CHANGED_CLASS_INST, instance);
         conditional!(TL_CHANGED_ROLE, role);
+        conditional!(TL_CHANGED_WORKSPACE, workspace);
         fixed_conditional!(TL_CHANGED_FLOATING, floating);
         fixed_conditional!(TL_CHANGED_VISIBLE, visible);
         fixed_conditional!(TL_CHANGED_URGENT, urgent);
@@ -364,6 +368,10 @@ impl TlMatcherManager {
     pub fn role(&self, string: CritLiteralOrRegex) -> Rc<TlmUpstreamNode> {
         self.root(TlmMatchRole::new(string))
     }
+
+    pub fn workspace(&self, string: CritLiteralOrRegex) -> Rc<TlmUpstreamNode> {
+        self.root(TlmMatchWorkspace::new(string))
+    }
 }
 
 impl CritTarget for ToplevelData {

src/criteria/tlm/tlm_matchers/tlmm_string.rs

@@ -14,6 +14,7 @@ pub type TlmMatchTag = TlmMatchString<TagAccess>;
 pub type TlmMatchClass = TlmMatchString<ClassAccess>;
 pub type TlmMatchInstance = TlmMatchString<InstanceAccess>;
 pub type TlmMatchRole = TlmMatchString<RoleAccess>;
+pub type TlmMatchWorkspace = TlmMatchString<WorkspaceAccess>;
 
 pub struct TitleAccess;
 pub struct AppIdAccess;
@@ -21,6 +22,7 @@ pub struct TagAccess;
 pub struct ClassAccess;
 pub struct InstanceAccess;
 pub struct RoleAccess;
+pub struct WorkspaceAccess;
 
 impl StringAccess<ToplevelData> for TitleAccess {
     fn with_string(data: &ToplevelData, f: impl FnOnce(&str) -> bool) -> bool {
@@ -93,3 +95,16 @@ impl StringAccess<ToplevelData> for RoleAccess {
         &roots.role
     }
 }
+
+impl StringAccess<ToplevelData> for WorkspaceAccess {
+    fn with_string(data: &ToplevelData, f: impl FnOnce(&str) -> bool) -> bool {
+        if let Some(ws) = data.workspace.get() {
+            return f(&ws.name);
+        }
+        false
+    }
+
+    fn nodes(roots: &RootMatchers) -> &TlmRootMatcherMap<TlmMatchString<Self>> {
+        &roots.workspace
+    }
+}

src/tree/toplevel.rs

@@ -6,7 +6,7 @@ use {
             tlm::{
                 TL_CHANGED_APP_ID, TL_CHANGED_DESTROYED, TL_CHANGED_FLOATING,
                 TL_CHANGED_FULLSCREEN, TL_CHANGED_NEW, TL_CHANGED_TITLE, TL_CHANGED_URGENT,
-                TL_CHANGED_VISIBLE, TlMatcherChange,
+                TL_CHANGED_VISIBLE, TL_CHANGED_WORKSPACE, TlMatcherChange,
             },
         },
         ifs::{
@@ -131,6 +131,7 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
         let data = self.tl_data();
         let prev = data.workspace.set(Some(ws.clone()));
         self.tl_set_workspace_ext(ws);
+        self.tl_data().property_changed(TL_CHANGED_WORKSPACE);
         let prev_id = prev.map(|p| p.output.get().id);
         let new_id = Some(ws.output.get().id);
         if prev_id != new_id {