diff options
Diffstat (limited to 'src/parser.l')
| -rw-r--r-- | src/parser.l | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/parser.l b/src/parser.l index d64df1c..4ac44d7 100644 --- a/src/parser.l +++ b/src/parser.l @@ -247,24 +247,24 @@ static void vt100_parser_handle_bel(VT100Screen *vt) static void vt100_parser_handle_bs(VT100Screen *vt) { - vt100_screen_move_to(vt, vt->grid->cur.row, vt->grid->cur.col - 1); + vt100_screen_move_to(vt, vt->grid->cur.row, vt->grid->cur.col - 1, 0); } static void vt100_parser_handle_tab(VT100Screen *vt) { vt100_screen_move_to( vt, vt->grid->cur.row, - vt->grid->cur.col - (vt->grid->cur.col % 8) + 8); + vt->grid->cur.col - (vt->grid->cur.col % 8) + 8, 0); } static void vt100_parser_handle_lf(VT100Screen *vt) { - vt100_screen_move_to(vt, vt->grid->cur.row + 1, vt->grid->cur.col); + vt100_screen_move_to(vt, vt->grid->cur.row + 1, vt->grid->cur.col, 1); } static void vt100_parser_handle_cr(VT100Screen *vt) { - vt100_screen_move_to(vt, vt->grid->cur.row, 0); + vt100_screen_move_to(vt, vt->grid->cur.row, 0, 0); } static void vt100_parser_handle_deckpam(VT100Screen *vt) @@ -279,7 +279,7 @@ static void vt100_parser_handle_deckpnm(VT100Screen *vt) static void vt100_parser_handle_ri(VT100Screen *vt) { - vt100_screen_move_to(vt, vt->grid->cur.row - 1, vt->grid->cur.col); + vt100_screen_move_to(vt, vt->grid->cur.row - 1, vt->grid->cur.col, 1); } static void vt100_parser_handle_ris(VT100Screen *vt) @@ -374,7 +374,7 @@ static void vt100_parser_handle_cuu(VT100Screen *vt, char *buf, size_t len) vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); vt100_screen_move_to( - vt, vt->grid->cur.row - params[0], vt->grid->cur.col); + vt, vt->grid->cur.row - params[0], vt->grid->cur.col, 0); } static void vt100_parser_handle_cud(VT100Screen *vt, char *buf, size_t len) @@ -383,7 +383,7 @@ static void vt100_parser_handle_cud(VT100Screen *vt, char *buf, size_t len) vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); vt100_screen_move_to( - vt, vt->grid->cur.row + params[0], vt->grid->cur.col); + vt, vt->grid->cur.row + params[0], vt->grid->cur.col, 0); } static void vt100_parser_handle_cuf(VT100Screen *vt, char *buf, size_t len) @@ -392,7 +392,7 @@ static void vt100_parser_handle_cuf(VT100Screen *vt, char *buf, size_t len) vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); vt100_screen_move_to( - vt, vt->grid->cur.row, vt->grid->cur.col + params[0]); + vt, vt->grid->cur.row, vt->grid->cur.col + params[0], 0); } static void vt100_parser_handle_cub(VT100Screen *vt, char *buf, size_t len) @@ -401,7 +401,7 @@ static void vt100_parser_handle_cub(VT100Screen *vt, char *buf, size_t len) vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); vt100_screen_move_to( - vt, vt->grid->cur.row, vt->grid->cur.col - params[0]); + vt, vt->grid->cur.row, vt->grid->cur.col - params[0], 0); } static void vt100_parser_handle_cha(VT100Screen *vt, char *buf, size_t len) @@ -409,7 +409,7 @@ static void vt100_parser_handle_cha(VT100Screen *vt, char *buf, size_t len) int params[VT100_PARSER_CSI_MAX_PARAMS] = { 1 }, nparams; vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); - vt100_screen_move_to(vt, vt->grid->cur.row, params[0] - 1); + vt100_screen_move_to(vt, vt->grid->cur.row, params[0] - 1, 0); } static void vt100_parser_handle_cup(VT100Screen *vt, char *buf, size_t len) @@ -423,12 +423,7 @@ static void vt100_parser_handle_cup(VT100Screen *vt, char *buf, size_t len) if (params[1] == 0) { params[1] = 1; } - /* this needs to be fixed up here (and not in screen.c) because CUP should - * never cause scrolling */ - if (params[0] > vt->grid->max.row) { - params[0] = vt->grid->max.row; - } - vt100_screen_move_to(vt, params[0] - 1, params[1] - 1); + vt100_screen_move_to(vt, params[0] - 1, params[1] - 1, 0); } static void vt100_parser_handle_ed(VT100Screen *vt, char *buf, size_t len) @@ -479,7 +474,7 @@ static void vt100_parser_handle_il(VT100Screen *vt, char *buf, size_t len) vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); vt100_screen_insert_lines(vt, params[0]); - vt100_screen_move_to(vt, vt->grid->cur.row, 0); + vt100_screen_move_to(vt, vt->grid->cur.row, 0, 0); } static void vt100_parser_handle_dl(VT100Screen *vt, char *buf, size_t len) @@ -488,7 +483,7 @@ static void vt100_parser_handle_dl(VT100Screen *vt, char *buf, size_t len) vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); vt100_screen_delete_lines(vt, params[0]); - vt100_screen_move_to(vt, vt->grid->cur.row, 0); + vt100_screen_move_to(vt, vt->grid->cur.row, 0, 0); } static void vt100_parser_handle_dch(VT100Screen *vt, char *buf, size_t len) @@ -512,7 +507,7 @@ static void vt100_parser_handle_vpa(VT100Screen *vt, char *buf, size_t len) int params[VT100_PARSER_CSI_MAX_PARAMS] = { 1 }, nparams; vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams); - vt100_screen_move_to(vt, params[0] - 1, vt->grid->cur.col); + vt100_screen_move_to(vt, params[0] - 1, vt->grid->cur.col, 0); } static void vt100_parser_handle_sm(VT100Screen *vt, char *buf, size_t len) |