Move edit functions to edit.go

edit.go

@@ -0,0 +1,57 @@
+package gocui
+
+// editWrite writes a rune in edit mode.
+func (v *View) editWrite(ch rune) error {
+	maxX, _ := v.Size()
+	v.writeRune(v.cx, v.cy, ch)
+	if v.cx == maxX-1 {
+		if err := v.SetOrigin(v.ox+1, v.oy); err != nil {
+			return err
+		}
+	} else {
+		if err := v.SetCursor(v.cx+1, v.cy); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// editDelete deletes a rune in edit mode. back determines the direction.
+func (v *View) editDelete(back bool) error {
+	if back {
+		v.deleteRune(v.cx-1, v.cy)
+		if v.cx == 0 {
+			if v.ox > 0 {
+				if err := v.SetOrigin(v.ox-1, v.oy); err != nil {
+					return err
+				}
+			}
+		} else {
+			if err := v.SetCursor(v.cx-1, v.cy); err != nil {
+				return err
+			}
+		}
+	} else {
+		v.deleteRune(v.cx, v.cy)
+	}
+	return nil
+}
+
+// editLine inserts a new line under the cursor in edit mode.
+func (v *View) editLine() error {
+	_, maxY := v.Size()
+	v.addLine(v.cy + 1)
+	if v.cy == maxY-1 {
+		if err := v.SetOrigin(0, v.oy+1); err != nil {
+			return err
+		}
+		if err := v.SetCursor(0, v.cy); err != nil {
+			return err
+		}
+	} else {
+		if err := v.SetCursor(0, v.cy+1); err != nil {
+			return err
+		}
+	}
+	return nil
+}

gui.go

@@ -421,75 +421,31 @@ func (g *Gui) onKey(ev *termbox.Event) error {
 		}
 	}
 	for _, kb := range g.keybindings {
-		if ev.Ch == kb.ch && Key(ev.Key) == kb.key && Modifier(ev.Mod) == kb.mod &&
+		if kb.h != nil && ev.Ch == kb.ch && Key(ev.Key) == kb.key && Modifier(ev.Mod) == kb.mod &&
 			(kb.viewName == "" || (g.currentView != nil && kb.viewName == g.currentView.name)) {
-			if kb.h == nil {
+			if err := kb.h(g, g.currentView); err != nil {
-				return nil
+				return err
 			}
-			return kb.h(g, g.currentView)
 		}
 	}
 	return nil
 }
 
-// handleEdit manages the edition mode
+// handleEdit manages the edition mode.
 func (g *Gui) handleEdit(v *View, ev *termbox.Event) error {
-	maxX, maxY := v.Size()
-
 	switch {
 	case ev.Ch != 0 && ev.Mod == 0:
-		v.writeRune(v.cx, v.cy, ev.Ch)
+		return v.editWrite(ev.Ch)
-		if v.cx == maxX-1 {
-			if err := v.SetOrigin(v.ox+1, v.oy); err != nil {
-				return err
-			}
-		} else {
-			if err := v.SetCursor(v.cx+1, v.cy); err != nil {
-				return err
-			}
-		}
 	case ev.Key == termbox.KeySpace:
-		v.writeRune(v.cx, v.cy, ' ')
+		return v.editWrite(' ')
-		if v.cx == maxX-1 {
-			if err := v.SetOrigin(v.ox+1, v.oy); err != nil {
-				return err
-			}
-		} else {
-			if err := v.SetCursor(v.cx+1, v.cy); err != nil {
-				return err
-			}
-		}
 	case ev.Key == termbox.KeyBackspace || ev.Key == termbox.KeyBackspace2:
-		v.deleteRune(v.cx-1, v.cy)
+		return v.editDelete(true)
-		if v.cx == 0 {
-			if v.ox > 0 {
-				if err := v.SetOrigin(v.ox-1, v.oy); err != nil {
-					return err
-				}
-			}
-		} else {
-			if err := v.SetCursor(v.cx-1, v.cy); err != nil {
-				return err
-			}
-		}
 	case ev.Key == termbox.KeyDelete:
-		v.deleteRune(v.cx, v.cy)
+		return v.editDelete(false)
 	case ev.Key == termbox.KeyInsert:
 		v.overwrite = !v.overwrite
 	case ev.Key == termbox.KeyEnter:
-		v.addLine(v.cy + 1)
+		return v.editLine()
-		if v.cy == maxY-1 {
-			if err := v.SetOrigin(0, v.oy+1); err != nil {
-				return err
-			}
-			if err := v.SetCursor(0, v.cy); err != nil {
-				return err
-			}
-		} else {
-			if err := v.SetCursor(0, v.cy+1); err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }