From 60b180a3693acbbddaf4b96da0f80a049b31ba4e Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sat, 14 Jul 2012 16:49:35 +0200 Subject: [PATCH] console: support "protect" character attribute VT220 allows protecting attributes. That is, they are not erased by special new erase-commands. The normal erase-commands still erase all characters. Signed-off-by: David Herrmann --- src/console.c | 24 +++++++++++++++--------- src/font.h | 1 + src/vte.c | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/console.c b/src/console.c index 637c6c2..e1f1714 100644 --- a/src/console.c +++ b/src/console.c @@ -339,7 +339,8 @@ static void console_erase_region(struct kmscon_console *con, unsigned int x_from, unsigned int y_from, unsigned int x_to, - unsigned int y_to) + unsigned int y_to, + bool protect) { unsigned int to; struct line *line; @@ -360,8 +361,12 @@ static void console_erase_region(struct kmscon_console *con, to = x_to; else to = con->size_x - 1; - for ( ; x_from <= to; ++x_from) + for ( ; x_from <= to; ++x_from) { + if (protect && line->cells[x_from].attr.protect) + continue; + cell_init(con, &line->cells[x_from]); + } x_from = 0; } } @@ -1010,7 +1015,7 @@ void kmscon_console_erase_cursor(struct kmscon_console *con) else x = con->cursor_x; - console_erase_region(con, x, con->cursor_y, x, con->cursor_y); + console_erase_region(con, x, con->cursor_y, x, con->cursor_y, false); } void kmscon_console_erase_cursor_to_end(struct kmscon_console *con) @@ -1026,7 +1031,7 @@ void kmscon_console_erase_cursor_to_end(struct kmscon_console *con) x = con->cursor_x; console_erase_region(con, x, con->cursor_y, con->size_x - 1, - con->cursor_y); + con->cursor_y, false); } void kmscon_console_erase_home_to_cursor(struct kmscon_console *con) @@ -1035,7 +1040,7 @@ void kmscon_console_erase_home_to_cursor(struct kmscon_console *con) return; console_erase_region(con, 0, con->cursor_y, con->cursor_x, - con->cursor_y); + con->cursor_y, false); } void kmscon_console_erase_current_line(struct kmscon_console *con) @@ -1044,7 +1049,7 @@ void kmscon_console_erase_current_line(struct kmscon_console *con) return; console_erase_region(con, 0, con->cursor_y, con->size_x - 1, - con->cursor_y); + con->cursor_y, false); } void kmscon_console_erase_screen_to_cursor(struct kmscon_console *con) @@ -1052,7 +1057,7 @@ void kmscon_console_erase_screen_to_cursor(struct kmscon_console *con) if (!con) return; - console_erase_region(con, 0, 0, con->cursor_x, con->cursor_y); + console_erase_region(con, 0, 0, con->cursor_x, con->cursor_y, false); } void kmscon_console_erase_cursor_to_screen(struct kmscon_console *con) @@ -1068,7 +1073,7 @@ void kmscon_console_erase_cursor_to_screen(struct kmscon_console *con) x = con->cursor_x; console_erase_region(con, x, con->cursor_y, con->size_x - 1, - con->size_y - 1); + con->size_y - 1, false); } void kmscon_console_erase_screen(struct kmscon_console *con) @@ -1076,5 +1081,6 @@ void kmscon_console_erase_screen(struct kmscon_console *con) if (!con) return; - console_erase_region(con, 0, 0, con->size_x - 1, con->size_y - 1); + console_erase_region(con, 0, 0, con->size_x - 1, con->size_y - 1, + false); } diff --git a/src/font.h b/src/font.h index 61e9457..0fa9142 100644 --- a/src/font.h +++ b/src/font.h @@ -120,6 +120,7 @@ struct font_char_attr { unsigned int bold : 1; /* bold character */ unsigned int underline : 1; /* underlined character */ unsigned int inverse : 1; /* inverse colors */ + unsigned int protect : 1; /* cannot be erased */ }; /* font draw/assemble buffers */ diff --git a/src/vte.c b/src/vte.c index 4366be0..c9f2ef1 100644 --- a/src/vte.c +++ b/src/vte.c @@ -315,6 +315,7 @@ static void reset_state(struct kmscon_vte *vte) vte->cattr.bold = 0; vte->cattr.underline = 0; vte->cattr.inverse = 0; + vte->cattr.protect = 0; } static void save_state(struct kmscon_vte *vte)