Merge pull request #4853 from t-ikegami/fix_terminalio_esc_sequence

tannewt · web-flow · commit 934a14b32743 · 2021-06-03T12:43:43.000-07:00
Fix move cursor esc sequence of terminalio to meet ANSI standard
diff --git a/shared-module/terminalio/Terminal.c b/shared-module/terminalio/Terminal.c
@@ -106,7 +106,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                             }
                         }
                         if (c == ';') {
-                            int16_t m = 0;
+                            uint16_t m = 0;
                             for (++j; j < 9; j++) {
                                 if ('0' <= i[j] && i[j] <= '9') {
                                     m = m * 10 + (i[j] - '0');
@@ -116,6 +116,12 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                                 }
                             }
                             if (c == 'H') {
+                                if (n > 0) {
+                                    n--;
+                                }
+                                if (m > 0) {
+                                    m--;
+                                }
                                 if (n >= self->tilegrid->height_in_tiles) {
                                     n = self->tilegrid->height_in_tiles - 1;
                                 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`if (c == ';') {`
`109`		`- int16_t m = 0;`
	`109`	`+ uint16_t m = 0;`
`110`	`110`	`for (++j; j < 9; j++) {`
`111`	`111`	`if ('0' <= i[j] && i[j] <= '9') {`
`112`	`112`	`m = m * 10 + (i[j] - '0');`
`@@ -116,6 +116,12 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`if (c == 'H') {`
	`119`	`+ if (n > 0) {`
	`120`	`+ n--;`
	`121`	`+ }`
	`122`	`+ if (m > 0) {`
	`123`	`+ m--;`
	`124`	`+ }`
`119`	`125`	`if (n >= self->tilegrid->height_in_tiles) {`
`120`	`126`	`n = self->tilegrid->height_in_tiles - 1;`
`121`	`127`	`}`