From 38ed39448a8d805d3ad2e33b6ec5e0f2431882ff Mon Sep 17 00:00:00 2001 From: Jimmy Xu Date: Sat, 21 Apr 2018 01:18:08 +0800 Subject: [PATCH] [fix-hypercli-vendor] update hypercli dependency to github.com/Azure/go-ansiterm (#134) --- Gopkg.lock | 2 +- Gopkg.toml | 8 ++++---- .../hyperhq/hypercli/pkg/term/windows/ansi_reader.go | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e371dbabe..625f871f0 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -225,7 +225,7 @@ [[projects]] name = "github.com/hyperhq/hypercli" packages = ["cliconfig","daemon/graphdriver","image","image/v1","layer","opts","pkg/archive","pkg/chrootarchive","pkg/fileutils","pkg/homedir","pkg/httputils","pkg/idtools","pkg/ioutils","pkg/jsonlog","pkg/jsonmessage","pkg/longpath","pkg/mflag","pkg/plugins","pkg/pools","pkg/promise","pkg/random","pkg/reexec","pkg/stringid","pkg/system","pkg/tarsum","pkg/term","pkg/term/windows","pkg/urlutil","pkg/version","reference","registry"] - revision = "3e4e4fa373cbf8672bded67688b4821cd30b37f9" + revision = "29217d318cab52815518a1126d57ca010de83e4d" [[projects]] name = "github.com/hyperhq/libcompose" diff --git a/Gopkg.toml b/Gopkg.toml index a10f05ce8..1f314536c 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -53,10 +53,10 @@ name = "github.com/gorilla/mux" version = "1.6.0" -[[constraint]] - name = "github.com/hyperhq/hypercli" - revision = "3e4e4fa373cbf8672bded67688b4821cd30b37f9" - [[constraint]] name = "k8s.io/client-go" version = "6.0.0" + +[[constraint]] + name = "github.com/hyperhq/hypercli" + revision = "29217d318cab52815518a1126d57ca010de83e4d" diff --git a/vendor/github.com/hyperhq/hypercli/pkg/term/windows/ansi_reader.go b/vendor/github.com/hyperhq/hypercli/pkg/term/windows/ansi_reader.go index 3bf2b2b6b..5b91b7834 100644 --- a/vendor/github.com/hyperhq/hypercli/pkg/term/windows/ansi_reader.go +++ b/vendor/github.com/hyperhq/hypercli/pkg/term/windows/ansi_reader.go @@ -136,14 +136,14 @@ func readInputEvents(fd uintptr, maxBytes int) ([]winterm.INPUT_RECORD, error) { // KeyEvent Translation Helpers -var arrowKeyMapPrefix = map[winterm.WORD]string{ +var arrowKeyMapPrefix = map[uint16]string{ winterm.VK_UP: "%s%sA", winterm.VK_DOWN: "%s%sB", winterm.VK_RIGHT: "%s%sC", winterm.VK_LEFT: "%s%sD", } -var keyMapPrefix = map[winterm.WORD]string{ +var keyMapPrefix = map[uint16]string{ winterm.VK_UP: "\x1B[%sA", winterm.VK_DOWN: "\x1B[%sB", winterm.VK_RIGHT: "\x1B[%sC", @@ -207,7 +207,7 @@ func keyToString(keyEvent *winterm.KEY_EVENT_RECORD, escapeSequence []byte) stri } // formatVirtualKey converts a virtual key (e.g., up arrow) into the appropriate ANSI string. -func formatVirtualKey(key winterm.WORD, controlState winterm.DWORD, escapeSequence []byte) string { +func formatVirtualKey(key uint16, controlState uint32, escapeSequence []byte) string { shift, alt, control := getControlKeys(controlState) modifier := getControlKeysModifier(shift, alt, control) @@ -223,7 +223,7 @@ func formatVirtualKey(key winterm.WORD, controlState winterm.DWORD, escapeSequen } // getControlKeys extracts the shift, alt, and ctrl key states. -func getControlKeys(controlState winterm.DWORD) (shift, alt, control bool) { +func getControlKeys(controlState uint32) (shift, alt, control bool) { shift = 0 != (controlState & winterm.SHIFT_PRESSED) alt = 0 != (controlState & (winterm.LEFT_ALT_PRESSED | winterm.RIGHT_ALT_PRESSED)) control = 0 != (controlState & (winterm.LEFT_CTRL_PRESSED | winterm.RIGHT_CTRL_PRESSED))