X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fview.go;h=6ecce7c94208789685c95ff8ffaf5eb522441da6;hb=57f769c9a1b02537df94a8f117af5f45ab68c7c3;hp=b6707bef8f371d3c86cc26c0e5b0bedd33adb417;hpb=3d76898afef39b128789a80165c25e24f4576367;p=micro.git

diff --git a/cmd/micro/view.go b/cmd/micro/view.go
index b6707bef..6ecce7c9 100644
--- a/cmd/micro/view.go
+++ b/cmd/micro/view.go
@@ -1,22 +1,25 @@
 package main
 
 import (
-	"github.com/atotto/clipboard"
-	"github.com/gdamore/tcell"
-	"io/ioutil"
+	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/mattn/go-runewidth"
+	"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
+	// A pointer to the buffer's cursor for ease of access
+	Cursor *Cursor
 
 	// The topmost line, used for vertical scrolling
-	topline int
+	Topline int
 	// The leftmost column, used for horizontal scrolling
 	leftCol int
 
@@ -28,14 +31,31 @@ type View struct {
 	width  int
 	height int
 
+	// Where this view is located
+	x, y int
+
 	// How much to offset because of line numbers
 	lineNumOffset int
 
-	// The eventhandler for undo/redo
-	eh *EventHandler
+	// Holds the list of gutter messages
+	messages map[string][]GutterMessage
+
+	// Is the help text opened in this view
+	helpOpen bool
+
+	// This is the index of this view in the views array
+	Num int
+	// What tab is this view stored in
+	TabNum int
+
+	// Is this view modifiable?
+	Modifiable bool
 
 	// The buffer
-	buf *Buffer
+	Buf *Buffer
+	// This is the buffer that was last opened
+	// This is used to open help, and then go back to the previously opened buffer
+	lastBuffer *Buffer
 	// The statusline
 	sline Statusline
 
@@ -49,6 +69,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
@@ -72,13 +99,15 @@ func NewView(buf *Buffer) *View {
 func NewViewWidthHeight(buf *Buffer, w, h int) *View {
 	v := new(View)
 
+	v.x, v.y = 0, 0
+
 	v.widthPercent = w
 	v.heightPercent = h
 	v.Resize(screen.Size())
 
 	v.OpenBuffer(buf)
 
-	v.eh = NewEventHandler(v)
+	v.messages = make(map[string][]GutterMessage)
 
 	v.sline = Statusline{
 		view: v,
@@ -94,68 +123,37 @@ func NewViewWidthHeight(buf *Buffer, w, h int) *View {
 func (v *View) Resize(w, h int) {
 	// Always include 1 line for the command line at the bottom
 	h--
+	if len(tabs) > 1 {
+		// Include one line for the tab bar at the top
+		h--
+		v.y = 1
+	}
 	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++
 	}
 }
 
@@ -164,8 +162,8 @@ 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() {
-		quit, canceled := messenger.Prompt("You have unsaved changes. " + msg)
+	if v.Buf.IsModified {
+		quit, canceled := messenger.Prompt("You have unsaved changes. "+msg, "Unsaved")
 		if !canceled {
 			if strings.ToLower(quit) == "yes" || strings.ToLower(quit) == "y" {
 				return true
@@ -180,90 +178,19 @@ 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")
-		}
-	}
-}
-
-// 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")
-	}
-}
-
-// 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
-}
-
 // 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
+	screen.Clear()
+	v.CloseBuffer()
+	v.Buf = buf
+	v.Cursor = &buf.Cursor
+	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.Cursor.ResetSelection()
+	v.Relocate()
+	v.messages = make(map[string][]GutterMessage)
 
-	v.eh = NewEventHandler(v)
 	v.matches = Match(v)
 
 	// Set mouseReleased to true because we assume the mouse is not being pressed when
@@ -272,22 +199,20 @@ func (v *View) OpenBuffer(buf *Buffer) {
 	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() {
-	if v.CanClose("Continue? (yes, no, save) ") {
-		filename, canceled := messenger.Prompt("File to open: ")
-		if canceled {
-			return
-		}
-		file, err := ioutil.ReadFile(filename)
+// CloseBuffer performs any closing functions on the buffer
+func (v *View) CloseBuffer() {
+	if v.Buf != nil {
+		v.Buf.Serialize()
+	}
+}
 
-		if err != nil {
-			messenger.Error(err.Error())
-			return
-		}
-		buf := NewBuffer(string(file), filename)
-		v.OpenBuffer(buf)
+// ReOpen reloads the current buffer
+func (v *View) ReOpen() {
+	if v.CanClose("Continue? (yes, no, save) ") {
+		screen.Clear()
+		v.Buf.ReOpen()
+		v.Relocate()
+		v.matches = Match(v)
 	}
 }
 
@@ -295,17 +220,24 @@ func (v *View) OpenFile() {
 // This is useful if the user has scrolled far away, and then starts typing
 func (v *View) Relocate() bool {
 	ret := false
-	cy := v.cursor.y
-	if cy < v.topline {
-		v.topline = cy
+	cy := v.Cursor.Y
+	scrollmargin := int(settings["scrollmargin"].(float64))
+	if cy < v.Topline+scrollmargin && cy > scrollmargin-1 {
+		v.Topline = cy - scrollmargin
+		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-scrollmargin && cy < v.Buf.NumLines-scrollmargin {
+		v.Topline = cy - v.height + 1 + scrollmargin
+		ret = true
+	} else if cy >= v.Buf.NumLines-scrollmargin && cy > v.height {
+		v.Topline = v.Buf.NumLines - v.height
 		ret = true
 	}
 
-	cx := v.cursor.GetVisualX()
+	cx := v.Cursor.GetVisualX()
 	if cx < v.leftCol {
 		v.leftCol = cx
 		ret = true
@@ -320,12 +252,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
@@ -334,13 +266,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.Line(y)) {
+		x = Count(v.Buf.Line(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
@@ -349,188 +281,69 @@ func (v *View) HandleEvent(event tcell.Event) {
 	// By default it's true because most events should cause a relocate
 	relocate := true
 
+	v.Buf.CheckModTime()
+
 	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")
-			ws := GetLeadingWhitespace(v.buf.lines[v.cursor.y])
-			v.cursor.Right()
-
-			if settings.AutoIndent {
-				v.eh.Insert(v.cursor.Loc(), ws)
-				for i := 0; i < len(ws); i++ {
-					v.cursor.Right()
-				}
-			}
-			v.cursor.lastVisualX = v.cursor.GetVisualX()
-		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()
-		case tcell.KeyBackspace2, tcell.KeyBackspace:
-			// Delete a character
-			if v.cursor.HasSelection() {
-				v.cursor.DeleteSelection()
-				v.cursor.ResetSelection()
-			} 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
-
-				// If the user is using spaces instead of tabs and they are deleting
-				// whitespace at the start of the line, we should delete as if its a
-				// tab (tabSize number of spaces)
-				lineStart := v.buf.lines[v.cursor.y][:v.cursor.x]
-				if settings.TabsToSpaces && IsSpaces(lineStart) && len(lineStart) != 0 && len(lineStart)%settings.TabSize == 0 {
-					loc := v.cursor.Loc()
-					v.cursor.SetLoc(loc - settings.TabSize)
-					cx, cy := v.cursor.x, v.cursor.y
-					v.cursor.SetLoc(loc)
-					v.eh.Remove(loc-settings.TabSize, loc)
-					v.cursor.x, v.cursor.y = cx, cy
-				} else {
-					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
-				}
-			}
-			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 && e.Modifiers() == 0 {
+			// 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.Buf.Insert(v.Cursor.Loc, string(e.Rune()))
+			v.Cursor.Right()
+		} else {
+			for key, actions := range bindings {
+				if e.Key() == key.keyCode {
+					if e.Key() == tcell.KeyRune {
+						if e.Rune() != key.r {
+							continue
+						}
+					}
+					if e.Modifiers() == key.modifiers {
+						relocate = false
+						for _, action := range actions {
+							relocate = action(v) || relocate
+							for _, pl := range loadedPlugins {
+								funcName := strings.Split(runtime.FuncForPC(reflect.ValueOf(action).Pointer()).Name(), ".")
+								err := Call(pl+"_on"+funcName[len(funcName)-1], nil)
+								if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
+									TermMessage(err)
+								}
+							}
+						}
+					}
 				}
-			} else {
-				v.eh.Insert(v.cursor.Loc(), "\t")
-				v.cursor.Right()
-			}
-		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()
-		case tcell.KeyCtrlY:
-			v.eh.Redo()
-		case tcell.KeyCtrlC:
-			v.Copy()
-		case tcell.KeyCtrlX:
-			v.Cut()
-		case tcell.KeyCtrlV:
-			v.Paste()
-		case tcell.KeyCtrlA:
-			v.SelectAll()
-		case tcell.KeyCtrlO:
-			v.OpenFile()
-		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()
-			}
-			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.Buf.Insert(v.Cursor.Loc, clip)
+		v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
+		v.freshClip = false
 	case *tcell.EventMouse:
 		x, y := e.Position()
 		x -= v.lineNumOffset - v.leftCol
-		y += v.topline
+		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
-
-			if v.mouseReleased && !e.HasMotion() {
+			if v.mouseReleased {
 				v.MoveToMouseClick(x, y)
-				if (time.Since(v.lastClickTime)/time.Millisecond < doubleClickThreshold) &&
-					(origX == v.cursor.x && origY == v.cursor.y) {
+				if time.Since(v.lastClickTime)/time.Millisecond < doubleClickThreshold {
 					if v.doubleClick {
 						// Triple click
 						v.lastClickTime = time.Now()
@@ -538,7 +351,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()
@@ -546,26 +359,26 @@ 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
+					v.Cursor.OrigSelection[0] = v.Cursor.Loc
+					v.Cursor.CurSelection[0] = v.Cursor.Loc
+					v.Cursor.CurSelection[1] = v.Cursor.Loc
 				}
 				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
 				}
 			}
 		case tcell.ButtonNone:
@@ -581,55 +394,142 @@ 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
+			// 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
+			// Scroll down
+			scrollspeed := int(settings["scrollspeed"].(float64))
+			v.ScrollDown(scrollspeed)
 		}
 	}
 
 	if relocate {
 		v.Relocate()
 	}
-	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() {
 	// The character number of the character in the top left of the screen
-	charNum := ToCharPos(0, v.topline, v.buf)
+	charNum := Loc{0, v.Topline}
 
 	// 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
+		x := v.x
 		// If the buffer is smaller than the view height
-		// and we went too far, break
-		if lineN+v.topline >= len(v.buf.lines) {
-			break
+		if lineN+v.Topline >= v.Buf.NumLines {
+			// We have to clear all this space
+			for i := 0; i < v.width; i++ {
+				screen.SetContent(i, lineN+v.y, ' ', nil, defStyle)
+			}
+
+			continue
+		}
+		line := v.Buf.Line(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+v.y, '>', nil, gutterStyle)
+						x++
+						screen.SetContent(x, lineN+v.y, '>', nil, gutterStyle)
+						x++
+						if v.Cursor.Y == lineN+v.Topline {
+							messenger.Message(msg.msg)
+							messenger.gutterMessage = true
+						}
+					}
+				}
+			}
+			if !msgOnLine {
+				screen.SetContent(x, lineN+v.y, ' ', nil, tcell.StyleDefault)
+				x++
+				screen.SetContent(x, lineN+v.y, ' ', nil, tcell.StyleDefault)
+				x++
+				if v.Cursor.Y == lineN+v.Topline && messenger.gutterMessage {
+					messenger.Reset()
+					messenger.gutterMessage = false
+				}
+			}
 		}
-		line := v.buf.lines[lineN+v.topline]
 
 		// Write the line number
 		lineNumStyle := defStyle
@@ -637,39 +537,39 @@ 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+v.y, ' ', nil, lineNumStyle)
+				x++
+			}
+			// Write the actual line number
+			for _, ch := range lineNum {
+				screen.SetContent(x, lineN+v.y, ch, 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
+			if settings["ruler"] == true {
+				// Write the extra space
+				screen.SetContent(x, lineN+v.y, ' ', nil, lineNumStyle)
+				x++
 			}
-			ch := runes[colN]
+		}
+		// Write the line
+		for colN, ch := range line {
 			var lineStyle tcell.Style
-			if settings.Syntax {
+
+			if settings["syntax"].(bool) {
 				// Syntax highlighting is enabled
 				highlightStyle = v.matches[lineN][colN]
 			}
 
-			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.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
+					charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
 
-				lineStyle = defStyle.Reverse(true)
+				lineStyle = tcell.StyleDefault.Reverse(true)
 
 				if style, ok := colorscheme["selection"]; ok {
 					lineStyle = style
@@ -678,47 +578,112 @@ func (v *View) DisplayView() {
 				lineStyle = highlightStyle
 			}
 
+			if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
+				if style, ok := colorscheme["cursor-line"]; ok {
+					fg, _, _ := style.Decompose()
+					lineStyle = lineStyle.Background(fg)
+				}
+			}
+
 			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.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
+						charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
+
+					lineIndentStyle = tcell.StyleDefault.Reverse(true)
+
+					if style, ok := colorscheme["selection"]; ok {
+						lineIndentStyle = style
+					}
+				}
+				if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
+					if style, ok := colorscheme["cursor-line"]; ok {
+						fg, _, _ := style.Decompose()
+						lineIndentStyle = lineIndentStyle.Background(fg)
+					}
+				}
+				indentChar := []rune(settings["indentchar"].(string))
+				if x-v.leftCol >= v.lineNumOffset {
+					screen.SetContent(x-v.leftCol, lineN+v.y, indentChar[0], nil, lineIndentStyle)
+				}
+				tabSize := int(settings["tabsize"].(float64))
 				for i := 0; i < tabSize-1; i++ {
-					tabchars++
-					if x-v.leftCol+tabchars >= v.lineNumOffset {
-						screen.SetContent(x-v.leftCol+tabchars, lineN, ' ', nil, lineStyle)
+					x++
+					if x-v.leftCol >= v.lineNumOffset {
+						screen.SetContent(x-v.leftCol, lineN+v.y, ' ', nil, lineStyle)
+					}
+				}
+			} else if runewidth.RuneWidth(ch) > 1 {
+				if x-v.leftCol >= v.lineNumOffset {
+					screen.SetContent(x-v.leftCol, lineN, ch, nil, lineStyle)
+				}
+				for i := 0; i < runewidth.RuneWidth(ch)-1; i++ {
+					x++
+					if x-v.leftCol >= v.lineNumOffset {
+						screen.SetContent(x-v.leftCol, lineN, ' ', nil, lineStyle)
 					}
 				}
 			} else {
-				if x-v.leftCol+tabchars >= v.lineNumOffset {
-					screen.SetContent(x-v.leftCol+tabchars, lineN, ch, nil, lineStyle)
+				if x-v.leftCol >= v.lineNumOffset {
+					screen.SetContent(x-v.leftCol, lineN+v.y, ch, nil, lineStyle)
 				}
 			}
-			charNum++
+			charNum = charNum.Move(1, v.Buf)
 			x++
 		}
 		// Here we are at a newline
 
 		// 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.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
+				charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
 
 			selectStyle := defStyle.Reverse(true)
 
 			if style, ok := colorscheme["selection"]; ok {
 				selectStyle = style
 			}
-			screen.SetContent(x-v.leftCol+tabchars, lineN, ' ', nil, selectStyle)
+			screen.SetContent(x-v.leftCol, lineN+v.y, ' ', nil, selectStyle)
+			x++
 		}
 
-		charNum++
+		charNum = charNum.Move(1, v.Buf)
+
+		for i := 0; i < v.width-(x-v.leftCol); i++ {
+			lineStyle := tcell.StyleDefault
+			if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
+				if style, ok := colorscheme["cursor-line"]; ok {
+					fg, _, _ := style.Decompose()
+					lineStyle = lineStyle.Background(fg)
+				}
+			}
+			if !(x-v.leftCol < v.lineNumOffset) {
+				screen.SetContent(x+i, lineN+v.y, ' ', nil, lineStyle)
+			}
+		}
+	}
+}
+
+// DisplayCursor draws the current buffer's cursor to the screen
+func (v *View) DisplayCursor() {
+	// Don't draw the cursor if it is out of the viewport or if it has a selection
+	if (v.Cursor.Y-v.Topline < 0 || v.Cursor.Y-v.Topline > v.height-1) || v.Cursor.HasSelection() {
+		screen.HideCursor()
+	} else {
+		screen.ShowCursor(v.x+v.Cursor.GetVisualX()+v.lineNumOffset-v.leftCol, v.Cursor.Y-v.Topline+v.y)
 	}
-	// v.lastMatches = matches
 }
 
 // Display renders the view, the cursor, and statusline
 func (v *View) Display() {
 	v.DisplayView()
-	v.cursor.Display()
-	v.sline.Display()
+	v.DisplayCursor()
+	if settings["statusline"].(bool) {
+		v.sline.Display()
+	}
 }