kev/gosmartkeyboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handle special characters

Browse Source
This commit is contained in:
Kevin F 2023-01-22 19:31:21 -06:00
parent 027a62571f
commit 576e70a989
1 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Streaming.md
View File

@ -14,8 +14,6 @@ To specify xdotool usage, the client should send a message with the format `{kb_
func clientConnected(w http.ResponseWriter, r *http.Request) { func clientConnected(w http.ResponseWriter, r *http.Request) {
keyboard, err := sendkeys.NewKBWrapWithOptions(sendkeys.Noisy) keyboard, err := sendkeys.NewKBWrapWithOptions(sendkeys.Noisy)
// regex if string has characters we need to convert to key presses
characterRegex, _ := regexp.Compile(`[^\x08]\x08|\t|\n`)
if err != nil { if err != nil {
panic(err) panic(err)
@ -63,14 +61,23 @@ func clientConnected(w http.ResponseWriter, r *http.Request) {
# Sending the keys # Sending the keys
Sending the keys is a bit tricky as we need to manually convert backspace, tab, and enter. Sending the keys is a bit tricky as we need to manually convert backspace, tab, enter and modifier keys.
``` go ``` go
--- send keys to system --- send keys to system
// regex if string has characters we need to convert to key presses
characterRegex, _ := regexp.Compile(`[^\x08]\x08|\t|\n`)
doXDoTool := func(command string, keys string)(err error) { doXDoTool := func(command string, keys string)(err error) {
cmd := exec.Command("xdotool", command, keys) var cmd *exec.Cmd
if command == "type" {
cmd = exec.Command("xdotool", command, "--delay", "25", keys)
} else {
cmd = exec.Command("xdotool", command, keys)
}
return cmd.Run() return cmd.Run()
} }
@ -94,33 +101,43 @@ if strings.HasPrefix(message_string, "{kb_cmd:xdotool}:") {
doXDoTool("type", charString) doXDoTool("type", charString)
continue continue
} }
// key is required for special characters
err = doXDoTool("key", charString) err = doXDoTool("key", charString)
continue
} }
continue continue
} else {
doXDoTool("type", message_string)
} }
doXDoTool("type", message_string)
continue continue
} }
for _, character := range message_string { if characterRegex.MatchString(message_string) {
charString := string(character) for _, character := range message_string {
if charString == "\n" { charString := string(character)
keyboard.Enter() if charString == "\n" {
keyboard.Enter()
continue
}
if charString == "\t" {
keyboard.Tab()
continue
}
if charString == "\b" {
keyboard.BackSpace()
continue
}
err = keyboard.Type(charString)
if err != nil {
log.Println("type:", err)
}
continue continue
} }
if charString == "\t" { continue
keyboard.Tab() }
continue err = keyboard.Type(message_string)
} if err != nil {
if charString == "\b" { log.Println("type:", err)
keyboard.BackSpace()
continue
}
err = keyboard.Type(charString)
if err != nil {
log.Println("type:", err)
}
} }
--- ---
``` ```