]> git.lizzy.rs Git - micro.git/blobdiff - cmd/micro/view.go
Copy to primary clipboard for any change in selection
[micro.git] / cmd / micro / view.go
index 0694b17f2ac6f3252894d82d9c595498a207f1ea..996ac8bdd39cde4e67e443c5fbc07f2f34453485 100644 (file)
@@ -1,8 +1,6 @@
 package main
 
 import (
-       "reflect"
-       "runtime"
        "strconv"
        "strings"
        "time"
@@ -27,6 +25,9 @@ type View struct {
        widthPercent  int
        heightPercent int
 
+       // Specifies whether or not this view holds a help buffer
+       Help bool
+
        // Actual with and height
        width  int
        height int
@@ -40,22 +41,13 @@ type View struct {
        // 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
-       // 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
 
@@ -85,25 +77,27 @@ type View struct {
 
        // Syntax highlighting matches
        matches SyntaxMatches
-       // The matches from the last frame
-       lastMatches SyntaxMatches
+
+       splitNode *LeafNode
 }
 
 // NewView returns a new fullscreen view
 func NewView(buf *Buffer) *View {
-       return NewViewWidthHeight(buf, 100, 100)
+       screenW, screenH := screen.Size()
+       return NewViewWidthHeight(buf, screenW, screenH)
 }
 
-// NewViewWidthHeight returns a new view with the specified width and height percentages
-// Note that w and h are percentages not actual values
+// NewViewWidthHeight returns a new view with the specified width and height
+// Note that w and h are raw column and row values
 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.width = w
+       v.height = h
+
+       v.ToggleTabbar()
 
        v.OpenBuffer(buf)
 
@@ -113,30 +107,56 @@ func NewViewWidthHeight(buf *Buffer, w, h int) *View {
                view: v,
        }
 
+       if v.Buf.Settings["statusline"].(bool) {
+               v.height--
+       }
+
+       for _, pl := range loadedPlugins {
+               _, err := Call(pl+".onViewOpen", v)
+               if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
+                       TermMessage(err)
+                       continue
+               }
+       }
+
        return v
 }
 
-// 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
-// the percentages have changed
-func (v *View) Resize(w, h int) {
-       // Always include 1 line for the command line at the bottom
-       h--
+func (v *View) ToggleStatusLine() {
+       if v.Buf.Settings["statusline"].(bool) {
+               v.height--
+       } else {
+               v.height++
+       }
+}
+
+func (v *View) ToggleTabbar() {
        if len(tabs) > 1 {
-               // Include one line for the tab bar at the top
-               h--
-               v.y = 1
+               if v.y == 0 {
+                       // Include one line for the tab bar at the top
+                       v.height--
+                       v.y = 1
+               }
        } else {
-               v.y = 0
+               if v.y == 1 {
+                       v.y = 0
+                       v.height++
+               }
        }
-       v.width = int(float32(w) * float32(v.widthPercent) / 100)
-       // We subtract 1 for the statusline
-       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--
+}
+
+func (v *View) paste(clip string) {
+       leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y))
+
+       if v.Cursor.HasSelection() {
+               v.Cursor.DeleteSelection()
+               v.Cursor.ResetSelection()
        }
+       clip = strings.Replace(clip, "\n", "\n"+leadingWS, -1)
+       v.Buf.Insert(v.Cursor.Loc, clip)
+       v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
+       v.freshClip = false
+       messenger.Message("Pasted clipboard")
 }
 
 // ScrollUp scrolls the view up n lines (if possible)
@@ -163,14 +183,14 @@ func (v *View) ScrollDown(n int) {
 // If there are unsaved changes, the user will be asked if the view can be closed
 // 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 {
+func (v *View) CanClose(msg string, responses ...rune) bool {
        if v.Buf.IsModified {
-               quit, canceled := messenger.Prompt("You have unsaved changes. "+msg, "Unsaved")
+               char, canceled := messenger.LetterPrompt("You have unsaved changes. "+msg, responses...)
                if !canceled {
-                       if strings.ToLower(quit) == "yes" || strings.ToLower(quit) == "y" {
+                       if char == 'y' {
                                return true
-                       } else if strings.ToLower(quit) == "save" || strings.ToLower(quit) == "s" {
-                               v.Save()
+                       } else if char == 's' {
+                               v.Save(true)
                                return true
                        }
                }
@@ -191,6 +211,7 @@ func (v *View) OpenBuffer(buf *Buffer) {
        v.leftCol = 0
        v.Cursor.ResetSelection()
        v.Relocate()
+       v.Center(false)
        v.messages = make(map[string][]GutterMessage)
 
        v.matches = Match(v)
@@ -210,7 +231,7 @@ func (v *View) CloseBuffer() {
 
 // ReOpen reloads the current buffer
 func (v *View) ReOpen() {
-       if v.CanClose("Continue? (yes, no, save) ") {
+       if v.CanClose("Continue? (y,n,s) ", 'y', 'n', 's') {
                screen.Clear()
                v.Buf.ReOpen()
                v.Relocate()
@@ -218,12 +239,26 @@ func (v *View) ReOpen() {
        }
 }
 
+// HSplit opens a horizontal split with the given buffer
+func (v *View) HSplit(buf *Buffer) bool {
+       v.splitNode.HSplit(buf)
+       tabs[v.TabNum].Resize()
+       return false
+}
+
+// VSplit opens a vertical split with the given buffer
+func (v *View) VSplit(buf *Buffer) bool {
+       v.splitNode.VSplit(buf)
+       tabs[v.TabNum].Resize()
+       return false
+}
+
 // 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 {
        ret := false
        cy := v.Cursor.Y
-       scrollmargin := int(settings["scrollmargin"].(float64))
+       scrollmargin := int(v.Buf.Settings["scrollmargin"].(float64))
        if cy < v.Topline+scrollmargin && cy > scrollmargin-1 {
                v.Topline = cy - scrollmargin
                ret = true
@@ -288,9 +323,9 @@ func (v *View) HandleEvent(event tcell.Event) {
        switch e := event.(type) {
        case *tcell.EventResize:
                // Window resized
-               v.Resize(e.Size())
+               tabs[v.TabNum].Resize()
        case *tcell.EventKey:
-               if e.Key() == tcell.KeyRune && e.Modifiers() == 0 {
+               if e.Key() == tcell.KeyRune && (e.Modifiers() == 0 || e.Modifiers() == tcell.ModShift) {
                        // Insert a character
                        if v.Cursor.HasSelection() {
                                v.Cursor.DeleteSelection()
@@ -298,6 +333,13 @@ func (v *View) HandleEvent(event tcell.Event) {
                        }
                        v.Buf.Insert(v.Cursor.Loc, string(e.Rune()))
                        v.Cursor.Right()
+
+                       for _, pl := range loadedPlugins {
+                               _, err := Call(pl+".onRune", string(e.Rune()), v)
+                               if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
+                                       TermMessage(err)
+                               }
+                       }
                } else {
                        for key, actions := range bindings {
                                if e.Key() == key.keyCode {
@@ -309,32 +351,35 @@ func (v *View) HandleEvent(event tcell.Event) {
                                        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)
-                                                               }
-                                                       }
+                                                       relocate = action(v, true) || relocate
                                                }
                                        }
                                }
                        }
                }
        case *tcell.EventPaste:
+               if !PreActionCall("Paste", v) {
+                       break
+               }
+
+               leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y))
+
                if v.Cursor.HasSelection() {
                        v.Cursor.DeleteSelection()
                        v.Cursor.ResetSelection()
                }
                clip := e.Text()
+               clip = strings.Replace(clip, "\n", "\n"+leadingWS, -1)
                v.Buf.Insert(v.Cursor.Loc, clip)
                v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
                v.freshClip = false
+               messenger.Message("Pasted clipboard")
+
+               PostActionCall("Paste", v)
        case *tcell.EventMouse:
                x, y := e.Position()
-               x -= v.lineNumOffset - v.leftCol
-               y += v.Topline
+               x -= v.lineNumOffset - v.leftCol + v.x
+               y += v.Topline - v.y
                // Don't relocate for mouse events
                relocate = false
 
@@ -369,8 +414,8 @@ func (v *View) HandleEvent(event tcell.Event) {
                                        v.lastClickTime = time.Now()
 
                                        v.Cursor.OrigSelection[0] = v.Cursor.Loc
-                                       v.Cursor.CurSelection[0] = v.Cursor.Loc
-                                       v.Cursor.CurSelection[1] = v.Cursor.Loc
+                                       v.Cursor.SetSelectionStart(v.Cursor.Loc)
+                                       v.Cursor.SetSelectionEnd(v.Cursor.Loc)
                                }
                                v.mouseReleased = false
                        } else if !v.mouseReleased {
@@ -380,9 +425,13 @@ func (v *View) HandleEvent(event tcell.Event) {
                                } else if v.doubleClick {
                                        v.Cursor.AddWordToSelection()
                                } else {
-                                       v.Cursor.CurSelection[1] = v.Cursor.Loc
+                                       v.Cursor.SetSelectionEnd(v.Cursor.Loc)
                                }
                        }
+               case tcell.Button2:
+                       // Middle mouse button was clicked,
+                       // We should paste primary
+                       v.PastePrimary(true)
                case tcell.ButtonNone:
                        // Mouse event with no click
                        if !v.mouseReleased {
@@ -396,17 +445,17 @@ 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.SetSelectionEnd(v.Cursor.Loc)
                                }
                                v.mouseReleased = true
                        }
                case tcell.WheelUp:
                        // Scroll up
-                       scrollspeed := int(settings["scrollspeed"].(float64))
+                       scrollspeed := int(v.Buf.Settings["scrollspeed"].(float64))
                        v.ScrollUp(scrollspeed)
                case tcell.WheelDown:
                        // Scroll down
-                       scrollspeed := int(settings["scrollspeed"].(float64))
+                       scrollspeed := int(v.Buf.Settings["scrollspeed"].(float64))
                        v.ScrollDown(scrollspeed)
                }
        }
@@ -414,7 +463,7 @@ func (v *View) HandleEvent(event tcell.Event) {
        if relocate {
                v.Relocate()
        }
-       if settings["syntax"].(bool) {
+       if v.Buf.Settings["syntax"].(bool) {
                v.matches = Match(v)
        }
 }
@@ -450,22 +499,44 @@ func (v *View) ClearAllGutterMessages() {
        }
 }
 
+// Opens the given help page in a new horizontal split
+func (v *View) openHelp(helpPage string) {
+       if v.Help {
+               helpBuffer := NewBuffer([]byte(helpPages[helpPage]), helpPage+".md")
+               helpBuffer.Name = "Help"
+               v.OpenBuffer(helpBuffer)
+       } else {
+               helpBuffer := NewBuffer([]byte(helpPages[helpPage]), helpPage+".md")
+               helpBuffer.Name = "Help"
+               v.HSplit(helpBuffer)
+               CurView().Help = true
+       }
+}
+
+func (v *View) drawCell(x, y int, ch rune, combc []rune, style tcell.Style) {
+       if x >= v.x && x < v.x+v.width && y >= v.y && y < v.y+v.height {
+               screen.SetContent(x, y, ch, combc, style)
+       }
+}
+
 // DisplayView renders the view to the screen
 func (v *View) DisplayView() {
-       // The character number of the character in the top left of the screen
+       // The charNum we are currently displaying
+       // starts at the start of the viewport
        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(v.Buf.NumLines))
-       // + 1 for the little space after the line number
-       if settings["ruler"] == true {
+
+       if v.Buf.Settings["ruler"] == true {
+               // + 1 for the little space after the line number
                v.lineNumOffset = maxLineLength + 1
        } else {
                v.lineNumOffset = 0
        }
-       var highlightStyle tcell.Style
 
+       // We need to add to the line offset if there are gutter messages
        var hasGutterMessages bool
        for _, v := range v.messages {
                if len(v) > 0 {
@@ -476,26 +547,49 @@ func (v *View) DisplayView() {
                v.lineNumOffset += 2
        }
 
-       for lineN := 0; lineN < v.height; lineN++ {
-               x := v.x
-               // If the buffer is smaller than the view height
-               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)
+       if v.x != 0 {
+               // One space for the extra split divider
+               v.lineNumOffset++
+       }
+
+       // These represent the current screen coordinates
+       screenX, screenY := 0, 0
+
+       highlightStyle := defStyle
+
+       // ViewLine is the current line from the top of the viewport
+       for viewLine := 0; viewLine < v.height; viewLine++ {
+               screenY = v.y + viewLine
+               screenX = v.x
+
+               // This is the current line number of the buffer that we are drawing
+               curLineN := viewLine + v.Topline
+
+               if v.x != 0 {
+                       // Draw the split divider
+                       v.drawCell(screenX, screenY, '|', nil, defStyle.Reverse(true))
+                       screenX++
+               }
+
+               // If the buffer is smaller than the view height we have to clear all this space
+               if curLineN >= v.Buf.NumLines {
+                       for i := screenX; i < v.x+v.width; i++ {
+                               v.drawCell(i, screenY, ' ', nil, defStyle)
                        }
 
                        continue
                }
-               line := v.Buf.Line(lineN + v.Topline)
+               line := v.Buf.Line(curLineN)
 
+               // If there are gutter messages we need to display the '>>' symbol here
                if hasGutterMessages {
+                       // msgOnLine stores whether or not there is a gutter message on this line in particular
                        msgOnLine := false
                        for k := range v.messages {
                                for _, msg := range v.messages[k] {
-                                       if msg.lineNum == lineN+v.Topline {
+                                       if msg.lineNum == curLineN {
                                                msgOnLine = true
-                                               gutterStyle := tcell.StyleDefault
+                                               gutterStyle := defStyle
                                                switch msg.kind {
                                                case GutterInfo:
                                                        if style, ok := colorscheme["gutter-info"]; ok {
@@ -510,68 +604,75 @@ func (v *View) DisplayView() {
                                                                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 {
+                                               v.drawCell(screenX, screenY, '>', nil, gutterStyle)
+                                               screenX++
+                                               v.drawCell(screenX, screenY, '>', nil, gutterStyle)
+                                               screenX++
+                                               if v.Cursor.Y == curLineN && !messenger.hasPrompt {
                                                        messenger.Message(msg.msg)
                                                        messenger.gutterMessage = true
                                                }
                                        }
                                }
                        }
+                       // If there is no message on this line we just display an empty offset
                        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 {
+                               v.drawCell(screenX, screenY, ' ', nil, defStyle)
+                               screenX++
+                               v.drawCell(screenX, screenY, ' ', nil, defStyle)
+                               screenX++
+                               if v.Cursor.Y == curLineN && messenger.gutterMessage {
                                        messenger.Reset()
                                        messenger.gutterMessage = false
                                }
                        }
                }
 
-               // Write the line number
-               lineNumStyle := defStyle
-               if style, ok := colorscheme["line-number"]; ok {
-                       lineNumStyle = style
-               }
-               // Write the spaces before the line number if necessary
-               var lineNum string
-               if settings["ruler"] == true {
-                       lineNum = strconv.Itoa(lineN + v.Topline + 1)
+               if v.Buf.Settings["ruler"] == true {
+                       // Write the line number
+                       lineNumStyle := defStyle
+                       if style, ok := colorscheme["line-number"]; ok {
+                               lineNumStyle = style
+                       }
+                       if style, ok := colorscheme["current-line-number"]; ok {
+                               if curLineN == v.Cursor.Y && tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() {
+                                       lineNumStyle = style
+                               }
+                       }
+
+                       lineNum := strconv.Itoa(curLineN + 1)
+
+                       // Write the spaces before the line number if necessary
                        for i := 0; i < maxLineLength-len(lineNum); i++ {
-                               screen.SetContent(x, lineN+v.y, ' ', nil, lineNumStyle)
-                               x++
+                               v.drawCell(screenX, screenY, ' ', nil, lineNumStyle)
+                               screenX++
                        }
                        // Write the actual line number
                        for _, ch := range lineNum {
-                               screen.SetContent(x, lineN+v.y, ch, nil, lineNumStyle)
-                               x++
+                               v.drawCell(screenX, screenY, ch, nil, lineNumStyle)
+                               screenX++
                        }
 
-                       if settings["ruler"] == true {
-                               // Write the extra space
-                               screen.SetContent(x, lineN+v.y, ' ', nil, lineNumStyle)
-                               x++
-                       }
+                       // Write the extra space
+                       v.drawCell(screenX, screenY, ' ', nil, lineNumStyle)
+                       screenX++
                }
-               // Write the line
-               for colN, ch := range line {
-                       var lineStyle tcell.Style
 
-                       if settings["syntax"].(bool) {
+               // Now we actually draw the line
+               colN := 0
+               for _, ch := range line {
+                       lineStyle := defStyle
+
+                       if v.Buf.Settings["syntax"].(bool) {
                                // Syntax highlighting is enabled
-                               highlightStyle = v.matches[lineN][colN]
+                               highlightStyle = v.matches[viewLine][colN]
                        }
 
                        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 = tcell.StyleDefault.Reverse(true)
+                               // The current character is selected
+                               lineStyle = defStyle.Reverse(true)
 
                                if style, ok := colorscheme["selection"]; ok {
                                        lineStyle = style
@@ -580,7 +681,9 @@ func (v *View) DisplayView() {
                                lineStyle = highlightStyle
                        }
 
-                       if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
+                       // We need to display the background of the linestyle with the correct color if cursorline is enabled
+                       // and this is the current view and there is no selection on this line and the cursor is on this line
+                       if v.Buf.Settings["cursorline"].(bool) && tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() && v.Cursor.Y == curLineN {
                                if style, ok := colorscheme["cursor-line"]; ok {
                                        fg, _, _ := style.Decompose()
                                        lineStyle = lineStyle.Background(fg)
@@ -588,6 +691,10 @@ func (v *View) DisplayView() {
                        }
 
                        if ch == '\t' {
+                               // If the character we are displaying is a tab, we need to do a bunch of special things
+
+                               // First the user may have configured an `indent-char` to be displayed to show that this
+                               // is a tab character
                                lineIndentStyle := defStyle
                                if style, ok := colorscheme["indent-char"]; ok {
                                        lineIndentStyle = style
@@ -596,46 +703,49 @@ func (v *View) DisplayView() {
                                        (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)
+                                       lineIndentStyle = defStyle.Reverse(true)
 
                                        if style, ok := colorscheme["selection"]; ok {
                                                lineIndentStyle = style
                                        }
                                }
-                               if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
+                               if v.Buf.Settings["cursorline"].(bool) && tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() && v.Cursor.Y == curLineN {
                                        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)
+                               // Here we get the indent char
+                               indentChar := []rune(v.Buf.Settings["indentchar"].(string))
+                               if screenX-v.x-v.leftCol >= v.lineNumOffset {
+                                       v.drawCell(screenX-v.leftCol, screenY, indentChar[0], nil, lineIndentStyle)
                                }
-                               tabSize := int(settings["tabsize"].(float64))
+                               // Now the tab has to be displayed as a bunch of spaces
+                               tabSize := int(v.Buf.Settings["tabsize"].(float64))
                                for i := 0; i < tabSize-1; i++ {
-                                       x++
-                                       if x-v.leftCol >= v.lineNumOffset {
-                                               screen.SetContent(x-v.leftCol, lineN+v.y, ' ', nil, lineStyle)
+                                       screenX++
+                                       if screenX-v.x-v.leftCol >= v.lineNumOffset {
+                                               v.drawCell(screenX-v.leftCol, screenY, ' ', nil, lineStyle)
                                        }
                                }
                        } else if runewidth.RuneWidth(ch) > 1 {
-                               if x-v.leftCol >= v.lineNumOffset {
-                                       screen.SetContent(x-v.leftCol, lineN, ch, nil, lineStyle)
+                               if screenX-v.x-v.leftCol >= v.lineNumOffset {
+                                       v.drawCell(screenX, screenY, 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)
+                                       screenX++
+                                       if screenX-v.x-v.leftCol >= v.lineNumOffset {
+                                               v.drawCell(screenX-v.leftCol, screenY, '<', nil, lineStyle)
                                        }
                                }
                        } else {
-                               if x-v.leftCol >= v.lineNumOffset {
-                                       screen.SetContent(x-v.leftCol, lineN+v.y, ch, nil, lineStyle)
+                               if screenX-v.x-v.leftCol >= v.lineNumOffset {
+                                       v.drawCell(screenX-v.leftCol, screenY, ch, nil, lineStyle)
                                }
                        }
                        charNum = charNum.Move(1, v.Buf)
-                       x++
+                       screenX++
+                       colN++
                }
                // Here we are at a newline
 
@@ -650,22 +760,22 @@ func (v *View) DisplayView() {
                        if style, ok := colorscheme["selection"]; ok {
                                selectStyle = style
                        }
-                       screen.SetContent(x-v.leftCol, lineN+v.y, ' ', nil, selectStyle)
-                       x++
+                       v.drawCell(screenX, screenY, ' ', nil, selectStyle)
+                       screenX++
                }
 
                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 {
+               for i := 0; i < v.width; i++ {
+                       lineStyle := defStyle
+                       if v.Buf.Settings["cursorline"].(bool) && tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() && v.Cursor.Y == curLineN {
                                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)
+                       if screenX-v.x-v.leftCol+i >= v.lineNumOffset {
+                               v.drawCell(screenX-v.leftCol+i, screenY, ' ', nil, lineStyle)
                        }
                }
        }
@@ -684,8 +794,15 @@ func (v *View) DisplayCursor() {
 // Display renders the view, the cursor, and statusline
 func (v *View) Display() {
        v.DisplayView()
-       v.DisplayCursor()
-       if settings["statusline"].(bool) {
+       if v.Num == tabs[curTab].curView {
+               v.DisplayCursor()
+       }
+       _, screenH := screen.Size()
+       if v.Buf.Settings["statusline"].(bool) {
                v.sline.Display()
+       } else if (v.y + v.height) != screenH-1 {
+               for x := 0; x < v.width; x++ {
+                       screen.SetContent(v.x+x, v.y+v.height, '-', nil, defStyle.Reverse(true))
+               }
        }
 }