Hopiu/micro
1
0
Fork 0
mirror of https://github.com/Hopiu/micro.git synced 2026-03-17 06:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some small glitches with cursor positioning

Browse source
This commit is contained in:
Zachary Yedidia 2017-03-13 19:23:47 -04:00
parent 1cd4b2c4dc
commit ea7f90713c
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmd/micro/cellview.go
View file

@ -45,6 +45,7 @@ type Char struct {
// This is only different from char if it's for example hidden character
drawChar rune
style tcell.Style
width int
}
type CellView struct {
@ -113,16 +114,34 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
char := line[colN]
if viewCol >= 0 {
c.lines[viewLine][viewCol] = &Char{Loc{viewCol, viewLine}, Loc{colN, lineN}, char, char, curStyle}
c.lines[viewLine][viewCol] = &Char{Loc{viewCol, viewLine}, Loc{colN, lineN}, char, char, curStyle, 1}
}
if char == '\t' {
width := tabsize - (viewCol+left)%tabsize
if viewCol >= 0 {
c.lines[viewLine][viewCol].drawChar = indentchar
c.lines[viewLine][viewCol].width = width
}
viewCol += tabsize - (viewCol+left)%tabsize
for i := 1; i < width; i++ {
viewCol++
if viewCol >= 0 {
c.lines[viewLine][viewCol] = &Char{Loc{viewCol, viewLine}, Loc{colN, lineN}, char, ' ', curStyle, 1}
}
}
viewCol++
} else if runewidth.RuneWidth(char) > 1 {
viewCol += runewidth.RuneWidth(char)
width := runewidth.RuneWidth(char)
if viewCol >= 0 {
c.lines[viewLine][viewCol].width = width
}
for i := 1; i < width; i++ {
viewCol++
if viewCol >= 0 {
c.lines[viewLine][viewCol] = &Char{Loc{viewCol, viewLine}, Loc{colN, lineN}, char, ' ', curStyle, 1}
}
}
viewCol++
} else {
viewCol++
}

21
cmd/micro/view.go
View file

@ -648,7 +648,6 @@ func (v *View) openHelp(helpPage string) {
}
func (v *View) DisplayView() {
tabsize := int(v.Buf.Settings["tabsize"].(float64))
if v.Type == vtLog {
// Log views should always follow the cursor...
v.Relocate()
@ -719,8 +718,6 @@ func (v *View) DisplayView() {
screenX++
}
lineStr := v.Buf.Line(realLineN)
// 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
@ -807,6 +804,7 @@ func (v *View) DisplayView() {
}
var lastChar *Char
cursorSet := false
for _, char := range line {
if char != nil {
lineStyle := char.style
@ -821,16 +819,12 @@ func (v *View) DisplayView() {
if style, ok := colorscheme["selection"]; ok {
lineStyle = style
}
width := StringWidth(string(char.char), tabsize)
for i := 1; i < width; i++ {
screen.SetContent(xOffset+char.visualLoc.X+i, yOffset+char.visualLoc.Y, ' ', nil, lineStyle)
}
}
if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&
v.Cursor.Y == char.realLoc.Y && v.Cursor.X == char.realLoc.X {
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
}
if v.Buf.Settings["cursorline"].(bool) && tabs[curTab].CurView == v.Num &&
@ -838,11 +832,6 @@ func (v *View) DisplayView() {
style := GetColor("cursor-line")
fg, _, _ := style.Decompose()
lineStyle = lineStyle.Background(fg)
width := StringWidth(string(char.char), tabsize)
for i := 1; i < width; i++ {
screen.SetContent(xOffset+char.visualLoc.X+i, yOffset+char.visualLoc.Y, ' ', nil, lineStyle)
}
}
screen.SetContent(xOffset+char.visualLoc.X, yOffset+char.visualLoc.Y, char.drawChar, nil, lineStyle)
@ -855,11 +844,11 @@ func (v *View) DisplayView() {
var realLoc Loc
var visualLoc Loc
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(xOffset+StringWidth(string(lineStr), tabsize), yOffset+lastChar.visualLoc.Y)
screen.ShowCursor(lastX, yOffset+lastChar.visualLoc.Y)
}
lastX = xOffset + StringWidth(string(lineStr), tabsize)
realLoc = Loc{lastChar.realLoc.X, realLineN}
visualLoc = Loc{lastX - xOffset, lastChar.visualLoc.Y}
} else if len(line) == 0 {