term: rename term_formfeed() -> term_carriage_return()

This commit is contained in:
Daniel Eklöf 2020-07-14 09:29:10 +02:00
parent 7f7ab00e11
commit b9719673a1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 9 additions and 5 deletions

3
csi.c
View file

@ -729,6 +729,9 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
case 20: /* Automatic Newline Mode - LNM */ case 20: /* Automatic Newline Mode - LNM */
/* TODO: would be easy to implemented; when active
* term_linefeed() would _also_ do a
* term_carriage_return() */
LOG_WARN("unimplemented: automatic newline mode (LNM)"); LOG_WARN("unimplemented: automatic newline mode (LNM)");
break; break;
} }

View file

@ -469,7 +469,7 @@ sixel_unhook(struct terminal *term)
for (size_t i = 0; i < image.rows; i++) for (size_t i = 0; i < image.rows; i++)
term_linefeed(term); term_linefeed(term);
term_formfeed(term); term_carriage_return(term);
render_refresh(term); render_refresh(term);
sixel_insert(term, image); sixel_insert(term, image);

View file

@ -1878,7 +1878,7 @@ term_scroll_reverse(struct terminal *term, int rows)
} }
void void
term_formfeed(struct terminal *term) term_carriage_return(struct terminal *term)
{ {
term_cursor_left(term, term->grid->cursor.point.col); term_cursor_left(term, term->grid->cursor.point.col);
} }

View file

@ -506,7 +506,7 @@ void term_scroll_partial(
void term_scroll_reverse_partial( void term_scroll_reverse_partial(
struct terminal *term, struct scroll_region region, int rows); struct terminal *term, struct scroll_region region, int rows);
void term_formfeed(struct terminal *term); void term_carriage_return(struct terminal *term);
void term_linefeed(struct terminal *term); void term_linefeed(struct terminal *term);
void term_reverse_index(struct terminal *term); void term_reverse_index(struct terminal *term);

5
vt.c
View file

@ -157,7 +157,7 @@ action_execute(struct terminal *term, uint8_t c)
case '\r': case '\r':
/* CR - carriage ret */ /* CR - carriage ret */
term_formfeed(term); term_carriage_return(term);
break; break;
case '\x0e': case '\x0e':
@ -180,6 +180,7 @@ action_execute(struct terminal *term, uint8_t c)
* UTF-8 mode_. Which would be the normal mode of operation * UTF-8 mode_. Which would be the normal mode of operation
* these days. And since we _only_ support UTF-8... * these days. And since we _only_ support UTF-8...
*/ */
#if 0 #if 0
case '\x84': /* IND -> ESC D */ case '\x84': /* IND -> ESC D */
case '\x85': /* NEL -> ESC E */ case '\x85': /* NEL -> ESC E */
@ -360,7 +361,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final)
break; break;
case 'E': case 'E':
term_formfeed(term); term_carriage_return(term);
term_linefeed(term); term_linefeed(term);
break; break;