feat: anchor point for working set

src/overlays/anchor.rs

@@ -0,0 +1,31 @@
+use glam::Vec3A;
+use once_cell::sync::Lazy;
+use std::sync::Arc;
+
+use crate::backend::overlay::{OverlayData, OverlayState};
+use crate::config::{load_known_yaml, ConfigType};
+use crate::gui::modular::{modular_canvas, ModularUiConfig};
+use crate::state::AppState;
+
+pub static ANCHOR_NAME: Lazy<Arc<str>> = Lazy::new(|| Arc::from("anchor"));
+
+pub fn create_anchor<O>(state: &AppState) -> anyhow::Result<OverlayData<O>>
+where
+    O: Default,
+{
+    let config = load_known_yaml::<ModularUiConfig>(ConfigType::Anchor);
+
+    Ok(OverlayData {
+        state: OverlayState {
+            name: ANCHOR_NAME.clone(),
+            want_visible: false,
+            interactable: false,
+            grabbable: false,
+            spawn_scale: config.width,
+            spawn_point: Vec3A::NEG_Z * 0.5,
+            ..Default::default()
+        },
+        backend: Box::new(modular_canvas(&config.size, &config.elements, state)?),
+        ..Default::default()
+    })
+}

src/overlays/keyboard.rs

@@ -85,12 +85,12 @@ where
                         log::error!("Keyboard: EXEC args empty for {}", key);
                         continue;
                     }
+                    let mut iter = exec_args.iter().cloned();
                     maybe_state = Some(KeyButtonData::Exec {
-                        program: exec_args
-                            .first()
-                            .unwrap() // safe because we checked is_empty
-                            .clone(),
-                        args: exec_args.iter().skip(1).cloned().collect(),
+                        program: iter.next().unwrap(),
+                        args: iter.by_ref().take_while(|arg| arg[..] != *"null").collect(),
+                        release_program: iter.next(),
+                        release_args: iter.collect(),
                     });
                 } else {
                     log::error!("Unknown key: {}", key);
@@ -124,7 +124,7 @@ where
             recenter: true,
             interactable: true,
             spawn_scale: width,
-            spawn_point: vec3a(0., -0.5, -1.),
+            spawn_point: vec3a(0., -0.5, 0.),
             interaction_transform,
             ..Default::default()
         },
@@ -163,7 +163,7 @@ fn key_press(
                 app.hid_provider.send_key(*vk as _, *press);
             }
         }
-        Some(KeyButtonData::Exec { program, args }) => {
+        Some(KeyButtonData::Exec { program, args, .. }) => {
             // Reap previous processes
             data.processes
                 .retain_mut(|child| !matches!(child.try_wait(), Ok(Some(_))));
@@ -200,6 +200,21 @@ fn key_release(
                 app.hid_provider.set_modifiers(data.modifiers);
             }
         }
+        Some(KeyButtonData::Exec {
+            release_program,
+            release_args,
+            ..
+        }) => {
+            // Reap previous processes
+            data.processes
+                .retain_mut(|child| !matches!(child.try_wait(), Ok(Some(_))));
+
+            if let Some(program) = release_program {
+                if let Ok(child) = Command::new(program).args(release_args).spawn() {
+                    data.processes.push(child);
+                }
+            }
+        }
         _ => {}
     }
 }
@@ -240,10 +255,23 @@ impl KeyboardData {
 }
 
 enum KeyButtonData {
-    Key { vk: VirtualKey, pressed: bool },
-    Modifier { modifier: KeyModifier, sticky: bool },
-    Macro { verbs: Vec<(VirtualKey, bool)> },
-    Exec { program: String, args: Vec<String> },
+    Key {
+        vk: VirtualKey,
+        pressed: bool,
+    },
+    Modifier {
+        modifier: KeyModifier,
+        sticky: bool,
+    },
+    Macro {
+        verbs: Vec<(VirtualKey, bool)>,
+    },
+    Exec {
+        program: String,
+        args: Vec<String>,
+        release_program: Option<String>,
+        release_args: Vec<String>,
+    },
 }
 
 static LAYOUT: Lazy<Layout> = Lazy::new(Layout::load_from_disk);

src/overlays/mirror.rs

@@ -132,7 +132,7 @@ pub fn new_mirror(
         show_hide,
         want_visible: true,
         spawn_scale: 0.5 * session.config.desktop_view_scale,
-        spawn_point: vec3a(0., 0.5, -0.5),
+        spawn_point: vec3a(0., 0.5, 0.5),
         ..Default::default()
     };
     let backend = Box::new(SplitOverlayBackend {

src/overlays/mod.rs

@@ -1,3 +1,4 @@
+pub mod anchor;
 pub mod custom;
 pub mod keyboard;
 #[cfg(feature = "wayland")]

src/overlays/screen.rs

@@ -622,7 +622,7 @@ fn create_screen_state(
         recenter: true,
         interactable: true,
         spawn_scale: 1.5 * session.config.desktop_view_scale,
-        spawn_point: vec3a(0., 0.5, -1.),
+        spawn_point: vec3a(0., 0.5, 0.),
         spawn_rotation: Quat::from_axis_angle(Vec3::Z, angle),
         interaction_transform,
         ..Default::default()