mirror of
https://github.com/golang/term.git
synced 2026-01-29 07:02:06 +03:00
f867b7695b
With this change the arrow keys work with Windows 11 Terminal
After verifying https://github.com/containerd/console did work fine, unlike x/term, it's because they have:
https://github.com/containerd/console/blob/v1.0.4/console_windows.go#L194
using the same flag fixed x/term for my program
Small e2e test reproducing the issue and showing it being fixed can be ran using
go run fortio.org/terminal/example@v0.6.0 # has the fix (or @latest)
go run fortio.org/terminal/example@v0.5.1 -history .history # does not have working arrow keys/this fix
Fixes golang/go#68830
Change-Id: If20addd054c76b889a52f933695467812be72306
GitHub-Last-Rev: 68e3ca0e19
GitHub-Pull-Request: golang/term#17
Reviewed-on: https://go-review.googlesource.com/c/term/+/603960
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Commit-Queue: Ian Lance Taylor <iant@google.com>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
81 lines
2.1 KiB
Go
81 lines
2.1 KiB
Go
// Copyright 2019 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package term
|
|
|
|
import (
|
|
"os"
|
|
|
|
"golang.org/x/sys/windows"
|
|
)
|
|
|
|
type state struct {
|
|
mode uint32
|
|
}
|
|
|
|
func isTerminal(fd int) bool {
|
|
var st uint32
|
|
err := windows.GetConsoleMode(windows.Handle(fd), &st)
|
|
return err == nil
|
|
}
|
|
|
|
func makeRaw(fd int) (*State, error) {
|
|
var st uint32
|
|
if err := windows.GetConsoleMode(windows.Handle(fd), &st); err != nil {
|
|
return nil, err
|
|
}
|
|
raw := st &^ (windows.ENABLE_ECHO_INPUT | windows.ENABLE_PROCESSED_INPUT | windows.ENABLE_LINE_INPUT | windows.ENABLE_PROCESSED_OUTPUT)
|
|
raw |= windows.ENABLE_VIRTUAL_TERMINAL_INPUT
|
|
if err := windows.SetConsoleMode(windows.Handle(fd), raw); err != nil {
|
|
return nil, err
|
|
}
|
|
return &State{state{st}}, nil
|
|
}
|
|
|
|
func getState(fd int) (*State, error) {
|
|
var st uint32
|
|
if err := windows.GetConsoleMode(windows.Handle(fd), &st); err != nil {
|
|
return nil, err
|
|
}
|
|
return &State{state{st}}, nil
|
|
}
|
|
|
|
func restore(fd int, state *State) error {
|
|
return windows.SetConsoleMode(windows.Handle(fd), state.mode)
|
|
}
|
|
|
|
func getSize(fd int) (width, height int, err error) {
|
|
var info windows.ConsoleScreenBufferInfo
|
|
if err := windows.GetConsoleScreenBufferInfo(windows.Handle(fd), &info); err != nil {
|
|
return 0, 0, err
|
|
}
|
|
return int(info.Window.Right - info.Window.Left + 1), int(info.Window.Bottom - info.Window.Top + 1), nil
|
|
}
|
|
|
|
func readPassword(fd int) ([]byte, error) {
|
|
var st uint32
|
|
if err := windows.GetConsoleMode(windows.Handle(fd), &st); err != nil {
|
|
return nil, err
|
|
}
|
|
old := st
|
|
|
|
st &^= (windows.ENABLE_ECHO_INPUT | windows.ENABLE_LINE_INPUT)
|
|
st |= (windows.ENABLE_PROCESSED_OUTPUT | windows.ENABLE_PROCESSED_INPUT)
|
|
if err := windows.SetConsoleMode(windows.Handle(fd), st); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
defer windows.SetConsoleMode(windows.Handle(fd), old)
|
|
|
|
var h windows.Handle
|
|
p, _ := windows.GetCurrentProcess()
|
|
if err := windows.DuplicateHandle(p, windows.Handle(fd), p, &h, 0, false, windows.DUPLICATE_SAME_ACCESS); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
f := os.NewFile(uintptr(h), "stdin")
|
|
defer f.Close()
|
|
return readPasswordLine(f)
|
|
}
|