package main
import (
- "io/ioutil"
+ "os"
"strconv"
"strings"
"time"
- "github.com/mattn/go-runewidth"
"github.com/mitchellh/go-homedir"
"github.com/zyedidia/tcell"
)
-type ViewType int
+type ViewType struct {
+ kind int
+ readonly bool // The file cannot be edited
+ scratch bool // The file cannot be saved
+}
-const (
- vtDefault ViewType = iota
- vtHelp
- vtLog
+var (
+ vtDefault = ViewType{0, false, false}
+ vtHelp = ViewType{1, true, true}
+ vtLog = ViewType{2, true, true}
+ vtScratch = ViewType{3, false, true}
)
// The View struct stores information about a view into a buffer.
Cursor *Cursor
// The topmost line, used for vertical scrolling
- Topline int
- Bottomline int
+ Topline int
// The leftmost column, used for horizontal scrolling
leftCol int
Type ViewType
// Actual width and height
- width int
- height int
+ Width int
+ Height int
+
+ LockWidth bool
+ LockHeight bool
// Where this view is located
x, y int
// Same here, just to keep track for mouse move events
tripleClick bool
- // Syntax highlighting matches
- matches SyntaxMatches
+ cellview *CellView
splitNode *LeafNode
}
v.x, v.y = 0, 0
- v.width = w
- v.height = h
+ v.Width = w
+ v.Height = h
+ v.cellview = new(CellView)
v.ToggleTabbar()
}
if v.Buf.Settings["statusline"].(bool) {
- v.height--
+ v.Height--
}
- for _, pl := range loadedPlugins {
+ for pl := range loadedPlugins {
_, err := Call(pl+".onViewOpen", v)
if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
TermMessage(err)
return v
}
+// ToggleStatusLine creates an extra row for the statusline if necessary
func (v *View) ToggleStatusLine() {
if v.Buf.Settings["statusline"].(bool) {
- v.height--
+ v.Height--
} else {
- v.height++
+ v.Height++
}
}
+// ToggleTabbar creates an extra row for the tabbar if necessary
func (v *View) ToggleTabbar() {
if len(tabs) > 1 {
if v.y == 0 {
// Include one line for the tab bar at the top
- v.height--
+ v.Height--
v.y = 1
}
} else {
if v.y == 1 {
v.y = 0
- v.height++
+ v.Height++
}
}
}
// 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 <= v.Buf.NumLines-v.height {
+ if v.Topline+n <= v.Buf.NumLines {
v.Topline += n
- } else if v.Topline < v.Buf.NumLines-v.height {
+ } else if v.Topline < v.Buf.NumLines-1 {
v.Topline++
}
}
// causing them to lose the unsaved changes
func (v *View) CanClose() bool {
if v.Type == vtDefault && v.Buf.IsModified {
- var char rune
+ var choice bool
var canceled bool
if v.Buf.Settings["autosave"].(bool) {
- char = 'y'
+ choice = true
} else {
- char, canceled = messenger.LetterPrompt("Save changes to "+v.Buf.Name+" before closing? (y,n,esc) ", 'y', 'n')
+ choice, canceled = messenger.YesNoPrompt("Save changes to " + v.Buf.GetName() + " before closing? (y,n,esc) ")
}
if !canceled {
- if char == 'y' {
+ //if char == 'y' {
+ if choice {
v.Save(true)
return true
- } else if char == 'n' {
+ } else {
return true
}
}
v.Center(false)
v.messages = make(map[string][]GutterMessage)
- 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{}
}
+// Open opens the given file in the view
func (v *View) Open(filename string) {
home, _ := homedir.Dir()
filename = strings.Replace(filename, "~", home, 1)
- file, err := ioutil.ReadFile(filename)
+ file, err := os.Open(filename)
+ fileInfo, _ := os.Stat(filename)
+
+ if err == nil && fileInfo.IsDir() {
+ messenger.Error(filename, " is a directory")
+ return
+ }
+
+ defer file.Close()
var buf *Buffer
if err != nil {
messenger.Message(err.Error())
// File does not exist -- create an empty buffer with that name
- buf = NewBuffer([]byte{}, filename)
+ buf = NewBufferFromString("", filename)
} else {
- buf = NewBuffer(file, filename)
+ buf = NewBuffer(file, FSize(file), filename)
}
v.OpenBuffer(buf)
}
screen.Clear()
v.Buf.ReOpen()
v.Relocate()
- v.matches = Match(v)
}
}
// 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
+func (v *View) HSplit(buf *Buffer) {
+ i := 0
+ if v.Buf.Settings["splitBottom"].(bool) {
+ i = 1
+ }
+ v.splitNode.HSplit(buf, v.Num+i)
}
// 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
+func (v *View) VSplit(buf *Buffer) {
+ i := 0
+ if v.Buf.Settings["splitRight"].(bool) {
+ i = 1
+ }
+ v.splitNode.VSplit(buf, v.Num+i)
+}
+
+// HSplitIndex opens a horizontal split with the given buffer at the given index
+func (v *View) HSplitIndex(buf *Buffer, splitIndex int) {
+ v.splitNode.HSplit(buf, splitIndex)
+}
+
+// VSplitIndex opens a vertical split with the given buffer at the given index
+func (v *View) VSplitIndex(buf *Buffer, splitIndex int) {
+ v.splitNode.VSplit(buf, splitIndex)
+}
+
+// GetSoftWrapLocation gets the location of a visual click on the screen and converts it to col,line
+func (v *View) GetSoftWrapLocation(vx, vy int) (int, int) {
+ if !v.Buf.Settings["softwrap"].(bool) {
+ if vy >= v.Buf.NumLines {
+ vy = v.Buf.NumLines - 1
+ }
+ vx = v.Cursor.GetCharPosInLine(vy, vx)
+ return vx, vy
+ }
+
+ screenX, screenY := 0, v.Topline
+ for lineN := v.Topline; lineN < v.Bottomline(); lineN++ {
+ line := v.Buf.Line(lineN)
+ if lineN >= v.Buf.NumLines {
+ return 0, v.Buf.NumLines - 1
+ }
+
+ colN := 0
+ for _, ch := range line {
+ if screenX >= v.Width-v.lineNumOffset {
+ screenX = 0
+ screenY++
+ }
+
+ if screenX == vx && screenY == vy {
+ return colN, lineN
+ }
+
+ if ch == '\t' {
+ screenX += int(v.Buf.Settings["tabsize"].(float64)) - 1
+ }
+
+ screenX++
+ colN++
+ }
+ if screenY == vy {
+ return colN, lineN
+ }
+ screenX = 0
+ screenY++
+ }
+
+ return 0, 0
+}
+
+func (v *View) Bottomline() int {
+ if !v.Buf.Settings["softwrap"].(bool) {
+ return v.Topline + v.Height
+ }
+
+ screenX, screenY := 0, 0
+ numLines := 0
+ for lineN := v.Topline; lineN < v.Topline+v.Height; lineN++ {
+ line := v.Buf.Line(lineN)
+
+ colN := 0
+ for _, ch := range line {
+ if screenX >= v.Width-v.lineNumOffset {
+ screenX = 0
+ screenY++
+ }
+
+ if ch == '\t' {
+ screenX += int(v.Buf.Settings["tabsize"].(float64)) - 1
+ }
+
+ screenX++
+ colN++
+ }
+ screenX = 0
+ screenY++
+ numLines++
+
+ if screenY >= v.Height {
+ break
+ }
+ }
+ return numLines + v.Topline
}
// 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 {
- height := v.Bottomline - v.Topline
+ height := v.Bottomline() - v.Topline
ret := false
cy := v.Cursor.Y
scrollmargin := int(v.Buf.Settings["scrollmargin"].(float64))
v.leftCol = cx
ret = true
}
- if cx+v.lineNumOffset+1 > v.leftCol+v.width {
- v.leftCol = cx - v.width + v.lineNumOffset + 1
+ if cx+v.lineNumOffset+1 > v.leftCol+v.Width {
+ v.leftCol = cx - v.Width + v.lineNumOffset + 1
ret = true
}
}
// 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
- }
- if y >= v.Buf.NumLines {
- y = v.Buf.NumLines - 1
+ y = v.Height + v.Topline - 1
}
if y < 0 {
y = 0
x = 0
}
- x = v.Cursor.GetCharPosInLine(y, x)
+ x, y = v.GetSoftWrapLocation(x, y)
+ // x = v.Cursor.GetCharPosInLine(y, x)
if x > Count(v.Buf.Line(y)) {
x = Count(v.Buf.Line(y))
}
v.Buf.CheckModTime()
switch e := event.(type) {
- case *tcell.EventResize:
- // Window resized
- tabs[v.TabNum].Resize()
case *tcell.EventKey:
// Check first if input is a key binding, if it is we 'eat' the input and don't insert a rune
isBinding := false
+ readonlyBindingsList := []string{"Delete", "Insert", "Backspace", "Cut", "Play", "Paste", "Move", "Add", "DuplicateLine", "Macro"}
if e.Key() != tcell.KeyRune || e.Modifiers() != 0 {
for key, actions := range bindings {
if e.Key() == key.keyCode {
relocate = false
isBinding = true
for _, action := range actions {
- relocate = action(v, true) || relocate
- funcName := FuncName(action)
- if funcName != "main.(*View).ToggleMacro" && funcName != "main.(*View).PlayMacro" {
- if recordingMacro {
- curMacro = append(curMacro, action)
+ readonlyBindingsResult := false
+ funcName := ShortFuncName(action)
+ if v.Type.readonly == true {
+ // check for readonly and if true only let key bindings get called if they do not change the contents.
+ for _, readonlyBindings := range readonlyBindingsList {
+ if strings.Contains(funcName, readonlyBindings) {
+ readonlyBindingsResult = true
+ }
+ }
+ }
+ if !readonlyBindingsResult {
+ // call the key binding
+ relocate = action(v, true) || relocate
+ // Macro
+ if funcName != "ToggleMacro" && funcName != "PlayMacro" {
+ if recordingMacro {
+ curMacro = append(curMacro, action)
+ }
}
}
}
}
}
if !isBinding && e.Key() == tcell.KeyRune {
- // Insert a character
- if v.Cursor.HasSelection() {
- v.Cursor.DeleteSelection()
- v.Cursor.ResetSelection()
- }
- v.Buf.Insert(v.Cursor.Loc, string(e.Rune()))
- v.Cursor.Right()
+ // Check viewtype if readonly don't insert a rune (readonly help and log view etc.)
+ if v.Type.readonly == false {
+ // Insert a character
+ if v.Cursor.HasSelection() {
+ v.Cursor.DeleteSelection()
+ v.Cursor.ResetSelection()
+ }
+ 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)
+ 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)
+ }
}
- }
- if recordingMacro {
- curMacro = append(curMacro, e.Rune())
+ if recordingMacro {
+ curMacro = append(curMacro, e.Rune())
+ }
}
}
case *tcell.EventPaste:
- if !PreActionCall("Paste", v) {
- break
- }
+ // Check viewtype if readonly don't paste (readonly help and log view etc.)
+ if v.Type.readonly == false {
+ if !PreActionCall("Paste", v) {
+ break
+ }
- leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y))
+ v.paste(e.Text())
- if v.Cursor.HasSelection() {
- v.Cursor.DeleteSelection()
- v.Cursor.ResetSelection()
+ PostActionCall("Paste", v)
}
- 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 + v.x
v.doubleClick = false
v.Cursor.SelectLine()
+ v.Cursor.CopySelection("primary")
} else {
// Double click
v.lastClickTime = time.Now()
v.tripleClick = false
v.Cursor.SelectWord()
+ v.Cursor.CopySelection("primary")
}
} else {
v.doubleClick = false
v.Cursor.AddWordToSelection()
} else {
v.Cursor.SetSelectionEnd(v.Cursor.Loc)
+ v.Cursor.CopySelection("primary")
}
}
case tcell.Button2:
- // Middle mouse button was clicked,
- // We should paste primary
- v.PastePrimary(true)
+ // Check viewtype if readonly don't paste (readonly help and log view etc.)
+ if v.Type.readonly == false {
+ // Middle mouse button was clicked,
+ // We should paste primary
+ v.PastePrimary(true)
+ }
case tcell.ButtonNone:
// Mouse event with no click
if !v.mouseReleased {
if !v.doubleClick && !v.tripleClick {
v.MoveToMouseClick(x, y)
v.Cursor.SetSelectionEnd(v.Cursor.Loc)
+ v.Cursor.CopySelection("primary")
}
v.mouseReleased = true
}
if relocate {
v.Relocate()
+ // We run relocate again because there's a bug with relocating with softwrap
+ // when for example you jump to the bottom of the buffer and it tries to
+ // calculate where to put the topline so that the bottom line is at the bottom
+ // of the terminal and it runs into problems with visual lines vs real lines.
+ // This is (hopefully) a temporary solution
+ v.Relocate()
}
}
if data, err := FindRuntimeFile(RTHelp, helpPage).Data(); err != nil {
TermMessage("Unable to load help text", helpPage, "\n", err)
} else {
- helpBuffer := NewBuffer(data, helpPage+".md")
- helpBuffer.Name = "Help"
+ helpBuffer := NewBufferFromString(string(data), helpPage+".md")
+ helpBuffer.name = "Help"
if v.Type == vtHelp {
v.OpenBuffer(helpBuffer)
}
}
-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)
+func (v *View) DisplayView() {
+ if v.Buf.Settings["softwrap"].(bool) && v.leftCol != 0 {
+ v.leftCol = 0
}
-}
-// DisplayView renders the view to the screen
-func (v *View) DisplayView() {
if v.Type == vtLog {
// Log views should always follow the cursor...
v.Relocate()
}
- if v.Buf.Settings["syntax"].(bool) {
- v.matches = Match(v)
- }
-
- // 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))
+ // We need to know the string length of the largest line number
+ // so we can pad appropriately when displaying line numbers
+ maxLineNumLength := len(strconv.Itoa(v.Buf.NumLines))
if v.Buf.Settings["ruler"] == true {
// + 1 for the little space after the line number
- v.lineNumOffset = maxLineLength + 1
+ v.lineNumOffset = maxLineNumLength + 1
} else {
v.lineNumOffset = 0
}
v.lineNumOffset += 2
}
+ divider := 0
if v.x != 0 {
// One space for the extra split divider
v.lineNumOffset++
+ divider = 1
}
- // These represent the current screen coordinates
- screenX, screenY := v.x, v.y-1
-
- highlightStyle := defStyle
- curLineN := 0
-
- // ViewLine is the current line from the top of the viewport
- for viewLine := 0; viewLine < v.height; viewLine++ {
- screenY++
- screenX = v.x
+ xOffset := v.x + v.lineNumOffset
+ yOffset := v.y
- // This is the current line number of the buffer that we are drawing
- curLineN = viewLine + v.Topline
+ height := v.Height
+ width := v.Width
+ left := v.leftCol
+ top := v.Topline
- if screenY-v.y >= v.height {
- break
- }
+ v.cellview.Draw(v.Buf, top, height, left, width-v.lineNumOffset)
- if v.x != 0 {
- // Draw the split divider
- v.drawCell(screenX, screenY, '|', nil, defStyle.Reverse(true))
- screenX++
+ screenX := v.x
+ realLineN := top - 1
+ visualLineN := 0
+ var line []*Char
+ for visualLineN, line = range v.cellview.lines {
+ var firstChar *Char
+ if len(line) > 0 {
+ firstChar = line[0]
}
- // 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)
+ var softwrapped bool
+ if firstChar != nil {
+ if firstChar.realLoc.Y == realLineN {
+ softwrapped = true
}
+ realLineN = firstChar.realLoc.Y
+ } else {
+ realLineN++
+ }
- continue
+ colorcolumn := int(v.Buf.Settings["colorcolumn"].(float64))
+ if colorcolumn != 0 {
+ style := GetColor("color-column")
+ fg, _, _ := style.Decompose()
+ st := defStyle.Background(fg)
+ screen.SetContent(xOffset+colorcolumn, yOffset+visualLineN, ' ', nil, st)
}
- line := v.Buf.Line(curLineN)
+
+ screenX = v.x
// If there are gutter messages we need to display the '>>' symbol here
if hasGutterMessages {
msgOnLine := false
for k := range v.messages {
for _, msg := range v.messages[k] {
- if msg.lineNum == curLineN {
+ if msg.lineNum == realLineN {
msgOnLine = true
gutterStyle := defStyle
switch msg.kind {
gutterStyle = style
}
}
- v.drawCell(screenX, screenY, '>', nil, gutterStyle)
+ screen.SetContent(screenX, yOffset+visualLineN, '>', nil, gutterStyle)
screenX++
- v.drawCell(screenX, screenY, '>', nil, gutterStyle)
+ screen.SetContent(screenX, yOffset+visualLineN, '>', nil, gutterStyle)
screenX++
- if v.Cursor.Y == curLineN && !messenger.hasPrompt {
+ if v.Cursor.Y == realLineN && !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 {
- v.drawCell(screenX, screenY, ' ', nil, defStyle)
+ screen.SetContent(screenX, yOffset+visualLineN, ' ', nil, defStyle)
screenX++
- v.drawCell(screenX, screenY, ' ', nil, defStyle)
+ screen.SetContent(screenX, yOffset+visualLineN, ' ', nil, defStyle)
screenX++
- if v.Cursor.Y == curLineN && messenger.gutterMessage {
+ if v.Cursor.Y == realLineN && messenger.gutterMessage {
messenger.Reset()
messenger.gutterMessage = false
}
lineNumStyle = style
}
if style, ok := colorscheme["current-line-number"]; ok {
- if curLineN == v.Cursor.Y && tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() {
+ if realLineN == v.Cursor.Y && tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() {
lineNumStyle = style
}
}
- lineNum := strconv.Itoa(curLineN + 1)
+ lineNum := strconv.Itoa(realLineN + 1)
// Write the spaces before the line number if necessary
- for i := 0; i < maxLineLength-len(lineNum); i++ {
- v.drawCell(screenX, screenY, ' ', nil, lineNumStyle)
+ for i := 0; i < maxLineNumLength-len(lineNum); i++ {
+ screen.SetContent(screenX+divider, yOffset+visualLineN, ' ', nil, lineNumStyle)
screenX++
}
- // Write the actual line number
- for _, ch := range lineNum {
- v.drawCell(screenX, screenY, ch, nil, lineNumStyle)
- screenX++
+ if softwrapped && visualLineN != 0 {
+ // Pad without the line number because it was written on the visual line before
+ for range lineNum {
+ screen.SetContent(screenX+divider, yOffset+visualLineN, ' ', nil, lineNumStyle)
+ screenX++
+ }
+ } else {
+ // Write the actual line number
+ for _, ch := range lineNum {
+ screen.SetContent(screenX+divider, yOffset+visualLineN, ch, nil, lineNumStyle)
+ screenX++
+ }
}
// Write the extra space
- v.drawCell(screenX, screenY, ' ', nil, lineNumStyle)
+ screen.SetContent(screenX+divider, yOffset+visualLineN, ' ', nil, lineNumStyle)
screenX++
}
- // Now we actually draw the line
- colN := 0
- strWidth := 0
- tabSize := int(v.Buf.Settings["tabsize"].(float64))
- for _, ch := range line {
- if v.Buf.Settings["softwrap"].(bool) {
- if screenX-v.x >= v.width {
- screenY++
- for i := 0; i < v.lineNumOffset; i++ {
- screen.SetContent(v.x+i, screenY, ' ', nil, lineNumStyle)
- }
- screenX = v.x + v.lineNumOffset
- }
- }
-
- if tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() && v.Cursor.Y == curLineN && colN == v.Cursor.X {
- v.DisplayCursor(screenX, screenY)
- }
-
- lineStyle := defStyle
-
- if v.Buf.Settings["syntax"].(bool) {
- // Syntax highlighting is enabled
- highlightStyle = v.matches[viewLine][colN]
- }
+ var lastChar *Char
+ cursorSet := false
+ for _, char := range line {
+ if char != nil {
+ lineStyle := char.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])) {
- // The current character is selected
- lineStyle = defStyle.Reverse(true)
-
- if style, ok := colorscheme["selection"]; ok {
- lineStyle = style
- }
- } else {
- lineStyle = highlightStyle
- }
-
- // 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 {
+ colorcolumn := int(v.Buf.Settings["colorcolumn"].(float64))
+ if colorcolumn != 0 && char.visualLoc.X == colorcolumn {
+ style := GetColor("color-column")
fg, _, _ := style.Decompose()
lineStyle = lineStyle.Background(fg)
}
- }
-
- 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 && v.Buf.Settings["indentchar"].(string) != " " {
- lineIndentStyle = style
- }
+ charLoc := char.realLoc
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 = defStyle.Reverse(true)
+ (charLoc.GreaterEqual(v.Cursor.CurSelection[0]) && charLoc.LessThan(v.Cursor.CurSelection[1]) ||
+ charLoc.LessThan(v.Cursor.CurSelection[0]) && charLoc.GreaterEqual(v.Cursor.CurSelection[1])) {
+ // The current character is selected
+ lineStyle = defStyle.Reverse(true)
if style, ok := colorscheme["selection"]; ok {
- lineIndentStyle = style
- }
- }
- 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)
- }
- }
- // 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)
- }
- // Now the tab has to be displayed as a bunch of spaces
- visLoc := strWidth
- remainder := tabSize - (visLoc % tabSize)
- for i := 0; i < remainder-1; i++ {
- screenX++
- if screenX-v.x-v.leftCol >= v.lineNumOffset {
- v.drawCell(screenX-v.leftCol, screenY, ' ', nil, lineStyle)
+ lineStyle = style
}
}
- } else if runewidth.RuneWidth(ch) > 1 {
- if screenX-v.x-v.leftCol >= v.lineNumOffset {
- v.drawCell(screenX, screenY, ch, nil, lineStyle)
- }
- for i := 0; i < runewidth.RuneWidth(ch)-1; i++ {
- screenX++
- if screenX-v.x-v.leftCol >= v.lineNumOffset {
- v.drawCell(screenX-v.leftCol, screenY, '<', nil, lineStyle)
- }
+
+ if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&
+ v.Cursor.Y == char.realLoc.Y && v.Cursor.X == char.realLoc.X && !cursorSet {
+ screen.ShowCursor(xOffset+char.visualLoc.X, yOffset+char.visualLoc.Y)
+ cursorSet = true
}
- } else {
- if screenX-v.x-v.leftCol >= v.lineNumOffset {
- v.drawCell(screenX-v.leftCol, screenY, ch, nil, lineStyle)
+
+ if v.Buf.Settings["cursorline"].(bool) && tabs[curTab].CurView == v.Num &&
+ !v.Cursor.HasSelection() && v.Cursor.Y == realLineN {
+ style := GetColor("cursor-line")
+ fg, _, _ := style.Decompose()
+ lineStyle = lineStyle.Background(fg)
}
+
+ screen.SetContent(xOffset+char.visualLoc.X, yOffset+char.visualLoc.Y, char.drawChar, nil, lineStyle)
+
+ lastChar = char
}
- charNum = charNum.Move(1, v.Buf)
- screenX++
- colN++
- strWidth += StringWidth(string(ch), tabSize)
}
- // Here we are at a newline
- if tabs[curTab].curView == v.Num && !v.Cursor.HasSelection() && v.Cursor.Y == curLineN && colN == v.Cursor.X {
- v.DisplayCursor(screenX, screenY)
+ lastX := 0
+ var realLoc Loc
+ var visualLoc Loc
+ var cx, cy int
+ if lastChar != nil {
+ lastX = xOffset + lastChar.visualLoc.X + lastChar.width
+ if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&
+ v.Cursor.Y == lastChar.realLoc.Y && v.Cursor.X == lastChar.realLoc.X+1 {
+ screen.ShowCursor(lastX, yOffset+lastChar.visualLoc.Y)
+ cx, cy = lastX, yOffset+lastChar.visualLoc.Y
+ }
+ realLoc = Loc{lastChar.realLoc.X, realLineN}
+ visualLoc = Loc{lastX - xOffset, lastChar.visualLoc.Y}
+ } else if len(line) == 0 {
+ if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&
+ v.Cursor.Y == realLineN {
+ screen.ShowCursor(xOffset, yOffset+visualLineN)
+ cx, cy = xOffset, yOffset+visualLineN
+ }
+ lastX = xOffset
+ realLoc = Loc{0, realLineN}
+ visualLoc = Loc{0, visualLineN}
}
- // 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.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
- charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
-
+ (realLoc.GreaterEqual(v.Cursor.CurSelection[0]) && realLoc.LessThan(v.Cursor.CurSelection[1]) ||
+ realLoc.LessThan(v.Cursor.CurSelection[0]) && realLoc.GreaterEqual(v.Cursor.CurSelection[1])) {
+ // The current character is selected
selectStyle := defStyle.Reverse(true)
if style, ok := colorscheme["selection"]; ok {
selectStyle = style
}
- v.drawCell(screenX, screenY, ' ', nil, selectStyle)
- screenX++
+ screen.SetContent(xOffset+visualLoc.X, yOffset+visualLoc.Y, ' ', nil, selectStyle)
}
- charNum = charNum.Move(1, v.Buf)
-
- 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 v.Buf.Settings["cursorline"].(bool) && tabs[curTab].CurView == v.Num &&
+ !v.Cursor.HasSelection() && v.Cursor.Y == realLineN {
+ for i := lastX; i < xOffset+v.Width; i++ {
+ style := GetColor("cursor-line")
+ fg, _, _ := style.Decompose()
+ style = style.Background(fg)
+ if !(tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() && i == cx && yOffset+visualLineN == cy) {
+ screen.SetContent(i, yOffset+visualLineN, ' ', nil, style)
}
}
- if screenX-v.x-v.leftCol+i >= v.lineNumOffset {
- colorcolumn := int(v.Buf.Settings["colorcolumn"].(float64))
- if colorcolumn != 0 && screenX-v.lineNumOffset+i == colorcolumn-1 {
- if style, ok := colorscheme["color-column"]; ok {
- fg, _, _ := style.Decompose()
- lineStyle = lineStyle.Background(fg)
- }
- }
- v.drawCell(screenX-v.leftCol+i, screenY, ' ', nil, lineStyle)
- }
}
}
- v.Bottomline = curLineN
- if !v.Buf.Settings["softwrap"].(bool) {
- v.Bottomline++
- }
-}
-// DisplayCursor draws the current buffer's cursor to the screen
-func (v *View) DisplayCursor(x, y int) {
- // screen.ShowCursor(v.x+v.Cursor.GetVisualX()+v.lineNumOffset-v.leftCol, y)
- screen.ShowCursor(x, y)
+ if divider != 0 {
+ dividerStyle := defStyle
+ if style, ok := colorscheme["divider"]; ok {
+ dividerStyle = style
+ }
+ for i := 0; i < v.Height; i++ {
+ screen.SetContent(v.x, yOffset+i, '|', nil, dividerStyle.Reverse(true))
+ }
+ }
}
// Display renders the view, the cursor, and statusline
func (v *View) Display() {
+ if globalSettings["termtitle"].(bool) {
+ screen.SetTitle("micro: " + v.Buf.GetName())
+ }
v.DisplayView()
// 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() {
+ if v.Num == tabs[curTab].CurView && (v.Cursor.Y-v.Topline < 0 || v.Cursor.Y-v.Topline > v.Height-1 || v.Cursor.HasSelection()) {
screen.HideCursor()
}
_, 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))
+ } 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))
}
}
}
projects / micro.git / blobdiff