refac view: add cursor method

ui/controller.go

@@ -23,62 +23,34 @@ func (c *controller) layout(g *gocui.Gui) error {
 	return c.views.Layout(g, maxX, maxY)
 }
 
-func cursorDown(g *gocui.Gui, v *gocui.View) error {
+func (c *controller) cursorDown(g *gocui.Gui, v *gocui.View) error {
-	if v != nil {
+	view := c.views.Get(v)
-		cx, cy := v.Cursor()
+	if view != nil {
-		err := v.SetCursor(cx, cy+1)
+		return view.CursorDown()
-		if err != nil {
-			ox, oy := v.Origin()
-			err := v.SetOrigin(ox, oy+1)
-			if err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
 
-func cursorUp(g *gocui.Gui, v *gocui.View) error {
+func (c *controller) cursorUp(g *gocui.Gui, v *gocui.View) error {
-	if v != nil {
+	view := c.views.Get(v)
-		ox, oy := v.Origin()
+	if view != nil {
-		cx, cy := v.Cursor()
+		return view.CursorUp()
-		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 {
+func (c *controller) cursorRight(g *gocui.Gui, v *gocui.View) error {
-	if v != nil {
+	view := c.views.Get(v)
-		cx, cy := v.Cursor()
+	if view != nil {
-		err := v.SetCursor(cx+2, cy)
+		return view.CursorRight()
-		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 {
+func (c *controller) cursorLeft(g *gocui.Gui, v *gocui.View) error {
-	if v != nil {
+	view := c.views.Get(v)
-		ox, oy := v.Origin()
+	if view != nil {
-		cx, cy := v.Cursor()
+		return view.CursorLeft()
-		err := v.SetCursor(cx-2, cy)
-		if err != nil && ox > 1 {
-			err := v.SetOrigin(ox-2, oy)
-			if err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
@@ -227,22 +199,22 @@ func (c *controller) setKeyBinding(g *gocui.Gui) error {
 		return err
 	}
 
-	err = g.SetKeybinding("", gocui.KeyArrowUp, gocui.ModNone, cursorUp)
+	err = g.SetKeybinding("", gocui.KeyArrowUp, gocui.ModNone, c.cursorUp)
 	if err != nil {
 		return err
 	}
 
-	err = g.SetKeybinding("", gocui.KeyArrowDown, gocui.ModNone, cursorDown)
+	err = g.SetKeybinding("", gocui.KeyArrowDown, gocui.ModNone, c.cursorDown)
 	if err != nil {
 		return err
 	}
 
-	err = g.SetKeybinding("", gocui.KeyArrowLeft, gocui.ModNone, cursorLeft)
+	err = g.SetKeybinding("", gocui.KeyArrowLeft, gocui.ModNone, c.cursorLeft)
 	if err != nil {
 		return err
 	}
 
-	err = g.SetKeybinding("", gocui.KeyArrowRight, gocui.ModNone, cursorRight)
+	err = g.SetKeybinding("", gocui.KeyArrowRight, gocui.ModNone, c.cursorRight)
 	if err != nil {
 		return err
 	}

ui/views/channels.go

@@ -36,6 +36,66 @@ func (c *Channels) Wrap(v *gocui.View) view {
 	return c
 }
 
+func (c *Channels) CursorDown() error {
+	if c.view != nil {
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx, cy+1)
+		if err != nil {
+			ox, oy := c.view.Origin()
+			err := c.view.SetOrigin(ox, oy+1)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Channels) CursorUp() error {
+	if c.view != nil {
+		ox, oy := c.view.Origin()
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx, cy-1)
+		if err != nil && oy > 0 {
+			err := c.view.SetOrigin(ox, oy-1)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Channels) CursorRight() error {
+	if c.view != nil {
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx+2, cy)
+		if err != nil {
+			ox, oy := c.view.Origin()
+			err := c.view.SetOrigin(ox+2, oy)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Channels) CursorLeft() error {
+	if c.view != nil {
+		ox, oy := c.view.Origin()
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx-2, cy)
+		if err != nil && ox > 1 {
+			err := c.view.SetOrigin(ox-2, oy)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func (c *Channels) Set(g *gocui.Gui, x0, y0, x1, y1 int) error {
 	columns, err := g.SetView(CHANNELS_COLUMNS, x0-1, y0, x1+2, y0+2)
 	if err != nil {
@@ -186,6 +246,66 @@ func (c *Channel) Wrap(v *gocui.View) view {
 	return c
 }
 
+func (c *Channel) CursorDown() error {
+	if c.view != nil {
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx, cy+1)
+		if err != nil {
+			ox, oy := c.view.Origin()
+			err := c.view.SetOrigin(ox, oy+1)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Channel) CursorUp() error {
+	if c.view != nil {
+		ox, oy := c.view.Origin()
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx, cy-1)
+		if err != nil && oy > 0 {
+			err := c.view.SetOrigin(ox, oy-1)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Channel) CursorRight() error {
+	if c.view != nil {
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx+2, cy)
+		if err != nil {
+			ox, oy := c.view.Origin()
+			err := c.view.SetOrigin(ox+2, oy)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Channel) CursorLeft() error {
+	if c.view != nil {
+		ox, oy := c.view.Origin()
+		cx, cy := c.view.Cursor()
+		err := c.view.SetCursor(cx-2, cy)
+		if err != nil && ox > 1 {
+			err := c.view.SetOrigin(ox-2, oy)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func (c *Channel) Set(g *gocui.Gui, x0, y0, x1, y1 int) error {
 	header, err := g.SetView(CHANNEL_HEADER, x0-1, y0, x1+2, y0+2)
 	if err != nil {

ui/views/help.go

@@ -25,6 +25,66 @@ func (h *Help) Wrap(v *gocui.View) view {
 	return h
 }
 
+func (h *Help) CursorDown() error {
+	if h.view != nil {
+		cx, cy := h.view.Cursor()
+		err := h.view.SetCursor(cx, cy+1)
+		if err != nil {
+			ox, oy := h.view.Origin()
+			err := h.view.SetOrigin(ox, oy+1)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (h *Help) CursorUp() error {
+	if h.view != nil {
+		ox, oy := h.view.Origin()
+		cx, cy := h.view.Cursor()
+		err := h.view.SetCursor(cx, cy-1)
+		if err != nil && oy > 0 {
+			err := h.view.SetOrigin(ox, oy-1)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (h *Help) CursorRight() error {
+	if h.view != nil {
+		cx, cy := h.view.Cursor()
+		err := h.view.SetCursor(cx+2, cy)
+		if err != nil {
+			ox, oy := h.view.Origin()
+			err := h.view.SetOrigin(ox+2, oy)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (h *Help) CursorLeft() error {
+	if h.view != nil {
+		ox, oy := h.view.Origin()
+		cx, cy := h.view.Cursor()
+		err := h.view.SetCursor(cx-2, cy)
+		if err != nil && ox > 1 {
+			err := h.view.SetOrigin(ox-2, oy)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func (h Help) Set(g *gocui.Gui, x0, y0, x1, y1 int) error {
 	var err error
 	h.view, err = g.SetView(HELP, x0-1, y0, x1, y1)

ui/views/views.go

@@ -8,6 +8,10 @@ import (
 type view interface {
 	Set(*gocui.Gui, int, int, int, int) error
 	Wrap(*gocui.View) view
+	CursorLeft() error
+	CursorRight() error
+	CursorUp() error
+	CursorDown() error
 	Name() string
 }