From 4d5a43836a1e0de2729abd349669bfea23dcff52 Mon Sep 17 00:00:00 2001 From: Edouard Paris Date: Wed, 10 Apr 2019 09:22:44 +0200 Subject: [PATCH] ui controller: cursorLeft, cursorRight --- ui/controller.go | 52 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/ui/controller.go b/ui/controller.go index 9394166..d286030 100644 --- a/ui/controller.go +++ b/ui/controller.go @@ -26,9 +26,11 @@ func (c *controller) layout(g *gocui.Gui) error { func cursorDown(g *gocui.Gui, v *gocui.View) error { if v != nil { cx, cy := v.Cursor() - if err := v.SetCursor(cx, cy+1); err != nil { + err := v.SetCursor(cx, cy+1) + if err != nil { ox, oy := v.Origin() - if err := v.SetOrigin(ox, oy+1); err != nil { + err := v.SetOrigin(ox, oy+1) + if err != nil { return err } } @@ -40,8 +42,40 @@ func cursorUp(g *gocui.Gui, v *gocui.View) error { if v != nil { ox, oy := v.Origin() cx, cy := v.Cursor() - if err := v.SetCursor(cx, cy-1); err != nil && oy > 0 { - if err := v.SetOrigin(ox, oy-1); err != nil { + err := v.SetCursor(cx, cy-1) + if err != nil && oy > 0 { + err := v.SetOrigin(ox, oy-1) + if err != nil { + return err + } + } + } + return nil +} + +func cursorRight(g *gocui.Gui, v *gocui.View) error { + if v != nil { + cx, cy := v.Cursor() + err := v.SetCursor(cx+2, cy) + if err != nil { + ox, oy := v.Origin() + err := v.SetOrigin(ox+2, oy) + if err != nil { + return err + } + } + } + return nil +} + +func cursorLeft(g *gocui.Gui, v *gocui.View) error { + if v != nil { + ox, oy := v.Origin() + cx, cy := v.Cursor() + err := v.SetCursor(cx-2, cy) + if err != nil && ox > 1 { + err := v.SetOrigin(ox-2, oy) + if err != nil { return err } } @@ -203,6 +237,16 @@ func (c *controller) setKeyBinding(g *gocui.Gui) error { return err } + err = g.SetKeybinding("", gocui.KeyArrowLeft, gocui.ModNone, cursorLeft) + if err != nil { + return err + } + + err = g.SetKeybinding("", gocui.KeyArrowRight, gocui.ModNone, cursorRight) + if err != nil { + return err + } + err = g.SetKeybinding("", gocui.KeyEnter, gocui.ModNone, c.OnEnter) if err != nil { return err