Use forked version of termbox-go to fix keybindings on freebsd. Closes …

…#43
cointop-sh · Dec 29, 2019 · eaf66f6 · eaf66f6
1 parent 491d019
commit eaf66f6
Show file tree

Hide file tree

Showing 53 changed files with 512 additions and 850 deletions.
diff --git a/cointop/cointop.go b/cointop/cointop.go
@@ -9,13 +9,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jroimartin/gocui"
 	"github.com/miguelmota/cointop/cointop/common/api"
 	"github.com/miguelmota/cointop/cointop/common/api/types"
 	"github.com/miguelmota/cointop/cointop/common/filecache"
 	"github.com/miguelmota/cointop/cointop/common/gizak/termui"
 	"github.com/miguelmota/cointop/cointop/common/humanize"
 	"github.com/miguelmota/cointop/cointop/common/table"
+	"github.com/miguelmota/gocui"
 	"github.com/patrickmn/go-cache"
 )
 

diff --git a/cointop/colorscheme.go b/cointop/colorscheme.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 
 	fcolor "github.com/fatih/color"
-	gocui "github.com/jroimartin/gocui"
+	gocui "github.com/miguelmota/gocui"
 	xtermcolor "github.com/tomnomnom/xtermcolor"
 )
 

diff --git a/cointop/common/gizak/termui/Gopkg.lock b/cointop/common/gizak/termui/Gopkg.lock
diff --git a/cointop/common/gizak/termui/events.go b/cointop/common/gizak/termui/events.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nsf/termbox-go"
+	"github.com/miguelmota/termbox-go"
 )
 
 type Event struct {

diff --git a/cointop/common/gizak/termui/helper.go b/cointop/common/gizak/termui/helper.go
@@ -8,9 +8,10 @@ import (
 	"regexp"
 	"strings"
 
-	tm "github.com/nsf/termbox-go"
+	tm "github.com/miguelmota/termbox-go"
+
+	rw "github.com/mattn/go-runewidth"
 )
-import rw "github.com/mattn/go-runewidth"
 
 /* ---------------Port from termbox-go --------------------- */
 

diff --git a/cointop/common/gizak/termui/render.go b/cointop/common/gizak/termui/render.go
@@ -19,7 +19,7 @@ import (
 	"bytes"
 
 	"github.com/maruel/panicparse/stack"
-	tm "github.com/nsf/termbox-go"
+	tm "github.com/miguelmota/termbox-go"
 )
 
 // Bufferer should be implemented by all renderable components.

diff --git a/cointop/keybindings.go b/cointop/keybindings.go
@@ -3,7 +3,7 @@ package cointop
 import (
 	"strings"
 
-	"github.com/jroimartin/gocui"
+	"github.com/miguelmota/gocui"
 )
 
 func (ct *Cointop) parseKeys(s string) (interface{}, gocui.Modifier) {

diff --git a/cointop/layout.go b/cointop/layout.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jroimartin/gocui"
+	"github.com/miguelmota/gocui"
 )
 
 // TODO: break up into small functions

diff --git a/cointop/quit.go b/cointop/quit.go
@@ -3,7 +3,7 @@ package cointop
 import (
 	"os"
 
-	"github.com/jroimartin/gocui"
+	"github.com/miguelmota/gocui"
 )
 
 // Quit quites the program

diff --git a/cointop/sort.go b/cointop/sort.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/jroimartin/gocui"
+	"github.com/miguelmota/gocui"
 )
 
 var sortlock sync.Mutex

diff --git a/cointop/update.go b/cointop/update.go
@@ -3,7 +3,7 @@ package cointop
 import (
 	"fmt"
 
-	"github.com/jroimartin/gocui"
+	"github.com/miguelmota/gocui"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/cointop/view.go b/cointop/view.go
@@ -3,7 +3,7 @@ package cointop
 import (
 	"fmt"
 
-	"github.com/jroimartin/gocui"
+	"github.com/miguelmota/gocui"
 )
 
 // IView is a cointop view

diff --git a/go.mod b/go.mod
@@ -6,16 +6,15 @@ require (
 	github.com/fatih/color v1.7.0
 	github.com/gizak/termui v2.3.0+incompatible // indirect
 	github.com/google/pprof v0.0.0-20190502144155-8358a9778bd1 // indirect
-	github.com/jroimartin/gocui v0.4.0
 	github.com/maruel/panicparse v1.1.2-0.20180806203336-f20d4c4d746f
 	github.com/mattn/go-colorable v0.1.1 // indirect
 	github.com/mattn/go-isatty v0.0.8 // indirect
-	github.com/mattn/go-runewidth v0.0.4
+	github.com/mattn/go-runewidth v0.0.7
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/miguelmota/go-coinmarketcap v0.1.5
+	github.com/miguelmota/gocui v0.4.2
+	github.com/miguelmota/termbox-go v0.0.0-20191229070316-58d4fcbce2a7
 	github.com/mitchellh/go-wordwrap v1.0.0
-	github.com/nsf/termbox v1.1.2 // indirect
-	github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/sirupsen/logrus v1.4.1
 	github.com/spf13/cobra v0.0.5

diff --git a/go.sum b/go.sum
@@ -23,8 +23,6 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplb
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
-github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -41,21 +39,23 @@ github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/miguelmota/go-coinmarketcap v0.1.4 h1:x3AXc/b8MbFtfAEI5hQphtcbwTm4OAXJPjVOHf1ETt0=
 github.com/miguelmota/go-coinmarketcap v0.1.4/go.mod h1:Jdv/kqtKclIElmoNAZMMJn0DSQv+j7p/H1te/GGnxhA=
 github.com/miguelmota/go-coinmarketcap v0.1.5 h1:NwAqQG+ClGNsYlReM06ERK8CqEkW1tF8BQsTLNp6TyU=
 github.com/miguelmota/go-coinmarketcap v0.1.5/go.mod h1:Jdv/kqtKclIElmoNAZMMJn0DSQv+j7p/H1te/GGnxhA=
+github.com/miguelmota/gocui v0.4.2 h1:nMYnYn3RjV7FlWFcidQa9eAkX3kT7XMI6yJMxEkAz6s=
+github.com/miguelmota/gocui v0.4.2/go.mod h1:wVtmhuLR+VAS9VRBIJZBNJS9IgH+9QOZ/m/MvRarOZ4=
+github.com/miguelmota/termbox-go v0.0.0-20191229070316-58d4fcbce2a7 h1:sZmjSV25xMXIGAaATVuOtC9VtGHMydXpd9OejNaTxQE=
+github.com/miguelmota/termbox-go v0.0.0-20191229070316-58d4fcbce2a7/go.mod h1:DRZE481VrAygaB/4DTvG0To/HsucthXAu0sY1Exb7gw=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
-github.com/nsf/termbox v1.1.2 h1:w1jYRf7nu3ZBICMbHKsyihdYyydAAhBEKcTfVxJQsxE=
-github.com/nsf/termbox v1.1.2/go.mod h1:vzR0wsVVTMx636zhtIZ1b1VbIMxrLeI3tSRN13kMIPI=
-github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840=
-github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

diff --git a/vendor/github.com/mattn/go-runewidth/go.mod b/vendor/github.com/mattn/go-runewidth/go.mod
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/nsf/termbox-go"
+    	"github.com/miguelmota/termbox-go"
     )
     type Event struct {
@@ Expand Down @@