Merge branch 'dev'

Author: paperbenni

src/bin/ctl/commands.rs

@@ -99,6 +99,9 @@ pub enum KeyboardAction {
     Remove {
         layout: String,
     },
+    SwapEscape {
+        enabled: bool,
+    },
 }
 
 #[derive(Debug, Clone, Subcommand)]
@@ -211,6 +214,11 @@ pub enum InputAction {
         #[arg(short, long)]
         identifier: Option<String>,
     },
+    LeftHanded {
+        state: String,
+        #[arg(short, long)]
+        identifier: Option<String>,
+    },
 }
 
 #[derive(Debug, Clone, Subcommand)]
@@ -442,6 +450,7 @@ pub fn command_to_ipc(command: CommandKind) -> IpcCommand {
                     KeyboardCommand::Add(KeyboardLayout::from(arg))
                 }
                 KeyboardAction::Remove { layout } => KeyboardCommand::Remove(layout),
+                KeyboardAction::SwapEscape { enabled } => KeyboardCommand::SwapEscape(enabled),
             };
             IpcCommand::Keyboard(cmd)
         }
@@ -506,6 +515,10 @@ pub fn command_to_ipc(command: CommandKind) -> IpcCommand {
                 InputAction::ScrollFactor { identifier, value } => {
                     InputCommand::ScrollFactor { identifier, value }
                 }
+                InputAction::LeftHanded { identifier, state } => InputCommand::LeftHanded {
+                    identifier,
+                    enabled: state == "enabled" || state == "on",
+                },
             };
             IpcCommand::Input(cmd)
         }

src/config/config_toml.rs

@@ -162,6 +162,7 @@ pub struct InputConfig {
     pub accel_profile: Option<AccelProfile>,
     pub pointer_accel: Option<f64>,
     pub scroll_factor: Option<f64>,
+    pub left_handed: Option<ToggleSetting>,
 }
 
 impl Default for InputConfig {
@@ -172,10 +173,22 @@ impl Default for InputConfig {
             accel_profile: None,
             pointer_accel: None,
             scroll_factor: None,
+            left_handed: None,
         }
     }
 }
 
+impl std::fmt::Display for InputConfig {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "tap: {:?}", self.tap)?;
+        writeln!(f, "natural_scroll: {:?}", self.natural_scroll)?;
+        writeln!(f, "accel_profile: {:?}", self.accel_profile)?;
+        writeln!(f, "pointer_accel: {:?}", self.pointer_accel)?;
+        writeln!(f, "scroll_factor: {:?}", self.scroll_factor)?;
+        write!(f, "left_handed: {:?}", self.left_handed)
+    }
+}
+
 /// Keyboard (XKB) layout configuration from the TOML `[keyboard]` section.
 #[derive(Debug, Deserialize, Clone, Serialize, Default)]
 #[serde(default)]

src/ipc/input.rs

@@ -34,12 +34,7 @@ pub fn handle_input_command(wm: &mut Wm, cmd: InputCommand) -> Response {
             }
             let info: Vec<String> = entries
                 .iter()
-                .map(|(id, cfg)| {
-                    format!(
-                        "[{}]\ntap: {:?}\nnatural_scroll: {:?}\naccel_profile: {:?}\npointer_accel: {:?}\nscroll_factor: {:?}",
-                        id, cfg.tap, cfg.natural_scroll, cfg.accel_profile, cfg.pointer_accel, cfg.scroll_factor,
-                    )
-                })
+                .map(|(id, cfg)| format!("[{}]\n{}", id, cfg))
                 .collect();
             return Response::Message(info.join("\n\n"));
         }
@@ -103,6 +98,18 @@ pub fn handle_input_command(wm: &mut Wm, cmd: InputCommand) -> Response {
             let cfg = inputs.entry(identifier).or_default();
             cfg.scroll_factor = Some(value);
         }
+        InputCommand::LeftHanded {
+            identifier,
+            enabled,
+        } => {
+            let identifier = identifier.unwrap_or_else(|| "*".to_string());
+            let cfg = inputs.entry(identifier).or_default();
+            cfg.left_handed = Some(if enabled {
+                ToggleSetting::Enabled
+            } else {
+                ToggleSetting::Disabled
+            });
+        }
     }
     wm.g.dirty.input_config = true;
     Response::ok()

src/ipc/keyboard.rs

@@ -63,5 +63,9 @@ pub fn handle_keyboard_command(wm: &mut Wm, cmd: KeyboardCommand) -> Response {
                 Err(e) => Response::err(e),
             }
         }
+        KeyboardCommand::SwapEscape(enabled) => {
+            keyboard_layout::set_swapescape(&mut ctx, enabled);
+            Response::ok()
+        }
     }
 }

src/ipc/scratchpad.rs

@@ -1,6 +1,6 @@
 use crate::floating::scratchpad::{
-    collect_scratchpad_info, scratchpad_hide_all, scratchpad_hide_name, scratchpad_make, scratchpad_show_all,
-    scratchpad_show_name, scratchpad_toggle, scratchpad_unmake,
+    collect_scratchpad_info, scratchpad_hide_all, scratchpad_hide_name, scratchpad_make,
+    scratchpad_show_all, scratchpad_show_name, scratchpad_toggle, scratchpad_unmake,
 };
 use crate::ipc_types::{Response, ScratchpadCommand};
 use crate::types::WindowId;

src/ipc_types.rs

@@ -228,6 +228,7 @@ pub enum KeyboardCommand {
     Set(Vec<KeyboardLayout>),
     Add(KeyboardLayout),
     Remove(String),
+    SwapEscape(bool),
 }
 
 #[derive(Debug, Clone, Decode, Encode, serde::Serialize, serde::Deserialize)]
@@ -285,6 +286,10 @@ pub enum InputCommand {
         identifier: Option<String>,
         value: f64,
     },
+    LeftHanded {
+        identifier: Option<String>,
+        enabled: bool,
+    },
 }
 
 #[derive(Debug, Clone, Decode, Encode, serde::Serialize, serde::Deserialize)]

src/keyboard_layout.rs

@@ -166,6 +166,14 @@ pub fn set_keyboard_layouts(ctx: &mut WmCtx, layouts: Vec<KeyboardLayout>) {
     }
 }
 
+pub fn set_swapescape(ctx: &mut WmCtx, enabled: bool) {
+    let current = ctx.core().globals().keyboard_layout.current;
+    ctx.core_mut().globals_mut().keyboard_layout.swapescape = enabled;
+    if !ctx.core().globals().keyboard_layout.layouts.is_empty() {
+        set_keyboard_layout(ctx, current);
+    }
+}
+
 /// Apply the initially configured keyboard layout (called during startup).
 pub fn init_keyboard_layout(ctx: &mut WmCtx) {
     if !ctx.core().globals().keyboard_layout.layouts.is_empty() {

src/wayland/input/drm.rs

@@ -125,6 +125,10 @@ pub fn configure_device(
         let _ = device.config_accel_set_speed(pointer_accel.clamp(-1.0, 1.0));
     }
 
+    if let Some(left_handed) = config.left_handed {
+        let _ = device.config_left_handed_set(left_handed == ToggleSetting::Enabled);
+    }
+
     // scroll_factor is applied at the compositor level in the axis handler,
     // not via libinput. Nothing to do here for it.
 }