Skip to content

Add toggle for Shift+CapsLock behavior and use checkmarks in tray menu #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qystishere wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add toggle for Shift+CapsLock behavior and use checkmarks in tray menu #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef9ce65
feat: add default CapsLock behaviour toggle
qystishere Jun 4, 2025
24931d5
refactor: simplify menu item handling and improve label management
qystishere Jun 4, 2025
0cc28dd
refactor: replace enums with constants for menu item labels and add a…
qystishere Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pub struct AppState {
_is_previous_mode: RwLock<bool>,
_prev_layout: RwLock<Option<HKL>>,
_keep_lock: RwLock<bool>,
_default_capslock_behaviour: RwLock<bool>,
}

impl AppState {
Expand All @@ -25,6 +26,7 @@ impl AppState {
_is_previous_mode: RwLock::new(args.get(1).map_or(false, |mode| mode == "--previous")),
_prev_layout: RwLock::new(None),
_keep_lock: RwLock::new(false),
_default_capslock_behaviour: RwLock::new(true),
}
}

Expand Down Expand Up @@ -95,6 +97,30 @@ impl AppState {

self.is_previous_mode()
}
fn is_default_capslock_behaviour_enabled(&self) -> Result<bool, String> {
let is_enabled = *self
._default_capslock_behaviour
.read()
.map_err(|e| format!("Failed to read `default_capslock_behaviour`: {}", e))?;

Ok(is_enabled)
}

fn toggle_default_capslock_behaviour(&self) -> Result<bool, String> {
let mut is_enabled = self
._default_capslock_behaviour
.write()
.map_err(|e| format!("Failed to write `default_capslock_behaviour`: {}", e))?;
let mut _keep_lock = self
._keep_lock
.write()
.map_err(|e| format!("Failed to write `keep_lock`: {}", e))?;

*is_enabled = !*is_enabled;
drop(is_enabled);

self.is_default_capslock_behaviour_enabled()
}
}

pub static APP_STATE: LazyLock<AppState> = LazyLock::new(|| AppState::new(env::args().collect()));
Expand Down
120 changes: 70 additions & 50 deletions src/switch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,32 @@ fn imitate_keyboard_layout_change() {
}
}

fn toggle_capslock() {
let input = INPUT {
r#type: INPUT_KEYBOARD,
Anonymous: INPUT_0 {
ki: KEYBDINPUT {
wVk: VIRTUAL_KEY(VK_CAPITAL.0),
wScan: 0,
dwFlags: KEYEVENTF_EXTENDEDKEY,
time: 0,
dwExtraInfo: 0,
},
},
};

let result = unsafe {
SendInput(
&[input],
i32::try_from(mem::size_of::<INPUT>()).expect("Converting sizeof Input Failed"),
)
};

if result == 0 {
panic!("SendInput failed");
}
}

unsafe extern "system" fn keyboard_hook_proc(code: i32, wparam: WPARAM, lparam: LPARAM) -> LRESULT {
match APP_STATE.is_paused() {
Ok(is_paused) => {
Expand All @@ -88,74 +114,68 @@ unsafe extern "system" fn keyboard_hook_proc(code: i32, wparam: WPARAM, lparam:

if code >= 0 {
let kb_struct = &*(lparam.0 as *const KBDLLHOOKSTRUCT);

if kb_struct.vkCode == u32::from(VK_CAPITAL.0) {
if wparam.0 == WM_KEYDOWN as usize {
let shift_state = GetAsyncKeyState(i32::from(VK_SHIFT.0));
if (shift_state as i16) < 0 {
// shift is pressed
let input = INPUT {
r#type: INPUT_KEYBOARD,
Anonymous: INPUT_0 {
ki: KEYBDINPUT {
wVk: VIRTUAL_KEY(VK_CAPITAL.0),
wScan: 0,
dwFlags: KEYEVENTF_EXTENDEDKEY,
time: 0,
dwExtraInfo: 0,
},
},
};
let cb_size = i32::try_from(mem::size_of::<INPUT>());
match cb_size {
Ok(cb_size) => {
SendInput(&[input], cb_size);
}
Err(_) => panic!("SendInput failed"),
let is_default_behaviour_enabled = APP_STATE
.is_default_capslock_behaviour_enabled()
.unwrap_or_else(|e| {
eprintln!("Error checking default capslock behaviour setting: {}", e);
true
});

if is_default_behaviour_enabled {
toggle_capslock();
}
}

let curr_layout = get_foreground_layout();
let is_prev_mode = APP_STATE.is_previous_mode().unwrap_or_else(|e| {
eprintln!("Error: {e}");
false
});

if !is_prev_mode {
imitate_keyboard_layout_change();
} else {
let curr_layout = get_foreground_layout();
let is_prev_mode = APP_STATE.is_previous_mode().unwrap_or_else(|e| {
let previous_layout = APP_STATE.prev_layout().unwrap_or_else(|e| {
eprintln!("Error: {e}");
false
None
});

if !is_prev_mode {
imitate_keyboard_layout_change();
} else {
let previous_layout = APP_STATE.prev_layout().unwrap_or_else(|e| {
eprintln!("Error: {e}");
None
});
match previous_layout {
Some(prev_layout) => {
if curr_layout == prev_layout {
imitate_keyboard_layout_change();
} else {
let result = change_keyboard_layout(&prev_layout);
// In case of success
if result.0 == 0 {
match APP_STATE.set_prev_layout(Some(curr_layout)) {
Ok(_) => {}
Err(err) => {
eprintln!("Didn't manage to set previous layout to state. Error: {}", err)
}
match previous_layout {
Some(prev_layout) => {
if curr_layout == prev_layout {
imitate_keyboard_layout_change();
} else {
let result = change_keyboard_layout(&prev_layout);
// In case of success
if result.0 == 0 {
match APP_STATE.set_prev_layout(Some(curr_layout)) {
Ok(_) => {}
Err(err) => {
eprintln!("Didn't manage to set previous layout to state. Error: {}", err)
}
}
}
}
None => {
match APP_STATE.set_prev_layout(Some(curr_layout)) {
Ok(_) => {}
Err(err) => {
eprintln!("Didn't manage to set previous layout to state. Error: {}", err)
}
}
None => {
match APP_STATE.set_prev_layout(Some(curr_layout)) {
Ok(_) => {}
Err(err) => {
eprintln!(
"Didn't manage to set previous layout to state. Error: {}",
err
)
}
imitate_keyboard_layout_change();
}
imitate_keyboard_layout_change();
}
}
}

return LRESULT(1);
}
}
Expand Down
Loading