Fix: maru-suji could not be input in WindowsTerminal 1.5

nyaosorg · Feb 17, 2021 · 0dcff23 · 0dcff23
1 parent ece7337
commit 0dcff23
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/internal/github.com/mattn/go-tty/tty_windows.go b/internal/github.com/mattn/go-tty/tty_windows.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"os"
 	"syscall"
+	"unicode"
 	"unsafe"
 
 	"github.com/mattn/go-isatty"
@@ -131,7 +132,7 @@ type TTY struct {
 	ws                chan WINSIZE
 	sigwinchCtx       context.Context
 	sigwinchCtxCancel context.CancelFunc
-	readNextKeyUp     bool
+	pressKey          map[wchar]struct{}
 }
 
 func readConsoleInput(fd uintptr, record *inputRecord) (err error) {
@@ -145,6 +146,7 @@ func readConsoleInput(fd uintptr, record *inputRecord) (err error) {
 
 func open(path string) (*TTY, error) {
 	tty := new(TTY)
+	tty.pressKey = make(map[wchar]struct{})
 	if false && isatty.IsTerminal(os.Stdin.Fd()) {
 		tty.in = os.Stdin
 	} else {
@@ -233,11 +235,17 @@ func (tty *TTY) readRune() (rune, error) {
 	case keyEvent:
 		kr := (*keyEventRecord)(unsafe.Pointer(&ir.event))
 		if kr.keyDown == 0 {
-			if kr.unicodeChar != 0 && tty.readNextKeyUp {
-				tty.readNextKeyUp = false
-				return rune(kr.unicodeChar), nil
+			if kr.unicodeChar != 0 {
+				if _, ok := tty.pressKey[kr.unicodeChar]; ok {
+					delete(tty.pressKey, kr.unicodeChar)
+				} else if kr.unicodeChar > unicode.MaxASCII {
+					return rune(kr.unicodeChar), nil
+				}
 			}
 		} else {
+			if kr.unicodeChar != 0 {
+				tty.pressKey[kr.unicodeChar] = struct{}{}
+			}
 			if kr.controlKeyState&altPressed != 0 && kr.unicodeChar > 0 {
 				tty.rs = []rune{rune(kr.unicodeChar)}
 				return rune(0x1b), nil
@@ -285,11 +293,6 @@ func (tty *TTY) readRune() (rune, error) {
 				}
 			}
 			switch vk {
-			case 0x12: // menu
-				if kr.controlKeyState&leftAltPressed != 0 {
-					tty.readNextKeyUp = true
-				}
-				return 0, nil
 			case 0x21: // page-up
 				tty.rs = []rune{0x5b, 0x35, 0x7e}
 				return rune(0x1b), nil