github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-29 22:27:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Cursor improvements

Browse Source
This commit is contained in:
Zachary Yedidia
2018-08-27 17:55:28 -04:00
parent 8cf9aa216a
commit 64ce6eebd2
9 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/micro/window.go
View File

@@ -82,6 +82,15 @@ func (w *Window) GetStyle(style tcell.Style, bloc buffer.Loc, r rune) tcell.Styl
return style
}
func (w *Window) ShowCursor(x, y int, main bool) {
if main {
screen.Screen.ShowCursor(x, y)
} else {
r, _, _, _ := screen.Screen.GetContent(x, y)
screen.Screen.SetContent(x, y, r, nil, config.DefStyle.Reverse(true))
}
}
// DisplayBuffer draws the buffer being shown in this window on the screen.Screen
func (w *Window) DisplayBuffer() {
b := w.Buf
@@ -134,6 +143,10 @@ func (w *Window) DisplayBuffer() {
line, nColsBeforeStart := util.SliceVisualEnd(line, bloc.X, tabsize)
totalwidth := bloc.X - nColsBeforeStart
for len(line) > 0 {
if w.Buf.GetActiveCursor().X == bloc.X && w.Buf.GetActiveCursor().Y == bloc.Y {
w.ShowCursor(vloc.X, vloc.Y, true)
}
r, size := utf8.DecodeRune(line)
curStyle = w.GetStyle(curStyle, bloc, r)
@@ -186,6 +199,9 @@ func (w *Window) DisplayBuffer() {
}
}
}
if w.Buf.GetActiveCursor().X == bloc.X && w.Buf.GetActiveCursor().Y == bloc.Y {
w.ShowCursor(vloc.X, vloc.Y, true)
}
bloc.X = w.StartCol
bloc.Y++
if bloc.Y >= b.LinesNum() {