Merge fix

This commit is contained in:
Tobias P.L Wennberg 2025-01-13 10:23:05 +01:00
parent 431d26db8e
commit ec6ddb4a7e

View File

@ -96,21 +96,32 @@ func input_str(env *environment.Env) string {
case 4: // ^D
input = "exit"
goto loop_exit
case 65: // UPP
if history_index > 0 {
history_index--
input = env.History[history_index]
case 27: // UPP
if r, _, _ := reader.ReadRune(); r != 91 {
break
}
case 66: // DOWN
if history_index < len(env.History)-2 {
history_index++
input = env.History[history_index]
} else {
history_index = len(env.History) - 1
history_index = len(env.History)-1
input = ""
if r, _, _ := reader.ReadRune(); r == 65 { // UPP
if history_index > 0 {
history_index--
input = env.History[history_index]
}
}
if r, _, _ := reader.ReadRune(); r != 66 { //DOWN
if history_index < len(env.History)-1 {
history_index++
input = env.History[history_index]
} else {
input = ""
}
}
}
case 67: // LEFT
case 68: // RIGHT
case 127: //packspace
if len(input) > 0 {
input = input[:len(input)-1]
@ -126,7 +137,7 @@ func input_str(env *environment.Env) string {
fmt.Print(" > ")
fmt.Print(input)
}
loop_exit:
loop_exit:
term.Restore(int(std_fd), term_restore)
fmt.Println()
return input