From b0b55522908c641f3502c39b851e066c0386842a Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 25 Apr 2021 14:08:16 -0400 Subject: [PATCH] auto-fix monitor tags Signed-off-by: Christine Dodrill --- src/bin/nanpad.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/bin/nanpad.rs b/src/bin/nanpad.rs index cc8a627..829eb5a 100644 --- a/src/bin/nanpad.rs +++ b/src/bin/nanpad.rs @@ -103,7 +103,7 @@ pub async fn main() -> Result<(), Box> { output, number, ws_name ); - let mut sock = tokio_i3ipc::I3::connect().await.unwrap(); + let mut sock = I3::connect().await.unwrap(); sock.run_command(format!("move container to workspace {}", ws_name)) .await .unwrap(); @@ -129,7 +129,7 @@ pub async fn main() -> Result<(), Box> { output, number, ws_name ); - let mut sock = tokio_i3ipc::I3::connect().await.unwrap(); + let mut sock = I3::connect().await.unwrap(); sock.run_command(format!("workspace {}", ws_name)) .await .unwrap(); @@ -140,10 +140,16 @@ pub async fn main() -> Result<(), Box> { }); let mut display_bases: HashMap = HashMap::new(); - let mut conn = I3::connect().await?; + let mut sock = I3::connect().await?; - for (i, output) in conn.get_outputs().await?.into_iter().enumerate() { - display_bases.insert(output.name, i as u32 * 10); + for (i, output) in sock.get_outputs().await?.into_iter().enumerate() { + let offset: u32 = i as u32 * 10; + sock.run_command(format!("focus output {}", output.name)) + .await?; + display_bases.insert(output.name, offset); + + let ws_name = make_workspace_name(offset + 1); + sock.run_command(format!("workspace {}", ws_name)).await?; } debug!("{:?}", display_bases);