Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

.idea/
/target
**/*.rs.bk
Cargo.lock
29 changes: 28 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ pub trait ScancodeSet {
}

/// The set of modifier keys you have on a keyboard.
#[derive(Debug, Default)]
#[derive(Debug, Default, Clone, Eq, PartialEq, Hash)]
pub struct Modifiers {
/// The left shift key is down
pub lshift: bool,
Expand Down Expand Up @@ -505,6 +505,11 @@ where
}
}

/// Get the current key modifier states.
pub const fn get_modifiers(&self) -> &Modifiers {
&self.event_decoder.modifiers
}

/// Change the Ctrl key mapping.
pub fn set_ctrl_handling(&mut self, new_value: HandleControl) {
self.event_decoder.set_ctrl_handling(new_value);
Expand Down Expand Up @@ -1594,6 +1599,28 @@ mod test {

process_keyevents(&mut k, &test_sequence);
}

#[test]
fn test_modifier_state_shift() {
let mut k = Keyboard::new(
ScancodeSet2::new(),
layouts::Uk105Key,
HandleControl::MapLettersToUnicode,
);
assert!(!k.get_modifiers().lshift);

k.process_keyevent(KeyEvent {
code: KeyCode::LShift,
state: KeyState::Down,
});
assert!(k.get_modifiers().lshift);

k.process_keyevent(KeyEvent {
code: KeyCode::LShift,
state: KeyState::Up,
});
assert!(!k.get_modifiers().lshift);
}
}

// ****************************************************************************
Expand Down