diff --git a/winterm/cursor_helpers.go b/winterm/cursor_helpers.go index 3ee06ea..469483f 100644 --- a/winterm/cursor_helpers.go +++ b/winterm/cursor_helpers.go @@ -5,6 +5,8 @@ package winterm const ( horizontal = iota vertical + line + column ) func (h *windowsAnsiEventHandler) getCursorWindow(info *CONSOLE_SCREEN_BUFFER_INFO) SMALL_RECT { @@ -58,6 +60,11 @@ func (h *windowsAnsiEventHandler) moveCursor(moveMode int, param int) error { position.X += int16(param) case vertical: position.Y += int16(param) + case line: + position.X = 0 + position.Y += int16(param) + case column: + position.X = int16(param) - 1 } if err = h.setCursorPosition(position, h.getCursorWindow(info)); err != nil { @@ -68,34 +75,9 @@ func (h *windowsAnsiEventHandler) moveCursor(moveMode int, param int) error { } func (h *windowsAnsiEventHandler) moveCursorLine(param int) error { - info, err := GetConsoleScreenBufferInfo(h.fd) - if err != nil { - return err - } - - position := info.CursorPosition - position.X = 0 - position.Y += int16(param) - - if err = h.setCursorPosition(position, h.getCursorWindow(info)); err != nil { - return err - } - - return nil + return h.moveCursor(line, param) } func (h *windowsAnsiEventHandler) moveCursorColumn(param int) error { - info, err := GetConsoleScreenBufferInfo(h.fd) - if err != nil { - return err - } - - position := info.CursorPosition - position.X = int16(param) - 1 - - if err = h.setCursorPosition(position, h.getCursorWindow(info)); err != nil { - return err - } - - return nil + return h.moveCursor(column, param) }