X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fview.go;h=22a304c31c111b6d44e324bfaa23863fedb6581f;hb=116b247439cbda6f1f1ceeb9707ee6a6af720368;hp=69a65a75066e3d7f40e5938cce3e263bcf7167b6;hpb=f0ad01d1ec3e871ee3f490fc783db4603e87daf2;p=micro.git

diff --git a/cmd/micro/view.go b/cmd/micro/view.go
index 69a65a75..22a304c3 100644
--- a/cmd/micro/view.go
+++ b/cmd/micro/view.go
@@ -1,22 +1,24 @@
 package main
 
 import (
-	"github.com/atotto/clipboard"
-	"github.com/gdamore/tcell"
 	"io/ioutil"
+	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/zyedidia/tcell"
 )
 
 // The View struct stores information about a view into a buffer.
-// It has a stores information about the cursor, and the viewport
+// It stores information about the cursor, and the viewport
 // that the user sees the buffer from.
 type View struct {
-	cursor Cursor
+	Cursor Cursor
 
 	// The topmost line, used for vertical scrolling
-	topline int
+	Topline int
 	// The leftmost column, used for horizontal scrolling
 	leftCol int
 
@@ -34,8 +36,11 @@ type View struct {
 	// The eventhandler for undo/redo
 	eh *EventHandler
 
+	// Holds the list of gutter messages
+	messages map[string][]GutterMessage
+
 	// The buffer
-	buf *Buffer
+	Buf *Buffer
 	// The statusline
 	sline Statusline
 
@@ -49,6 +54,13 @@ type View struct {
 	// This is useful for detecting double and triple clicks
 	lastClickTime time.Time
 
+	// lastCutTime stores when the last ctrl+k was issued.
+	// It is used for clearing the clipboard to replace it with fresh cut lines.
+	lastCutTime time.Time
+
+	// freshClip returns true if the clipboard has never been pasted.
+	freshClip bool
+
 	// Was the last mouse event actually a double click?
 	// Useful for detecting triple clicks -- if a double click is detected
 	// but the last mouse event was actually a double click, it's a triple click
@@ -60,9 +72,6 @@ type View struct {
 	matches SyntaxMatches
 	// The matches from the last frame
 	lastMatches SyntaxMatches
-
-	// This is the range of lines that should have their syntax highlighting updated
-	updateLines [2]int
 }
 
 // NewView returns a new fullscreen view
@@ -75,45 +84,23 @@ func NewView(buf *Buffer) *View {
 func NewViewWidthHeight(buf *Buffer, w, h int) *View {
 	v := new(View)
 
-	v.buf = buf
-
 	v.widthPercent = w
 	v.heightPercent = h
 	v.Resize(screen.Size())
 
-	v.topline = 0
-	// Put the cursor at the first spot
-	v.cursor = Cursor{
-		x: 0,
-		y: 0,
-		v: v,
-	}
-	v.cursor.ResetSelection()
+	v.OpenBuffer(buf)
 
 	v.eh = NewEventHandler(v)
 
+	v.messages = make(map[string][]GutterMessage)
+
 	v.sline = Statusline{
 		view: v,
 	}
 
-	// Update the syntax highlighting for the entire buffer at the start
-	v.UpdateLines(v.topline, v.topline+v.height)
-	v.matches = Match(v)
-
-	// Set mouseReleased to true because we assume the mouse is not being pressed when
-	// the editor is opened
-	v.mouseReleased = true
-	v.lastClickTime = time.Time{}
-
 	return v
 }
 
-// UpdateLines sets the values for v.updateLines
-func (v *View) UpdateLines(start, end int) {
-	v.updateLines[0] = start
-	v.updateLines[1] = end + 1
-}
-
 // Resize recalculates the actual width and height of the view from the width and height
 // percentages
 // This is usually called when the window is resized, or when a split has been added and
@@ -123,66 +110,30 @@ func (v *View) Resize(w, h int) {
 	h--
 	v.width = int(float32(w) * float32(v.widthPercent) / 100)
 	// We subtract 1 for the statusline
-	v.height = int(float32(h)*float32(v.heightPercent)/100) - 1
+	v.height = int(float32(h) * float32(v.heightPercent) / 100)
+	if settings["statusline"].(bool) {
+		// Make room for the status line if it is enabled
+		v.height--
+	}
 }
 
 // ScrollUp scrolls the view up n lines (if possible)
 func (v *View) ScrollUp(n int) {
 	// Try to scroll by n but if it would overflow, scroll by 1
-	if v.topline-n >= 0 {
-		v.topline -= n
-	} else if v.topline > 0 {
-		v.topline--
+	if v.Topline-n >= 0 {
+		v.Topline -= n
+	} else if v.Topline > 0 {
+		v.Topline--
 	}
 }
 
 // ScrollDown scrolls the view down n lines (if possible)
 func (v *View) ScrollDown(n int) {
 	// Try to scroll by n but if it would overflow, scroll by 1
-	if v.topline+n <= len(v.buf.lines)-v.height {
-		v.topline += n
-	} else if v.topline < len(v.buf.lines)-v.height {
-		v.topline++
-	}
-}
-
-// PageUp scrolls the view up a page
-func (v *View) PageUp() {
-	if v.topline > v.height {
-		v.ScrollUp(v.height)
-	} else {
-		v.topline = 0
-	}
-}
-
-// PageDown scrolls the view down a page
-func (v *View) PageDown() {
-	if len(v.buf.lines)-(v.topline+v.height) > v.height {
-		v.ScrollDown(v.height)
-	} else {
-		if len(v.buf.lines) >= v.height {
-			v.topline = len(v.buf.lines) - v.height
-		}
-	}
-}
-
-// HalfPageUp scrolls the view up half a page
-func (v *View) HalfPageUp() {
-	if v.topline > v.height/2 {
-		v.ScrollUp(v.height / 2)
-	} else {
-		v.topline = 0
-	}
-}
-
-// HalfPageDown scrolls the view down half a page
-func (v *View) HalfPageDown() {
-	if len(v.buf.lines)-(v.topline+v.height) > v.height/2 {
-		v.ScrollDown(v.height / 2)
-	} else {
-		if len(v.buf.lines) >= v.height {
-			v.topline = len(v.buf.lines) - v.height
-		}
+	if v.Topline+n <= v.Buf.NumLines-v.height {
+		v.Topline += n
+	} else if v.Topline < v.Buf.NumLines-v.height {
+		v.Topline++
 	}
 }
 
@@ -191,7 +142,7 @@ func (v *View) HalfPageDown() {
 // causing them to lose the unsaved changes
 // The message is what to print after saying "You have unsaved changes. "
 func (v *View) CanClose(msg string) bool {
-	if v.buf.IsDirty() {
+	if v.Buf.IsModified {
 		quit, canceled := messenger.Prompt("You have unsaved changes. " + msg)
 		if !canceled {
 			if strings.ToLower(quit) == "yes" || strings.ToLower(quit) == "y" {
@@ -207,108 +158,66 @@ func (v *View) CanClose(msg string) bool {
 	return false
 }
 
-// Save the buffer to disk
-func (v *View) Save() {
-	// If this is an empty buffer, ask for a filename
-	if v.buf.path == "" {
-		filename, canceled := messenger.Prompt("Filename: ")
-		if !canceled {
-			v.buf.path = filename
-			v.buf.name = filename
-		} else {
-			return
-		}
-	}
-	err := v.buf.Save()
-	if err != nil {
-		messenger.Error(err.Error())
-	} else {
-		messenger.Message("Saved " + v.buf.path)
-	}
-}
-
-// Copy the selection to the system clipboard
-func (v *View) Copy() {
-	if v.cursor.HasSelection() {
-		if !clipboard.Unsupported {
-			clipboard.WriteAll(v.cursor.GetSelection())
-		} else {
-			messenger.Error("Clipboard is not supported on your system")
-		}
-	}
-}
-
-// Cut the selection to the system clipboard
-func (v *View) Cut() {
-	if v.cursor.HasSelection() {
-		if !clipboard.Unsupported {
-			clipboard.WriteAll(v.cursor.GetSelection())
-			v.cursor.DeleteSelection()
-			v.cursor.ResetSelection()
-		} else {
-			messenger.Error("Clipboard is not supported on your system")
-		}
+// OpenBuffer opens a new buffer in this view.
+// This resets the topline, event handler and cursor.
+func (v *View) OpenBuffer(buf *Buffer) {
+	v.Buf = buf
+	v.Topline = 0
+	v.leftCol = 0
+	// Put the cursor at the first spot
+	v.Cursor = Cursor{
+		x: 0,
+		y: 0,
+		v: v,
 	}
-}
+	v.Cursor.ResetSelection()
+	v.messages = make(map[string][]GutterMessage)
 
-// Paste whatever is in the system clipboard into the buffer
-// Delete and paste if the user has a selection
-func (v *View) Paste() {
-	if !clipboard.Unsupported {
-		if v.cursor.HasSelection() {
-			v.cursor.DeleteSelection()
-			v.cursor.ResetSelection()
-		}
-		clip, _ := clipboard.ReadAll()
-		v.eh.Insert(v.cursor.Loc(), clip)
-		v.cursor.SetLoc(v.cursor.Loc() + Count(clip))
-	} else {
-		messenger.Error("Clipboard is not supported on your system")
-	}
-}
+	v.eh = NewEventHandler(v)
+	v.matches = Match(v)
 
-// SelectAll selects the entire buffer
-func (v *View) SelectAll() {
-	v.cursor.curSelection[1] = 0
-	v.cursor.curSelection[0] = v.buf.Len()
-	// Put the cursor at the beginning
-	v.cursor.x = 0
-	v.cursor.y = 0
+	// Set mouseReleased to true because we assume the mouse is not being pressed when
+	// the editor is opened
+	v.mouseReleased = true
+	v.lastClickTime = time.Time{}
 }
 
-// OpenFile opens a new file in the current view
-// It makes sure that the current buffer can be closed first (unsaved changes)
-func (v *View) OpenFile() {
+// ReOpen reloads the current buffer
+func (v *View) ReOpen() {
 	if v.CanClose("Continue? (yes, no, save) ") {
-		filename, canceled := messenger.Prompt("File to open: ")
-		if canceled {
-			return
-		}
-		file, err := ioutil.ReadFile(filename)
+		file, err := ioutil.ReadFile(v.Buf.Path)
+		filename := v.Buf.Name
 
 		if err != nil {
 			messenger.Error(err.Error())
 			return
 		}
-		v.buf = NewBuffer(string(file), filename)
+		buf := NewBuffer(string(file), filename)
+		v.Buf = buf
+		v.matches = Match(v)
+		v.Cursor.Relocate()
+		v.Relocate(0)
 	}
 }
 
 // Relocate moves the view window so that the cursor is in view
 // This is useful if the user has scrolled far away, and then starts typing
-func (v *View) Relocate() bool {
+func (v *View) Relocate(x int) bool {
 	ret := false
-	cy := v.cursor.y
-	if cy < v.topline {
-		v.topline = cy
+	cy := v.Cursor.y
+	if cy < v.Topline+x && cy > x-1 {
+		v.Topline = cy - x
+		ret = true
+	} else if cy < v.Topline {
+		v.Topline = cy
 		ret = true
 	}
-	if cy > v.topline+v.height-1 {
-		v.topline = cy - v.height + 1
+	if cy > v.Topline+v.height-1-x {
+		v.Topline = cy - v.height + 1 + x
 		ret = true
 	}
 
-	cx := v.cursor.GetVisualX()
+	cx := v.Cursor.GetVisualX()
 	if cx < v.leftCol {
 		v.leftCol = cx
 		ret = true
@@ -323,12 +232,12 @@ func (v *View) Relocate() bool {
 // MoveToMouseClick moves the cursor to location x, y assuming x, y were given
 // by a mouse click
 func (v *View) MoveToMouseClick(x, y int) {
-	if y-v.topline > v.height-1 {
+	if y-v.Topline > v.height-1 {
 		v.ScrollDown(1)
-		y = v.height + v.topline - 1
+		y = v.height + v.Topline - 1
 	}
-	if y >= len(v.buf.lines) {
-		y = len(v.buf.lines) - 1
+	if y >= v.Buf.NumLines {
+		y = v.Buf.NumLines - 1
 	}
 	if y < 0 {
 		y = 0
@@ -337,13 +246,13 @@ func (v *View) MoveToMouseClick(x, y int) {
 		x = 0
 	}
 
-	x = v.cursor.GetCharPosInLine(y, x)
-	if x > Count(v.buf.lines[y]) {
-		x = Count(v.buf.lines[y])
+	x = v.Cursor.GetCharPosInLine(y, x)
+	if x > Count(v.Buf.Lines[y]) {
+		x = Count(v.Buf.Lines[y])
 	}
-	v.cursor.x = x
-	v.cursor.y = y
-	v.cursor.lastVisualX = v.cursor.GetVisualX()
+	v.Cursor.x = x
+	v.Cursor.y = y
+	v.Cursor.lastVisualX = v.Cursor.GetVisualX()
 }
 
 // HandleEvent handles an event passed by the main loop
@@ -351,197 +260,61 @@ func (v *View) HandleEvent(event tcell.Event) {
 	// This bool determines whether the view is relocated at the end of the function
 	// By default it's true because most events should cause a relocate
 	relocate := true
+	scrollmargin := int(settings["scrollmargin"].(float64))
 
-	// By default we don't update and syntax highlighting
-	v.UpdateLines(-2, 0)
 	switch e := event.(type) {
 	case *tcell.EventResize:
 		// Window resized
 		v.Resize(e.Size())
 	case *tcell.EventKey:
-		switch e.Key() {
-		case tcell.KeyUp:
-			// Cursor up
-			v.cursor.ResetSelection()
-			v.cursor.Up()
-		case tcell.KeyDown:
-			// Cursor down
-			v.cursor.ResetSelection()
-			v.cursor.Down()
-		case tcell.KeyLeft:
-			// Cursor left
-			v.cursor.ResetSelection()
-			v.cursor.Left()
-		case tcell.KeyRight:
-			// Cursor right
-			v.cursor.ResetSelection()
-			v.cursor.Right()
-		case tcell.KeyEnter:
-			// Insert a newline
-			if v.cursor.HasSelection() {
-				v.cursor.DeleteSelection()
-				v.cursor.ResetSelection()
-			}
-			v.eh.Insert(v.cursor.Loc(), "\n")
-			v.cursor.Right()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-			v.cursor.lastVisualX = v.cursor.GetVisualX()
-			// v.UpdateLines(v.cursor.y-1, v.cursor.y)
-		case tcell.KeySpace:
-			// Insert a space
-			if v.cursor.HasSelection() {
-				v.cursor.DeleteSelection()
-				v.cursor.ResetSelection()
-			}
-			v.eh.Insert(v.cursor.Loc(), " ")
-			v.cursor.Right()
-			v.UpdateLines(v.cursor.y, v.cursor.y)
-		case tcell.KeyBackspace2, tcell.KeyBackspace:
-			// Delete a character
-			if v.cursor.HasSelection() {
-				v.cursor.DeleteSelection()
-				v.cursor.ResetSelection()
-				// Rehighlight the entire buffer
-				v.UpdateLines(v.topline, v.topline+v.height)
-			} else if v.cursor.Loc() > 0 {
-				// We have to do something a bit hacky here because we want to
-				// delete the line by first moving left and then deleting backwards
-				// but the undo redo would place the cursor in the wrong place
-				// So instead we move left, save the position, move back, delete
-				// and restore the position
-				v.cursor.Left()
-				cx, cy := v.cursor.x, v.cursor.y
-				v.cursor.Right()
-				loc := v.cursor.Loc()
-				v.eh.Remove(loc-1, loc)
-				v.cursor.x, v.cursor.y = cx, cy
-				// Rehighlight the entire buffer
-				v.UpdateLines(v.topline, v.topline+v.height)
-				// v.UpdateLines(v.cursor.y, v.cursor.y+1)
-			}
-			v.cursor.lastVisualX = v.cursor.GetVisualX()
-		case tcell.KeyTab:
-			// Insert a tab
-			if v.cursor.HasSelection() {
-				v.cursor.DeleteSelection()
-				v.cursor.ResetSelection()
+		if e.Key() == tcell.KeyRune {
+			// Insert a character
+			if v.Cursor.HasSelection() {
+				v.Cursor.DeleteSelection()
+				v.Cursor.ResetSelection()
 			}
-			if settings.TabsToSpaces {
-				v.eh.Insert(v.cursor.Loc(), Spaces(settings.TabSize))
-				for i := 0; i < settings.TabSize; i++ {
-					v.cursor.Right()
+			v.eh.Insert(v.Cursor.Loc(), string(e.Rune()))
+			v.Cursor.Right()
+		} else {
+			for key, action := range bindings {
+				if e.Key() == key.keyCode {
+					if e.Modifiers() == key.modifiers {
+						relocate = action(v)
+						for _, pl := range loadedPlugins {
+							funcName := strings.Split(runtime.FuncForPC(reflect.ValueOf(action).Pointer()).Name(), ".")
+							err := Call(pl + "_on" + funcName[len(funcName)-1])
+							if err != nil {
+								TermMessage(err)
+							}
+						}
+					}
 				}
-			} else {
-				v.eh.Insert(v.cursor.Loc(), "\t")
-				v.cursor.Right()
-			}
-			v.UpdateLines(v.cursor.y, v.cursor.y)
-		case tcell.KeyCtrlS:
-			v.Save()
-		case tcell.KeyCtrlF:
-			if v.cursor.HasSelection() {
-				searchStart = v.cursor.curSelection[1]
-			} else {
-				searchStart = ToCharPos(v.cursor.x, v.cursor.y, v.buf)
-			}
-			BeginSearch()
-		case tcell.KeyCtrlN:
-			if v.cursor.HasSelection() {
-				searchStart = v.cursor.curSelection[1]
-			} else {
-				searchStart = ToCharPos(v.cursor.x, v.cursor.y, v.buf)
 			}
-			messenger.Message("Find: " + lastSearch)
-			Search(lastSearch, v, true)
-		case tcell.KeyCtrlP:
-			if v.cursor.HasSelection() {
-				searchStart = v.cursor.curSelection[0]
-			} else {
-				searchStart = ToCharPos(v.cursor.x, v.cursor.y, v.buf)
-			}
-			messenger.Message("Find: " + lastSearch)
-			Search(lastSearch, v, false)
-		case tcell.KeyCtrlZ:
-			v.eh.Undo()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-		case tcell.KeyCtrlY:
-			v.eh.Redo()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-		case tcell.KeyCtrlC:
-			v.Copy()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-		case tcell.KeyCtrlX:
-			v.Cut()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-		case tcell.KeyCtrlV:
-			v.Paste()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-		case tcell.KeyCtrlA:
-			v.SelectAll()
-		case tcell.KeyCtrlO:
-			v.OpenFile()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
-		case tcell.KeyHome:
-			v.topline = 0
-			relocate = false
-		case tcell.KeyEnd:
-			if v.height > len(v.buf.lines) {
-				v.topline = 0
-			} else {
-				v.topline = len(v.buf.lines) - v.height
-			}
-			relocate = false
-		case tcell.KeyPgUp:
-			v.PageUp()
-			relocate = false
-		case tcell.KeyPgDn:
-			v.PageDown()
-			relocate = false
-		case tcell.KeyCtrlU:
-			v.HalfPageUp()
-			relocate = false
-		case tcell.KeyCtrlD:
-			v.HalfPageDown()
-			relocate = false
-		case tcell.KeyRune:
-			// Insert a character
-			if v.cursor.HasSelection() {
-				v.cursor.DeleteSelection()
-				v.cursor.ResetSelection()
-				// Rehighlight the entire buffer
-				v.UpdateLines(v.topline, v.topline+v.height)
-			} else {
-				v.UpdateLines(v.cursor.y, v.cursor.y)
-			}
-			v.eh.Insert(v.cursor.Loc(), string(e.Rune()))
-			v.cursor.Right()
 		}
+	case *tcell.EventPaste:
+		if v.Cursor.HasSelection() {
+			v.Cursor.DeleteSelection()
+			v.Cursor.ResetSelection()
+		}
+		clip := e.Text()
+		v.eh.Insert(v.Cursor.Loc(), clip)
+		v.Cursor.SetLoc(v.Cursor.Loc() + Count(clip))
+		v.freshClip = false
 	case *tcell.EventMouse:
 		x, y := e.Position()
 		x -= v.lineNumOffset - v.leftCol
-		y += v.topline
-		// Position always seems to be off by one
-		x--
-		y--
+		y += v.Topline
+		// Don't relocate for mouse events
+		relocate = false
 
 		button := e.Buttons()
 
 		switch button {
 		case tcell.Button1:
 			// Left click
-			origX, origY := v.cursor.x, v.cursor.y
-			v.MoveToMouseClick(x, y)
-
 			if v.mouseReleased {
-				if (time.Since(v.lastClickTime)/time.Millisecond < doubleClickThreshold) &&
-					(origX == v.cursor.x && origY == v.cursor.y) {
+				v.MoveToMouseClick(x, y)
+				if time.Since(v.lastClickTime)/time.Millisecond < doubleClickThreshold {
 					if v.doubleClick {
 						// Triple click
 						v.lastClickTime = time.Now()
@@ -549,7 +322,7 @@ func (v *View) HandleEvent(event tcell.Event) {
 						v.tripleClick = true
 						v.doubleClick = false
 
-						v.cursor.SelectLine()
+						v.Cursor.SelectLine()
 					} else {
 						// Double click
 						v.lastClickTime = time.Now()
@@ -557,27 +330,29 @@ func (v *View) HandleEvent(event tcell.Event) {
 						v.doubleClick = true
 						v.tripleClick = false
 
-						v.cursor.SelectWord()
+						v.Cursor.SelectWord()
 					}
 				} else {
 					v.doubleClick = false
 					v.tripleClick = false
 					v.lastClickTime = time.Now()
 
-					loc := v.cursor.Loc()
-					v.cursor.curSelection[0] = loc
-					v.cursor.curSelection[1] = loc
+					loc := v.Cursor.Loc()
+					v.Cursor.origSelection[0] = loc
+					v.Cursor.curSelection[0] = loc
+					v.Cursor.curSelection[1] = loc
 				}
-			} else {
+				v.mouseReleased = false
+			} else if !v.mouseReleased {
+				v.MoveToMouseClick(x, y)
 				if v.tripleClick {
-					v.cursor.AddLineToSelection()
+					v.Cursor.AddLineToSelection()
 				} else if v.doubleClick {
-					v.cursor.AddWordToSelection()
+					v.Cursor.AddWordToSelection()
 				} else {
-					v.cursor.curSelection[1] = v.cursor.Loc()
+					v.Cursor.curSelection[1] = v.Cursor.Loc()
 				}
 			}
-			v.mouseReleased = false
 		case tcell.ButtonNone:
 			// Mouse event with no click
 			if !v.mouseReleased {
@@ -591,73 +366,138 @@ func (v *View) HandleEvent(event tcell.Event) {
 
 				if !v.doubleClick && !v.tripleClick {
 					v.MoveToMouseClick(x, y)
-					v.cursor.curSelection[1] = v.cursor.Loc()
+					v.Cursor.curSelection[1] = v.Cursor.Loc()
 				}
 				v.mouseReleased = true
 			}
-			// We don't want to relocate because otherwise the view will be relocated
-			// every time the user moves the cursor
-			relocate = false
 		case tcell.WheelUp:
-			// Scroll up two lines
-			v.ScrollUp(2)
-			// We don't want to relocate if the user is scrolling
-			relocate = false
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
+			// Scroll up
+			scrollspeed := int(settings["scrollspeed"].(float64))
+			v.ScrollUp(scrollspeed)
 		case tcell.WheelDown:
-			// Scroll down two lines
-			v.ScrollDown(2)
-			// We don't want to relocate if the user is scrolling
-			relocate = false
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
+			// Scroll down
+			scrollspeed := int(settings["scrollspeed"].(float64))
+			v.ScrollDown(scrollspeed)
 		}
 	}
 
 	if relocate {
-		v.Relocate()
+		v.Relocate(scrollmargin)
 	}
-	if settings.Syntax {
+	if settings["syntax"].(bool) {
 		v.matches = Match(v)
 	}
 }
 
+// GutterMessage creates a message in this view's gutter
+func (v *View) GutterMessage(section string, lineN int, msg string, kind int) {
+	lineN--
+	gutterMsg := GutterMessage{
+		lineNum: lineN,
+		msg:     msg,
+		kind:    kind,
+	}
+	for _, v := range v.messages {
+		for _, gmsg := range v {
+			if gmsg.lineNum == lineN {
+				return
+			}
+		}
+	}
+	messages := v.messages[section]
+	v.messages[section] = append(messages, gutterMsg)
+}
+
+// ClearGutterMessages clears all gutter messages from a given section
+func (v *View) ClearGutterMessages(section string) {
+	v.messages[section] = []GutterMessage{}
+}
+
+// ClearAllGutterMessages clears all the gutter messages
+func (v *View) ClearAllGutterMessages() {
+	for k := range v.messages {
+		v.messages[k] = []GutterMessage{}
+	}
+}
+
 // DisplayView renders the view to the screen
 func (v *View) DisplayView() {
-	// matches := make(SyntaxMatches, len(v.buf.lines))
-	//
-	// viewStart := v.topline
-	// viewEnd := v.topline + v.height
-	// if viewEnd > len(v.buf.lines) {
-	// 	viewEnd = len(v.buf.lines)
-	// }
-	//
-	// lines := v.buf.lines[viewStart:viewEnd]
-	// for i, line := range lines {
-	// 	matches[i] = make([]tcell.Style, len(line))
-	// }
-
 	// The character number of the character in the top left of the screen
-
-	charNum := ToCharPos(0, v.topline, v.buf)
+	charNum := ToCharPos(0, v.Topline, v.Buf)
 
 	// Convert the length of buffer to a string, and get the length of the string
 	// We are going to have to offset by that amount
-	maxLineLength := len(strconv.Itoa(len(v.buf.lines)))
+	maxLineLength := len(strconv.Itoa(v.Buf.NumLines))
 	// + 1 for the little space after the line number
-	v.lineNumOffset = maxLineLength + 1
-
+	if settings["ruler"] == true {
+		v.lineNumOffset = maxLineLength + 1
+	} else {
+		v.lineNumOffset = 0
+	}
 	var highlightStyle tcell.Style
 
+	var hasGutterMessages bool
+	for _, v := range v.messages {
+		if len(v) > 0 {
+			hasGutterMessages = true
+		}
+	}
+	if hasGutterMessages {
+		v.lineNumOffset += 2
+	}
+
 	for lineN := 0; lineN < v.height; lineN++ {
 		var x int
 		// If the buffer is smaller than the view height
 		// and we went too far, break
-		if lineN+v.topline >= len(v.buf.lines) {
+		if lineN+v.Topline >= v.Buf.NumLines {
 			break
 		}
-		line := v.buf.lines[lineN+v.topline]
+		line := v.Buf.Lines[lineN+v.Topline]
+
+		if hasGutterMessages {
+			msgOnLine := false
+			for k := range v.messages {
+				for _, msg := range v.messages[k] {
+					if msg.lineNum == lineN+v.Topline {
+						msgOnLine = true
+						gutterStyle := tcell.StyleDefault
+						switch msg.kind {
+						case GutterInfo:
+							if style, ok := colorscheme["gutter-info"]; ok {
+								gutterStyle = style
+							}
+						case GutterWarning:
+							if style, ok := colorscheme["gutter-warning"]; ok {
+								gutterStyle = style
+							}
+						case GutterError:
+							if style, ok := colorscheme["gutter-error"]; ok {
+								gutterStyle = style
+							}
+						}
+						screen.SetContent(x, lineN, '>', nil, gutterStyle)
+						x++
+						screen.SetContent(x, lineN, '>', nil, gutterStyle)
+						x++
+						if v.Cursor.y == lineN+v.Topline {
+							messenger.Message(msg.msg)
+							messenger.gutterMessage = true
+						}
+					}
+				}
+			}
+			if !msgOnLine {
+				screen.SetContent(x, lineN, ' ', nil, tcell.StyleDefault)
+				x++
+				screen.SetContent(x, lineN, ' ', nil, tcell.StyleDefault)
+				x++
+				if v.Cursor.y == lineN+v.Topline && messenger.gutterMessage {
+					messenger.Reset()
+					messenger.gutterMessage = false
+				}
+			}
+		}
 
 		// Write the line number
 		lineNumStyle := defStyle
@@ -665,46 +505,40 @@ func (v *View) DisplayView() {
 			lineNumStyle = style
 		}
 		// Write the spaces before the line number if necessary
-		lineNum := strconv.Itoa(lineN + v.topline + 1)
-		for i := 0; i < maxLineLength-len(lineNum); i++ {
-			screen.SetContent(x, lineN, ' ', nil, lineNumStyle)
-			x++
-		}
-		// Write the actual line number
-		for _, ch := range lineNum {
-			screen.SetContent(x, lineN, ch, nil, lineNumStyle)
-			x++
-		}
-		// Write the extra space
-		screen.SetContent(x, lineN, ' ', nil, lineNumStyle)
-		x++
+		var lineNum string
+		if settings["ruler"] == true {
+			lineNum = strconv.Itoa(lineN + v.Topline + 1)
+			for i := 0; i < maxLineLength-len(lineNum); i++ {
+				screen.SetContent(x, lineN, ' ', nil, lineNumStyle)
+				x++
+			}
+			// Write the actual line number
+			for _, ch := range lineNum {
+				screen.SetContent(x, lineN, ch, nil, lineNumStyle)
+				x++
+			}
 
+			if settings["ruler"] == true {
+				// Write the extra space
+				screen.SetContent(x, lineN, ' ', nil, lineNumStyle)
+				x++
+			}
+		}
 		// Write the line
 		tabchars := 0
-		runes := []rune(line)
-		for colN := v.leftCol; colN < v.leftCol+v.width; colN++ {
-			if colN >= len(runes) {
-				break
-			}
-			ch := runes[colN]
+		for colN, ch := range line {
 			var lineStyle tcell.Style
-			// Does the current character need to be syntax highlighted?
 
-			// if lineN >= v.updateLines[0] && lineN < v.updateLines[1] {
-			if settings.Syntax {
+			if settings["syntax"].(bool) {
+				// Syntax highlighting is enabled
 				highlightStyle = v.matches[lineN][colN]
 			}
-			// } else if lineN < len(v.lastMatches) && colN < len(v.lastMatches[lineN]) {
-			// highlightStyle = v.lastMatches[lineN][colN]
-			// } else {
-			// highlightStyle = defStyle
-			// }
 
-			if v.cursor.HasSelection() &&
-				(charNum >= v.cursor.curSelection[0] && charNum < v.cursor.curSelection[1] ||
-					charNum < v.cursor.curSelection[0] && charNum >= v.cursor.curSelection[1]) {
+			if v.Cursor.HasSelection() &&
+				(charNum >= v.Cursor.curSelection[0] && charNum < v.Cursor.curSelection[1] ||
+					charNum < v.Cursor.curSelection[0] && charNum >= v.Cursor.curSelection[1]) {
 
-				lineStyle = defStyle.Reverse(true)
+				lineStyle = tcell.StyleDefault.Reverse(true)
 
 				if style, ok := colorscheme["selection"]; ok {
 					lineStyle = style
@@ -712,11 +546,25 @@ func (v *View) DisplayView() {
 			} else {
 				lineStyle = highlightStyle
 			}
-			// matches[lineN][colN] = highlightStyle
 
 			if ch == '\t' {
-				screen.SetContent(x+tabchars, lineN, ' ', nil, lineStyle)
-				tabSize := settings.TabSize
+				lineIndentStyle := defStyle
+				if style, ok := colorscheme["indent-char"]; ok {
+					lineIndentStyle = style
+				}
+				if v.Cursor.HasSelection() &&
+					(charNum >= v.Cursor.curSelection[0] && charNum < v.Cursor.curSelection[1] ||
+						charNum < v.Cursor.curSelection[0] && charNum >= v.Cursor.curSelection[1]) {
+
+					lineIndentStyle = tcell.StyleDefault.Reverse(true)
+
+					if style, ok := colorscheme["selection"]; ok {
+						lineIndentStyle = style
+					}
+				}
+				indentChar := []rune(settings["indentchar"].(string))
+				screen.SetContent(x-v.leftCol+tabchars, lineN, indentChar[0], nil, lineIndentStyle)
+				tabSize := int(settings["tabsize"].(float64))
 				for i := 0; i < tabSize-1; i++ {
 					tabchars++
 					if x-v.leftCol+tabchars >= v.lineNumOffset {
@@ -735,9 +583,9 @@ func (v *View) DisplayView() {
 
 		// The newline may be selected, in which case we should draw the selection style
 		// with a space to represent it
-		if v.cursor.HasSelection() &&
-			(charNum >= v.cursor.curSelection[0] && charNum < v.cursor.curSelection[1] ||
-				charNum < v.cursor.curSelection[0] && charNum >= v.cursor.curSelection[1]) {
+		if v.Cursor.HasSelection() &&
+			(charNum >= v.Cursor.curSelection[0] && charNum < v.Cursor.curSelection[1] ||
+				charNum < v.Cursor.curSelection[0] && charNum >= v.Cursor.curSelection[1]) {
 
 			selectStyle := defStyle.Reverse(true)
 
@@ -749,12 +597,13 @@ func (v *View) DisplayView() {
 
 		charNum++
 	}
-	// v.lastMatches = matches
 }
 
 // Display renders the view, the cursor, and statusline
 func (v *View) Display() {
 	v.DisplayView()
-	v.cursor.Display()
-	v.sline.Display()
+	v.Cursor.Display()
+	if settings["statusline"].(bool) {
+		v.sline.Display()
+	}
 }