blasthavers/minicrossterm
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix control-character parsing in windows (#629)

Browse Source
This commit is contained in:
WindSoilder 2022-02-28 02:19:07 +08:00 committed by GitHub
parent 9bc5cd3527
commit e920d0cfd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/event/sys/windows/parse.rs
View File

@ -97,6 +97,13 @@ fn parse_key_event_record(key_event: &KeyEventRecord) -> Option<KeyEvent> {
let c = character_raw as u8; let c = character_raw as u8;
if c <= b'\x1F' { if c <= b'\x1F' {
character = (c | b'\x40') as char; character = (c | b'\x40') as char;
// if we press something like ctrl-g, we will get `character` with value `G`.
// in this case, convert the `character` to lowercase `g`.
if character.is_ascii_uppercase()
&& !modifiers.contains(KeyModifiers::SHIFT)
{
character.make_ascii_lowercase();
}
} else { } else {
return None; return None;
} }

6
src/style/sys/windows.rs
View File

@ -28,10 +28,9 @@ pub(crate) fn set_foreground_color(fg_color: Color) -> Result<()> {
// Notice that the color values are stored in wAttribute. // Notice that the color values are stored in wAttribute.
// So we need to use bitwise operators to check if the values exists or to get current console colors. // So we need to use bitwise operators to check if the values exists or to get current console colors.
let mut color: u16;
let attrs = csbi.attributes(); let attrs = csbi.attributes();
let bg_color = attrs & 0x0070; let bg_color = attrs & 0x0070;
color = color_value | bg_color; let mut color = color_value | bg_color;
// background intensity is a separate value in attrs, // background intensity is a separate value in attrs,
// wee need to check if this was applied to the current bg color. // wee need to check if this was applied to the current bg color.
@ -53,10 +52,9 @@ pub(crate) fn set_background_color(bg_color: Color) -> Result<()> {
// Notice that the color values are stored in wAttribute. // Notice that the color values are stored in wAttribute.
// So wee need to use bitwise operators to check if the values exists or to get current console colors. // So wee need to use bitwise operators to check if the values exists or to get current console colors.
let mut color: u16;
let attrs = csbi.attributes(); let attrs = csbi.attributes();
let fg_color = attrs & 0x0007; let fg_color = attrs & 0x0007;
color = fg_color | color_value; let mut color = fg_color | color_value;
// Foreground intensity is a separate value in attrs, // Foreground intensity is a separate value in attrs,
// So we need to check if this was applied to the current fg color. // So we need to check if this was applied to the current fg color.