Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#64] Support multibyte charactors #65

Closed
wants to merge 5 commits into from
Closed

[#64] Support multibyte charactors #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0f7c92
[#64] change dependency of gocui to jesseduffield's to support japanese
pankona Dec 7, 2018
70b0214
[#64] go mod tidy
pankona Dec 8, 2018
406f274
[#64] follow API change due to new dependencies
pankona Dec 12, 2018
28c4cc0
[#64] update dependencies
pankona Dec 12, 2018
6d2e8c5
[#64] update Gopkg.lock/toml to support japanese
pankona Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
150 changes: 128 additions & 22 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
View file
Open in desktop
Expand Up @@ -43,8 +43,8 @@

[[constraint]]
name = "github.com/jroimartin/gocui"
version = "0.4.0"
source = "https://github.com/pankona/gocui"
source = "https://github.com/jesseduffield/gocui"
branch = "master"

[[constraint]]
branch = "master"
Expand Down
3 changes: 2 additions & 1 deletion cmd/hashira-cui/main.go
View file
Open in desktop
Expand Up @@ -66,7 +66,8 @@ func main() {
)

// initialize gocui
g, err := gocui.NewGui(gocui.OutputNormal)
// specify false means: supportOverlaps = false
g, err := gocui.NewGui(gocui.OutputNormal, false)
if err != nil {
log.Panicln(err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/hashira-cui/pane.go
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ func (p *Pane) Layout(g *gocui.Gui, c *cursor, focusedIndex int, selectedTask *K
maxX, maxY := g.Size()
rect := rectangle{maxX / 4 * p.index, 1, maxX/4*p.index + maxX/4 - 1, maxY - 1}

v, err := g.SetView(p.name, rect.x0, rect.y0, rect.x1, rect.y1)
v, err := g.SetView(p.name, rect.x0, rect.y0, rect.x1, rect.y1, 0)
if err != nil {
if err != gocui.ErrUnknownView {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/hashira-cui/view.go
View file
Open in desktop
Expand Up @@ -321,7 +321,7 @@ func (v *View) input(g *gocui.Gui, gv *gocui.View) error {

func (v *View) showInput(g *gocui.Gui) error {
maxX, maxY := g.Size()
input, err := g.SetView("input", maxX/2-20, maxY/2, maxX/2+20, maxY/2+2)
input, err := g.SetView("input", maxX/2-20, maxY/2, maxX/2+20, maxY/2+2, 0)
if err != nil {
if err != gocui.ErrUnknownView {
return err
Expand Down
19 changes: 4 additions & 15 deletions go.mod
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@ module github.com/pankona/hashira

require (
cloud.google.com/go v0.34.0
git.apache.org/thrift.git v0.0.0-20181128031924-7f0fa6c21ec2 // indirect
github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd // indirect
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
Expand All @@ -13,37 +12,27 @@ require (
github.com/asticode/go-bindata v0.0.0-20151023091102-a0ff2567cfb7 // indirect
github.com/boltdb/bolt v1.3.1 // indirect
github.com/etcd-io/bbolt v1.3.0
github.com/golang/lint v0.0.0-20181026193005-c67002cb31c3 // indirect
github.com/golang/protobuf v1.2.0
github.com/googleapis/gax-go v2.0.2+incompatible // indirect
github.com/grpc-ecosystem/grpc-gateway v1.5.1 // indirect
github.com/jesseduffield/termbox-go v0.0.0-20180919093808-1e272ff78dcb // indirect
github.com/jroimartin/gocui v0.4.0
github.com/julienschmidt/httprouter v1.2.0 // indirect
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/mattn/go-runewidth v0.0.3 // indirect
github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed // indirect
github.com/openzipkin/zipkin-go v0.1.3 // indirect
github.com/pankona/orderedmap v0.0.0-20181010071912-782e514ec868
github.com/pkg/errors v0.8.0
github.com/prometheus/client_golang v0.9.1 // indirect
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 // indirect
github.com/prometheus/procfs v0.0.0-20181126161756-619930b0b471 // indirect
github.com/sirupsen/logrus v1.2.0 // indirect
github.com/stretchr/testify v1.2.2
go.opencensus.io v0.18.0 // indirect
golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85 // indirect
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 // indirect
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
golang.org/x/oauth2 v0.0.0-20181120190819-8f65e3013eba // indirect
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b // indirect
golang.org/x/tools v0.0.0-20181127232545-e782529d0ddd // indirect
google.golang.org/api v0.0.0-20181127174356-0a71a4356c3f // indirect
google.golang.org/appengine v1.3.0 // indirect
google.golang.org/genproto v0.0.0-20181127195345-31ac5d88444a // indirect
google.golang.org/grpc v1.17.0
google.golang.org/grpc v1.14.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3 // indirect
)

replace github.com/jroimartin/gocui v0.4.0 => github.com/jesseduffield/gocui v0.3.1-0.20181209104758-fe55a32c8a4c