[Linuxconsole-commit]CVS: ruby/linux/drivers/char decvte.c,1.19,1.20 vt.c,1.121,1.122 vt_ioctl.c,1.67,1.68

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv25850/linux/drivers/char

Modified Files:
	decvte.c vt.c vt_ioctl.c 
Log Message:
Synced to console BK.

Index: decvte.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/decvte.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- decvte.c	28 Feb 2002 00:00:58 -0000	1.19
+++ decvte.c	27 Jul 2002 19:33:27 -0000	1.20
@@ -56,18 +56,18 @@
  */
 
 /*  Different states of the emulator */
-enum {  ESinit,
-        /* ESC substates */
-        ESesc, ESacs, ESscf, ESgzd4, ESg1d4, ESg2d4,
-        ESg3d4, ESg1d6, ESg2d6, ESg3d6, ESdocs,
-        /* CSI substates */
-        EScsi, EScsi_getpars, EScsi_gotpars, EScsi_space,
-        EScsi_exclam, EScsi_dquote, EScsi_dollar, EScsi_and,
-        EScsi_squote, EScsi_star, EScsi_plus,
[...3445 lines suppressed...]
+			break;
+		case 'B':	/* ASCII */
+			G3_charset = LAT1_MAP;
+			break;
+		case 'U':
+			G3_charset = IBMPC_MAP;
+			break;
+		case 'K':
+			G3_charset = USER_MAP;
+			break;
+		}
+		if (charset == 1)
+			set_translate(vc, G3_charset);
+		vc_state = ESinit;
+		return;
+	default:
+		vc_state = ESinit;
+	}
 }
-

Index: vt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- vt.c	16 May 2002 18:01:39 -0000	1.121
+++ vt.c	27 Jul 2002 19:33:27 -0000	1.122
@@ -45,14 +45,14 @@
  * glyph unless the disp_ctrl mode is explicitly enabled.
  */
 #define CTRL_ACTION 0x0d00ff81
-#define CTRL_ALWAYS 0x0800f501  /* Cannot be overridden by disp_ctrl */
+#define CTRL_ALWAYS 0x0800f501	/* Cannot be overridden by disp_ctrl */
 
-extern void vcs_make_devfs (unsigned int index, int unregister);
+extern void vcs_make_devfs(unsigned int index, int unregister);
 #ifdef CONFIG_VGA_CONSOLE
 extern void vga_console_init(void);
 #endif
[...2446 lines suppressed...]
+			/* If the console changed between mono <-> color, then
+			 * the attributes in the screenbuf will be wrong.  The
+			 * following resets all attributes to something sane.
+			 */
+			if (old_was_color != vc->vc_can_do_color)
+				clear_buffer_attributes(vc);
+		}
 	}
 	vc = vt->fg_console;
 	update_screen(vc);
 
-       	printk("Console: switching to %s %s %dx%d\n", 
-               	vc->vc_can_do_color ? "colour" : "mono",
-               	desc, vc->vc_cols, vc->vc_rows);
+	printk("Console: switching to %s %s %dx%d\n",
+	       vc->vc_can_do_color ? "colour" : "mono",
+	       desc, vc->vc_cols, vc->vc_rows);
 }
 
 /*

Index: vt_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt_ioctl.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- vt_ioctl.c	16 May 2002 18:01:39 -0000	1.67
+++ vt_ioctl.c	27 Jul 2002 19:33:27 -0000	1.68
@@ -2,7 +2,7 @@
  *  linux/drivers/char/vt_ioctl.c
  *
  *  Copyright (C) 1992 obz under the linux copyright
- *  Copyright (C) 2001 James Simmons <jsi...@tr...>
+ *  Copyright (C) 2002 James Simmons <jsi...@us...>
  *
  *  Dynamic diacritical handling - ae...@cw... - Dec 1993
  *  Dynamic keymap and string allocation - ae...@cw... - May 1994
@@ -34,10 +34,6 @@
 #include <linux/kbd_diacr.h>
 #include <linux/selection.h>
[...1713 lines suppressed...]
+			 * to normal operation. In this case, we'll also change
 			 * back to KD_TEXT mode. I'm not sure if this is 
-		 	 * strictly correct but it saves the agony when the X 
-                   	 * server dies and the screen remains blanked due to
-		 	 * KD_GRAPHICS! It would be nice to do this outside of
-		         * VT_PROCESS but there is no single process to account
-		         * and tracking tty count may be undesirable.
-		 	 */
+			 * strictly correct but it saves the agony when the X 
+			 * server dies and the screen remains blanked due to
+			 * KD_GRAPHICS! It would be nice to do this outside of
+			 * VT_PROCESS but there is no single process to account
+			 * and tracking tty count may be undesirable.
+			 */
 			if (old_vc_mode != new_vc->vc_mode) {
-				if (new_vc->vc_mode == KD_TEXT) 
+				if (new_vc->vc_mode == KD_TEXT)
 					unblank_screen(new_vc->display_fg);
 				else
 					do_blank_screen(new_vc);