OrgGo/gocui
1
0
Fork 0
mirror of https://github.com/jroimartin/gocui.git synced 2025-04-24 13:48:51 +08:00
Code Issues Projects Releases Wiki Activity

Do not move the cursor beyond EOF

Browse Source
This commit is contained in:
Roi Martin 2017-08-19 00:06:54 +02:00
parent a4d0b30476
commit 75a7ad2750
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
edit.go
View File

@ -148,11 +148,13 @@ func (v *View) MoveCursor(dx, dy int, writeMode bool) {
// adjust cursor's x position and view's x origin // adjust cursor's x position and view's x origin
if x > curLineWidth { // move to next line if x > curLineWidth { // move to next line
if dx > 0 { // horizontal movement if dx > 0 { // horizontal movement
cy++
if writeMode || v.oy+cy < len(v.viewLines) {
if !v.Wrap { if !v.Wrap {
v.ox = 0 v.ox = 0
} }
v.cx = 0 v.cx = 0
cy++ }
} else { // vertical movement } else { // vertical movement
if curLineWidth > 0 { // move cursor to the EOL if curLineWidth > 0 { // move cursor to the EOL
if v.Wrap { if v.Wrap {
@ -170,17 +172,20 @@ func (v *View) MoveCursor(dx, dy int, writeMode bool) {
} }
} }
} else { } else {
if writeMode || v.oy+cy < len(v.viewLines) {
if !v.Wrap { if !v.Wrap {
v.ox = 0 v.ox = 0
} }
v.cx = 0 v.cx = 0
} }
} }
}
} else if cx < 0 { } else if cx < 0 {
if !v.Wrap && v.ox > 0 { // move origin to the left if !v.Wrap && v.ox > 0 { // move origin to the left
v.ox += cx v.ox += cx
v.cx = 0 v.cx = 0
} else { // move to previous line } else { // move to previous line
cy--
if prevLineWidth > 0 { if prevLineWidth > 0 {
if !v.Wrap { // set origin so the EOL is visible if !v.Wrap { // set origin so the EOL is visible
nox := prevLineWidth - maxX + 1 nox := prevLineWidth - maxX + 1
@ -197,7 +202,6 @@ func (v *View) MoveCursor(dx, dy int, writeMode bool) {
} }
v.cx = 0 v.cx = 0
} }
cy--
} }
} else { // stay on the same line } else { // stay on the same line
if v.Wrap { if v.Wrap {
@ -213,16 +217,18 @@ func (v *View) MoveCursor(dx, dy int, writeMode bool) {
} }
// adjust cursor's y position and view's y origin // adjust cursor's y position and view's y origin
if cy >= maxY { if cy < 0 {
v.oy++
} else if cy < 0 {
if v.oy > 0 { if v.oy > 0 {
v.oy-- v.oy--
} }
} else if writeMode || v.oy+cy < len(v.viewLines) {
if cy >= maxY {
v.oy++
} else { } else {
v.cy = cy v.cy = cy
} }
} }
}
// writeRune writes a rune into the view's internal buffer, at the // writeRune writes a rune into the view's internal buffer, at the
// position corresponding to the point (x, y). The length of the internal // position corresponding to the point (x, y). The length of the internal