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

Implement searching

Browse Source
This commit is contained in:
Zachary Yedidia
2019-01-03 15:27:43 -05:00
parent f63c72c50d
commit e63a3c8917
10 changed files with 348 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/micro/display/window.go
View File

@@ -317,7 +317,7 @@ func (w *BufWindow) getStyle(style tcell.Style, bloc buffer.Loc, r rune) (tcell.
}
func (w *BufWindow) showCursor(x, y int, main bool) {
if !main {
if main {
screen.Screen.ShowCursor(x, y)
} else {
r, _, _, _ := screen.Screen.GetContent(x, y)
@@ -421,8 +421,8 @@ func (w *BufWindow) displayBuffer() {
if showcursor {
for _, c := range cursors {
if c.X == bloc.X && c.Y == bloc.Y {
w.showCursor(w.X+vloc.X, w.Y+vloc.Y, true)
if c.X == bloc.X && c.Y == bloc.Y && !c.HasSelection() {
w.showCursor(w.X+vloc.X, w.Y+vloc.Y, c.Num == 0)
}
}
}
@@ -495,8 +495,8 @@ func (w *BufWindow) displayBuffer() {
}
for _, c := range cursors {
if c.X == bloc.X && c.Y == bloc.Y {
w.showCursor(w.X+vloc.X, w.Y+vloc.Y, true)
if c.X == bloc.X && c.Y == bloc.Y && !c.HasSelection() {
w.showCursor(w.X+vloc.X, w.Y+vloc.Y, c.Num == 0)
}
}