leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make numlock state on boot configurable

Browse source 
Make numlock state on boot configurable

This will expose 3 settings for numlock behavior:
1. Numlock is off on boot (this is the current default behavior)
2. Numlock is on on boot
3. Numlock will restore the state from the last boot

Fixes #369

* Address comments:

Get keyboard after create_seat called rather than returning from
create_seat.
Use constants rather than magic numbers for keypress.
Only save updated modifier state after keypresses are handled/skipped.

* Remove unused import, fold other into existing use block.
This commit is contained in:
Paul Daniel Faria 2025-02-12 05:35:22 -08:00 • committed by GitHub
parent ec1026d9b9
commit f1f9d205be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 133 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/backend/mod.rs
View file

@ -1,8 +1,11 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use anyhow::{Context, Result};
use anyhow::{anyhow, Context, Result};
use cosmic_comp_config::NumlockState;
use smithay::backend::input::{self as smithay_input};
use smithay::reexports::{calloop::EventLoop, wayland_server::DisplayHandle};
use smithay::utils::SERIAL_COUNTER;
use tracing::{info, warn};
pub mod render;
@ -58,6 +61,11 @@ pub fn init_backend_auto(
&state.common.config,
"seat-0".into(),
);
let keyboard = initial_seat
.get_keyboard()
.ok_or_else(|| anyhow!("`shell::create_seat` did not setup keyboard"))?;
state
.common
.shell
@ -66,6 +74,44 @@ pub fn init_backend_auto(
.seats
.add_seat(initial_seat);
let desired_numlock = state
.common
.config
.cosmic_conf
.keyboard_config
.numlock_state;
// Restore numlock state based on config.
let toggle_numlock = match desired_numlock {
NumlockState::BootOff => keyboard.modifier_state().num_lock,
NumlockState::BootOn => !keyboard.modifier_state().num_lock,
NumlockState::LastBoot => {
keyboard.modifier_state().num_lock
!= state.common.config.dynamic_conf.numlock().last_state
}
};
// If we're enabling numlock...
if toggle_numlock {
/// Linux scancode for numlock key.
const NUMLOCK_SCANCODE: u32 = 69;
/// Offset used to convert Linux scancode to X11 keycode.
const X11_KEYCODE_OFFSET: u32 = 8;
let mut input = |key_state| {
let time = state.common.clock.now().as_millis();
let _ = keyboard.input(
state,
smithay_input::Keycode::new(NUMLOCK_SCANCODE + X11_KEYCODE_OFFSET),
key_state,
SERIAL_COUNTER.next_serial(),
time,
|_, _, _| smithay::input::keyboard::FilterResult::<()>::Forward,
);
};
// Press and release the numlock key to update modifiers.
input(smithay_input::KeyState::Pressed);
input(smithay_input::KeyState::Released);
}
{
{
state