vt: add color support to the "underline" and "italic" attributes

Add color support to the "underline" and "italic" attributes as in
OpenBSD/NetBSD-style (vt220) and xterm.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Acked-by: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/console.h b/include/linux/console.h
index fcc18e012e45..62ef6e11d0d2 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -51,7 +51,7 @@ struct consw {
         int     (*con_scrolldelta)(struct vc_data *, int);
         int     (*con_set_origin)(struct vc_data *);
         void    (*con_save_screen)(struct vc_data *);
-        u8      (*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8);
+        u8      (*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8, u8);
         void    (*con_invert_region)(struct vc_data *, u16 *, int);
         u16    *(*con_screen_pos)(struct vc_data *, int);
         unsigned long (*con_getxy)(struct vc_data *, unsigned long, int *, int *);
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index a86162b26c0d..a461f76fb004 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -37,6 +37,7 @@ struct vc_data {
         unsigned char   vc_color;               /* Foreground & background */
         unsigned char   vc_s_color;             /* Saved foreground & background */
         unsigned char   vc_ulcolor;             /* Color for underline mode */
+        unsigned char   vc_itcolor;
         unsigned char   vc_halfcolor;           /* Color for half intensity mode */
         /* cursor */
         unsigned int    vc_cursor_type;
@@ -71,10 +72,12 @@ struct vc_data {
         unsigned int    vc_deccolm      : 1;    /* 80/132 Column Mode */
         /* attribute flags */
         unsigned int    vc_intensity    : 2;    /* 0=half-bright, 1=normal, 2=bold */
+        unsigned int    vc_italic:1;
         unsigned int    vc_underline    : 1;
         unsigned int    vc_blink        : 1;
         unsigned int    vc_reverse      : 1;
         unsigned int    vc_s_intensity  : 2;    /* saved rendition */
+        unsigned int    vc_s_italic:1;
         unsigned int    vc_s_underline  : 1;
         unsigned int    vc_s_blink      : 1;
         unsigned int    vc_s_reverse    : 1;