x11: include wm_instance

watchers/src/report_client.rs

@@ -94,6 +94,15 @@ impl ReportClient {
     }
 
     pub async fn send_active_window(&self, app_id: &str, title: &str) -> anyhow::Result<()> {
+        self.send_active_window_with_instance(app_id, title, None).await
+    }
+
+    pub async fn send_active_window_with_instance(
+        &self,
+        app_id: &str,
+        title: &str,
+        wm_instance: Option<&str>,
+    ) -> anyhow::Result<()> {
         let mut data = Map::new();
 
         let replacement = self.config.window_data_replacement(app_id, title);
@@ -116,6 +125,11 @@ impl ReportClient {
         );
         data.insert("app".to_string(), Value::String(inserted_app_id));
         data.insert("title".to_string(), Value::String(inserted_title));
+
+        if let Some(instance) = wm_instance {
+            data.insert("wm_instance".to_string(), Value::String(instance.to_string()));
+        }
+
         let event = AwEvent {
             id: None,
             timestamp: Utc::now(),

watchers/src/watchers/x11_connection.rs

@@ -9,6 +9,7 @@ use x11rb::rust_connection::RustConnection;
 pub struct WindowData {
     pub title: String,
     pub app_id: String,
+    pub wm_instance: String,
 }
 
 pub struct X11Client {
@@ -86,10 +87,12 @@ impl X11Client {
             )?;
 
             let title = str::from_utf8(&name.value).with_context(|| "Invalid title UTF")?;
+            let (instance, class) = parse_wm_class(&class)?;
 
             Ok(WindowData {
                 title: title.to_string(),
-                app_id: parse_wm_class(&class)?.to_string(),
+                app_id: class,
+                wm_instance: instance,
             })
         })
     }
@@ -149,21 +152,26 @@ impl X11Client {
     }
 }
 
-fn parse_wm_class(property: &GetPropertyReply) -> anyhow::Result<&str> {
+fn parse_wm_class(property: &GetPropertyReply) -> anyhow::Result<(String, String)> {
     if property.format != 8 {
         bail!("Malformed property: wrong format");
     }
     let value = &property.value;
     // The property should contain two null-terminated strings. Find them.
     if let Some(middle) = value.iter().position(|&b| b == 0) {
-        let (_, class) = value.split_at(middle);
+        let (instance, class) = value.split_at(middle);
-        // Skip the null byte at the beginning
+        // Remove the null byte at the end of the instance
+        let instance = &instance[..instance.len()];
+        // Skip the null byte at the beginning of the class
         let mut class = &class[1..];
         // Remove the last null byte from the class, if it is there.
         if class.last() == Some(&0) {
             class = &class[..class.len() - 1];
         }
-        Ok(std::str::from_utf8(class)?)
+        Ok((
+            std::str::from_utf8(instance)?.to_string(),
+            std::str::from_utf8(class)?.to_string(),
+        ))
     } else {
         bail!("Missing null byte")
     }

watchers/src/watchers/x11_window.rs

@@ -6,25 +6,27 @@ use std::sync::Arc;
 
 pub struct WindowWatcher {
     client: X11Client,
-    last_title: String,
     last_app_id: String,
+    last_title: String,
+    last_wm_instance: String,
 }
 
 impl WindowWatcher {
     async fn send_active_window(&mut self, client: &ReportClient) -> anyhow::Result<()> {
         let data = self.client.active_window_data()?;
 
-        if data.app_id != self.last_app_id || data.title != self.last_title {
+        if data.app_id != self.last_app_id || data.title != self.last_title || data.wm_instance != self.last_wm_instance {
             debug!(
-                r#"Changed window app_id="{}", title="{}""#,
+                r#"Changed window app_id="{}", title="{}", wm_instance="{}""#,
-                data.app_id, data.title
+                data.app_id, data.title, data.wm_instance
             );
-            self.last_app_id = data.app_id;
+            self.last_app_id = data.app_id.clone();
-            self.last_title = data.title;
+            self.last_title = data.title.clone();
+            self.last_wm_instance = data.wm_instance.clone();
         }
 
         client
-            .send_active_window(&self.last_app_id, &self.last_title)
+            .send_active_window_with_instance(&self.last_app_id, &self.last_title, Some(&self.last_wm_instance))
             .await
             .with_context(|| "Failed to send heartbeat for active window")
     }
@@ -40,6 +42,7 @@ impl Watcher for WindowWatcher {
             client,
             last_title: String::new(),
             last_app_id: String::new(),
+            last_wm_instance: String::new(),
         })
     }