fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / console_struct.h

diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index df81e37..ed6c0fe 100644 (file)
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -9,6 +9,11 @@
  * to achieve effects such as fast scrolling by changing the origin.
  */
 
+#include <linux/wait.h>
+#include <linux/vt.h>
+
+struct vt_struct;
+
 #define NPAR 16
 
 struct vc_data {
@@ -24,6 +29,7 @@ struct vc_data {
        const struct consw *vc_sw;
        unsigned short  *vc_screenbuf;          /* In-memory character/attribute buffer */
        unsigned int    vc_screenbuf_size;
+       unsigned char   vc_mode;                /* KD_TEXT, ... */
        /* attributes for all characters on screen */
        unsigned char   vc_attr;                /* Current attributes */
        unsigned char   vc_def_color;           /* Default colors */
@@ -40,12 +46,17 @@ struct vc_data {
        unsigned long   vc_pos;                 /* Cursor address */
        /* fonts */     
        unsigned short  vc_hi_font_mask;        /* [#] Attribute set for upper 256 chars of font or 0 if not supported */
-       struct console_font_op vc_font;         /* Current VC font set */
+       struct console_font vc_font;            /* Current VC font set */
        unsigned short  vc_video_erase_char;    /* Background erase character */
        /* VT terminal data */
        unsigned int    vc_state;               /* Escape sequence parser state */
        unsigned int    vc_npar,vc_par[NPAR];   /* Parameters of current escape sequence */
        struct tty_struct *vc_tty;              /* TTY we are attached to */
+       /* data for manual vt switching */
+       struct vt_mode  vt_mode;
+       struct pid      *vt_pid;
+       int             vt_newvt;
+       wait_queue_head_t paste_wait;
        /* mode flags */
        unsigned int    vc_charset      : 1;    /* Character set G0 / G1 */
        unsigned int    vc_s_charset    : 1;    /* Saved character set */