From 6045f8a05b3d212596d6110217c50c1ecde2d66d Mon Sep 17 00:00:00 2001 From: Patryk Laurent Date: Sun, 15 Jan 2023 08:10:55 -0800 Subject: [PATCH] type chars rather than bytes --- services/gam/src/lib.rs | 13 ++++++------- services/shellchat/src/cmds/pddb_cmd.rs | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/services/gam/src/lib.rs b/services/gam/src/lib.rs index 18265b0d4..cee1a732e 100644 --- a/services/gam/src/lib.rs +++ b/services/gam/src/lib.rs @@ -278,20 +278,19 @@ impl Gam { } } - pub fn type_keys(&self, s: &str) -> Result { + pub fn type_chars(&self, s: &str) -> Result { let mut view = s.chars().peekable(); while view.peek().is_some() { let chunk: std::string::String = view.by_ref().take(4).collect(); - let bytes = chunk.as_bytes(); send_message(self.conn, Message::new_scalar(Opcode::KeyboardEvent.to_usize().unwrap(), - bytes[0] as usize, - if bytes.len() > 1 {bytes[1]} else {0} as usize, - if bytes.len() > 2 {bytes[2]} else {0} as usize, - if bytes.len() > 3 {bytes[3]} else {0} as usize + chunk.chars().nth(0).unwrap() as usize, + if chunk.len() > 1 {chunk.chars().nth(1).unwrap()} else {'\u{0000}'} as usize, + if chunk.len() > 2 {chunk.chars().nth(2).unwrap()} else {'\u{0000}'} as usize, + if chunk.len() > 3 {chunk.chars().nth(3).unwrap()} else {'\u{0000}'} as usize ) - ).expect("Couldn't type keys"); + ).expect("Couldn't type chars"); } Ok(true) diff --git a/services/shellchat/src/cmds/pddb_cmd.rs b/services/shellchat/src/cmds/pddb_cmd.rs index 0f64a45e5..e85f569e8 100644 --- a/services/shellchat/src/cmds/pddb_cmd.rs +++ b/services/shellchat/src/cmds/pddb_cmd.rs @@ -180,7 +180,7 @@ impl<'a> ShellCmdApi<'a> for PddbCmd { editcmd.push_str(" "); editcmd.push_str(&s); - match _env.gam.type_keys(&editcmd) { + match _env.gam.type_chars(&editcmd) { Ok(_) => { write!(ret, "Edit the value and press enter:").unwrap() }