feat(keyboard): add numlock configuration

Author: mmstick

cosmic-settings/src/pages/accessibility/magnifier.rs

@@ -8,6 +8,7 @@ use cosmic::{
 };
 use cosmic_comp_config::{ZoomConfig, ZoomMovement};
 use cosmic_config::{ConfigGet, ConfigSet};
+use cosmic_settings_config::{shortcuts, Action, Binding};
 use cosmic_settings_page::{
     self as page,
     section::{self, Section},
@@ -26,6 +27,8 @@ pub struct Page {
     zoom_config: ZoomConfig,
     increment_values: Vec<String>,
     increment_idx: Option<usize>,
+    zoom_in_shortcuts: Vec<Binding>,
+    zoom_out_shortcuts: Vec<Binding>,
 
     wayland_thread: Option<wayland::Sender>,
     magnifier_state: bool,
@@ -56,7 +59,7 @@ impl Default for Page {
         let mut values = HashSet::<u32>::from_iter([25, 50, 100, 150, 200, zoom_config.increment])
             .into_iter()
             .collect::<Vec<_>>();
-        values.sort();
+        values.sort_unstable();
         let increment_values = values
             .into_iter()
             .map(|val| {
@@ -72,16 +75,20 @@ impl Default for Page {
             })
             .collect::<Vec<_>>();
         let increment_idx = increment_values.iter().position(|s| {
-            s.split("%").next().and_then(|val| str::parse(val).ok()) == Some(zoom_config.increment)
+            s.split('%').next().and_then(|val| str::parse(val).ok()) == Some(zoom_config.increment)
         });
 
+        let (zoom_in_shortcuts, zoom_out_shortcuts) = zoom_shortcuts();
+
         Page {
             entity: Entity::default(),
 
             accessibility_config: comp_config,
             zoom_config,
             increment_values,
             increment_idx,
+            zoom_in_shortcuts,
+            zoom_out_shortcuts,
 
             wayland_thread: None,
             magnifier_state: false,
@@ -107,7 +114,7 @@ impl page::Page<crate::pages::Message> for Page {
         sections: &mut SlotMap<section::Entity, page::Section<crate::pages::Message>>,
     ) -> Option<page::Content> {
         Some(vec![
-            sections.insert(magnifier()),
+            sections.insert(magnifier(&self.zoom_in_shortcuts, &self.zoom_out_shortcuts)),
             sections.insert(tip()),
             sections.insert(view_movement()),
         ])
@@ -161,10 +168,36 @@ impl page::Page<crate::pages::Message> for Page {
 
 impl page::AutoBind<crate::pages::Message> for Page {}
 
-pub fn magnifier() -> section::Section<crate::pages::Message> {
+pub fn magnifier(
+    zoom_in: &[Binding],
+    zoom_out: &[Binding],
+) -> section::Section<crate::pages::Message> {
+    let zoom_in = if zoom_in.is_empty() {
+        String::from("zero")
+    } else {
+        zoom_in.iter().fold(String::new(), |mut str, b| {
+            if !str.is_empty() {
+                str += ", ";
+            }
+            b.to_string_in_place(&mut str);
+            str
+        })
+    };
+    let zoom_out = if zoom_out.is_empty() {
+        String::from("zero")
+    } else {
+        zoom_out.iter().fold(String::new(), |mut str, b| {
+            if !str.is_empty() {
+                str += ", ";
+            }
+            b.to_string_in_place(&mut str);
+            str
+        })
+    };
+
     crate::slab!(descriptions {
         magnifier = fl!("magnifier");
-        controls = fl!("magnifier", "controls");
+        controls = fl!("magnifier", "controls", zoom_in = zoom_in, zoom_out = zoom_out);
         increment = fl!("magnifier", "increment");
         signin = fl!("magnifier", "signin");
     });
@@ -337,3 +370,23 @@ impl Page {
         cosmic::iced::Task::none()
     }
 }
+
+fn zoom_shortcuts() -> (Vec<Binding>, Vec<Binding>) {
+    let Some(config) = shortcuts::context().ok() else {
+        return (Vec::new(), Vec::new());
+    };
+    let shortcuts = dbg!(shortcuts::shortcuts(&config));
+
+    let zoom_in = shortcuts
+        .iter()
+        .filter(|&(_binding, action)| *action == Action::ZoomIn)
+        .map(|(binding, _action)| binding.clone())
+        .collect();
+    let zoom_out = shortcuts
+        .iter()
+        .filter(|&(_binding, action)| *action == Action::ZoomOut)
+        .map(|(binding, _action)| binding.clone())
+        .collect();
+
+    (zoom_in, zoom_out)
+}

cosmic-settings/src/pages/input/keyboard/mod.rs

@@ -13,7 +13,7 @@ use cosmic::{
     widget::{self, button, container, icon, radio, row, settings, ListColumn},
     Apply, Element, Task,
 };
-use cosmic_comp_config::XkbConfig;
+use cosmic_comp_config::{KeyboardConfig, NumlockState, XkbConfig};
 use cosmic_settings_page::{self as page, section, Section};
 use itertools::Itertools;
 use slab::Slab;
@@ -58,13 +58,15 @@ pub enum Message {
     ExpandInputSourcePopover(Option<DefaultKey>),
     InputSourceSearch(String),
     OpenSpecialCharacterContext(SpecialKey),
+    OpenNumlockContext,
     ShowInputSourcesContext,
     SourceAdd(DefaultKey),
     SourceContext(SourceContext),
     SpecialCharacterSelect(Option<&'static str>),
     SetRepeatKeysDelay(u32),
     SetRepeatKeysRate(u32),
     SetShowExtendedInputSources(bool),
+    SetNumlockState(NumlockState),
 }
 
 #[derive(Clone, Debug)]
@@ -102,6 +104,7 @@ pub struct Page {
     context: Option<Context>,
     input_source_search: String,
     xkb: XkbConfig,
+    keyboard_config: KeyboardConfig,
     keyboard_layouts: SlotMap<DefaultKey, (Locale, Variant, Description, LayoutSource)>,
     active_layouts: Vec<DefaultKey>,
     expanded_source_popover: Option<DefaultKey>,
@@ -120,6 +123,7 @@ impl Default for Page {
             keyboard_layouts: SlotMap::new(),
             active_layouts: Vec::new(),
             xkb: XkbConfig::default(),
+            keyboard_config: KeyboardConfig::default(),
             input_source_search: String::new(),
             show_extended_input_sources: false,
             config,
@@ -130,6 +134,7 @@ impl Default for Page {
 enum Context {
     ShowInputSourcesContext,
     SpecialCharacter(SpecialKey),
+    NumlockState,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -279,6 +284,7 @@ impl page::Page<crate::pages::Message> for Page {
             sections.insert(special_character_entry()),
             sections.insert(keyboard_shortcuts()),
             sections.insert(keyboard_typing_assist()),
+            sections.insert(keyboard_num_lock()),
         ])
     }
 
@@ -295,13 +301,18 @@ impl page::Page<crate::pages::Message> for Page {
                 .special_character_key_view(special_key)
                 .map(crate::pages::Message::Keyboard)
                 .apply(Some),
+            Some(Context::NumlockState) => self
+                .numlock_state_view()
+                .map(crate::pages::Message::Keyboard)
+                .apply(Some),
 
             None => None,
         }
     }
 
     fn on_enter(&mut self) -> Task<crate::pages::Message> {
         self.xkb = super::get_config(&self.config, "xkb_config");
+        self.keyboard_config = super::get_config(&self.config, "keyboard_config");
         match (
             xkb_data::keyboard_layouts(),
             xkb_data::extra_keyboard_layouts(),
@@ -490,6 +501,14 @@ impl Page {
                 ));
             }
 
+            Message::OpenNumlockContext => {
+                self.context = Some(Context::NumlockState);
+                return cosmic::task::message(crate::app::Message::OpenContextDrawer(
+                    self.entity,
+                    fl!("keyboard-numlock-boot", "set").into(),
+                ));
+            }
+
             Message::SpecialCharacterSelect(id) => {
                 if let Some(Context::SpecialCharacter(special_key)) = self.context {
                     let options = self.xkb.options.as_deref().unwrap_or_default();
@@ -518,6 +537,12 @@ impl Page {
             Message::SetShowExtendedInputSources(value) => {
                 self.show_extended_input_sources = value;
             }
+            Message::SetNumlockState(numlock_state) => {
+                self.keyboard_config.numlock_state = numlock_state;
+                if let Err(err) = self.config.set("keyboard_config", &self.keyboard_config) {
+                    tracing::error!(?err, "Failed to set config 'keyboard_config'");
+                }
+            }
         }
 
         Task::none()
@@ -613,6 +638,32 @@ impl Page {
         cosmic::widget::container(list).padding(24).into()
     }
 
+    fn numlock_state_view(&self) -> cosmic::Element<'_, Message> {
+        let current = self.keyboard_config.numlock_state;
+        let options = [
+            (fl!("keyboard-numlock-boot", "off"), NumlockState::BootOff),
+            (fl!("keyboard-numlock-boot", "on"), NumlockState::BootOn),
+            (
+                fl!("keyboard-numlock-boot", "last-boot"),
+                NumlockState::LastBoot,
+            ),
+        ];
+
+        let mut list = cosmic::widget::list_column();
+        for (desc, state) in options {
+            list = list.add(settings::item_row(vec![radio(
+                cosmic::widget::text(desc),
+                Some(state),
+                Some(Some(current)),
+                |_| Message::SetNumlockState(state),
+            )
+            .width(Length::Fill)
+            .into()]));
+        }
+
+        cosmic::widget::container(list).padding(24).into()
+    }
+
     fn update_xkb_config(&mut self) {
         let result = update_xkb_config(
             &self.config,
@@ -792,6 +843,28 @@ fn keyboard_typing_assist() -> Section<crate::pages::Message> {
         })
 }
 
+fn keyboard_num_lock() -> Section<crate::pages::Message> {
+    let mut descriptions = Slab::new();
+
+    let boot_state = descriptions.insert(fl!("keyboard-numlock-boot", "boot-state"));
+
+    Section::default()
+        .title(fl!("keyboard-numlock-boot"))
+        .descriptions(descriptions)
+        .view::<Page>(move |_binder, _page, section| {
+            let descriptions = &section.descriptions;
+
+            settings::section()
+                .title(&section.title)
+                .add(crate::widget::go_next_item(
+                    &descriptions[boot_state],
+                    Message::OpenNumlockContext,
+                ))
+                .apply(cosmic::Element::from)
+                .map(crate::pages::Message::Keyboard)
+        })
+}
+
 fn update_xkb_config(
     config: &cosmic_config::Config,
     xkb: &mut XkbConfig,

cosmic-settings/src/pages/input/keyboard/shortcuts/move_window.rs

@@ -92,8 +92,6 @@ pub const fn actions() -> &'static [Action] {
         Action::MoveToWorkspace(7),
         Action::MoveToWorkspace(8),
         Action::MoveToWorkspace(9),
-        Action::MoveToPreviousOutput,
-        Action::MoveToNextOutput,
         Action::MoveToOutput(Direction::Down),
         Action::MoveToOutput(Direction::Left),
         Action::MoveToOutput(Direction::Right),

cosmic-settings/src/pages/input/keyboard/shortcuts/nav.rs

@@ -85,8 +85,6 @@ pub const fn actions() -> &'static [Action] {
         Action::PreviousWorkspace,
         Action::NextWorkspace,
         Action::LastWorkspace,
-        Action::PreviousOutput,
-        Action::NextOutput,
         Action::SwitchOutput(Direction::Left),
         Action::SwitchOutput(Direction::Right),
         Action::SwitchOutput(Direction::Up),

i18n/en/cosmic_settings.ftl

@@ -135,10 +135,15 @@ accessibility = Accessibility
     .off = Off
     .unavailable = Unavailable
 magnifier = Magnifier
-    .controls =
-        Or use keyboard shortcuts:
-        Super + = to zoom in,
-        Super + - to zoom out,
+    .controls = Or use these shortcuts: { $zoom_in ->
+             [zero] {""}
+            *[other] {""}
+                {$zoom_in} to zoom in,
+        }{ $zoom_out ->
+             [zero] {""}
+            *[other] {""} 
+                {$zoom_out} to zoom out,
+        }
         Super + scroll with your mouse
     .increment = Zoom increment
     .signin = Start magnifier on sign in
@@ -545,6 +550,13 @@ keyboard-typing-assist = Typing
     .repeat-rate = Repeat rate
     .repeat-delay = Repeat delay
 
+keyboard-numlock-boot = Numlock
+    .boot-state = State on boot
+    .last-boot = Last boot
+    .on = On
+    .off = Off
+    .set = Set numlock boot state
+
 added = Added
 type-to-search = Type to search...
 show-extended-input-sources = Show extended input sources