diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-01-31 08:49:58 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-01-31 08:51:24 +1100 |
commit | bf69923b6df52d6d8739718b2011097e6114733f (patch) | |
tree | c4e61e6e2a8c2109a624c14880b744daa4c64699 /vendor | |
parent | 64782a433e6de09ed797266f463b2552ee6ae1c7 (diff) |
fix keybinding issues with freebsd/openbsd
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/github.com/jesseduffield/termbox-go/api.go | 39 | ||||
-rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 26 insertions, 15 deletions
diff --git a/vendor/github.com/jesseduffield/termbox-go/api.go b/vendor/github.com/jesseduffield/termbox-go/api.go index 3aa437115..07c1dda42 100644 --- a/vendor/github.com/jesseduffield/termbox-go/api.go +++ b/vendor/github.com/jesseduffield/termbox-go/api.go @@ -2,13 +2,16 @@ package termbox -import "github.com/mattn/go-runewidth" -import "fmt" -import "os" -import "os/signal" -import "syscall" -import "runtime" -import "time" +import ( + "fmt" + "os" + "os/signal" + "runtime" + "syscall" + "time" + + "github.com/mattn/go-runewidth" +) // public API @@ -26,13 +29,21 @@ func Init() error { var err error - out, err = os.OpenFile("/dev/tty", syscall.O_WRONLY, 0) - if err != nil { - return err - } - in, err = syscall.Open("/dev/tty", syscall.O_RDONLY, 0) - if err != nil { - return err + if runtime.GOOS == "openbsd" || runtime.GOOS == "freebsd" { + out, err = os.OpenFile("/dev/tty", os.O_RDWR, 0) + if err != nil { + return err + } + in = int(out.Fd()) + } else { + out, err = os.OpenFile("/dev/tty", os.O_WRONLY, 0) + if err != nil { + return err + } + in, err = syscall.Open("/dev/tty", syscall.O_RDONLY, 0) + if err != nil { + return err + } } err = setup_term() diff --git a/vendor/modules.txt b/vendor/modules.txt index 634a9f659..d8d5714b7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -36,7 +36,7 @@ github.com/jbenet/go-context/io github.com/jesseduffield/gocui # github.com/jesseduffield/pty v1.2.1 github.com/jesseduffield/pty -# github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e +# github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9 github.com/jesseduffield/termbox-go # github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 github.com/kardianos/osext |