Implement by-id window addressing in IPC and CLI, fix move-column-to-workspace

This is a JSON-breaking change for the IPC actions that changed from
unit variants to struct variants. Unfortunately, I couldn't find a way
with serde to both preserve a single variant, and make it serialize to
the old value when the new field is None. I don't think anyone is using
these actions from JSON at the moment, so this breaking change is fine.

1 files changed, 32 insertions, 6 deletions

diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index b80cb95c..0064b8e3 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -2303,24 +2303,50 @@ impl<W: LayoutElement> Workspace<W> {
         cancel_resize_for_column(&mut self.interactive_resize, col);
     }
 
-    pub fn set_window_height(&mut self, change: SizeChange) {
+    pub fn set_window_height(&mut self, window: Option<&W::Id>, change: SizeChange) {
         if self.columns.is_empty() {
             return;
         }
 
-        let col = &mut self.columns[self.active_column_idx];
-        col.set_window_height(change, None, true);
+        let (col, tile_idx) = if let Some(window) = window {
+            self.columns
+                .iter_mut()
+                .find_map(|col| {
+                    col.tiles
+                        .iter()
+                        .position(|tile| tile.window().id() == window)
+                        .map(|tile_idx| (col, Some(tile_idx)))
+                })
+                .unwrap()
+        } else {
+            (&mut self.columns[self.active_column_idx], None)
+        };
+
+        col.set_window_height(change, tile_idx, true);
 
         cancel_resize_for_column(&mut self.interactive_resize, col);
     }
 
-    pub fn reset_window_height(&mut self) {
+    pub fn reset_window_height(&mut self, window: Option<&W::Id>) {
         if self.columns.is_empty() {
             return;
         }
 
-        let col = &mut self.columns[self.active_column_idx];
-        col.reset_window_height(None, true);
+        let (col, tile_idx) = if let Some(window) = window {
+            self.columns
+                .iter_mut()
+                .find_map(|col| {
+                    col.tiles
+                        .iter()
+                        .position(|tile| tile.window().id() == window)
+                        .map(|tile_idx| (col, Some(tile_idx)))
+                })
+                .unwrap()
+        } else {
+            (&mut self.columns[self.active_column_idx], None)
+        };
+
+        col.reset_window_height(tile_idx, true);
 
         cancel_resize_for_column(&mut self.interactive_resize, col);
     }