Fix cursor direction escapes

iotgopher · May 6, 2020 · fa99672 · fa99672
1 parent 5e5b0f5
commit fa99672
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/escape.go b/escape.go
@@ -37,10 +37,10 @@ func (t *Terminal) handleEscape(code string) {
 			t.moveCursor(t.cursorRow+rows, t.cursorCol)
 		case "C":
 			cols, _ := strconv.Atoi(message)
-			t.moveCursor(t.cursorRow, t.cursorCol-cols)
+			t.moveCursor(t.cursorRow, t.cursorCol+cols)
 		case "D":
 			cols, _ := strconv.Atoi(message)
-			t.moveCursor(t.cursorRow, t.cursorCol+cols)
+			t.moveCursor(t.cursorRow, t.cursorCol-cols)
 		case "H", "f":
 			parts := strings.Split(message, ";")
 			row, _ := strconv.Atoi(parts[0])

diff --git a/escape_test.go b/escape_test.go
@@ -41,11 +41,11 @@ func TestCursorMove(t *testing.T) {
 	assert.Equal(t, 0, term.cursorRow)
 	assert.Equal(t, 3, term.cursorCol)
 
-	term.handleEscape("2C")
+	term.handleEscape("2D")
 	assert.Equal(t, 0, term.cursorRow)
 	assert.Equal(t, 1, term.cursorCol)
 
-	term.handleEscape("2D")
+	term.handleEscape("2C")
 	assert.Equal(t, 0, term.cursorRow)
 	assert.Equal(t, 3, term.cursorCol)
 
@@ -66,11 +66,11 @@ func TestCursorMove_Overflow(t *testing.T) {
 	assert.Equal(t, 1, term.cursorRow)
 	assert.Equal(t, 1, term.cursorCol)
 
-	term.handleEscape("2C")
+	term.handleEscape("2D")
 	assert.Equal(t, 1, term.cursorRow)
 	assert.Equal(t, 0, term.cursorCol)
 
-	term.handleEscape("5D")
+	term.handleEscape("5C")
 	assert.Equal(t, 1, term.cursorRow)
 	assert.Equal(t, 1, term.cursorCol)