Re: patch fixing background next to penguin logo in monochrome

["Antonino A. Daplas" <adaplas@hotpop.com>]

On Friday 13 August 2004 04:01, Geert Uytterhoeven wrote:
>
> P.S. There are still problems when switching from color to monochrome
>      (underlines appear everywhere) or vice versa (text becomes blue), but
> I cannot expect you to fix all old bugs in one week ;-)

This one is a little difficult since there is currently no method to convert
monochrome attributes to color and vice versa.  The best one can do is to
clear all attributes when switching from mono<->color.

When switching, one will get plain text only.  This is  probably better than
having text with incorrect attributes.

Attached patch is completely untested, but it's the same one in 2.6.

Tony

diff -uprN linux-2.4-orig/drivers/char/console.c linux-2.4/drivers/char/console.c
--- linux-2.4-orig/drivers/char/console.c	2004-09-13 06:09:05.000000000 +0800
+++ linux-2.4/drivers/char/console.c	2004-09-13 06:13:40.072568112 +0800
@@ -693,6 +693,17 @@ static inline void save_screen(int currc
  *	Redrawing of screen
  */
 
+static void clear_buffer_attributes(int currcons)
+{
+	unsigned short *p = (unsigned short *) origin;
+	int count = screenbuf_size/2;
+	int mask = hi_font_mask | 0xff;
+
+	for (; count > 0; count--, p++) {
+		scr_writew((scr_readw(p)&mask) | (video_erase_char&~mask), p);
+	}
+}
+
 void redraw_screen(int new_console, int is_switch)
 {
 	int redraw = 1;
@@ -728,9 +739,21 @@ void redraw_screen(int new_console, int 
 
 	if (redraw) {
 		int update;
+		int old_was_color = vc_cons[currcons].d->vc_can_do_color;
+
 		set_origin(currcons);
 		update = sw->con_switch(vc_cons[currcons].d);
 		set_palette(currcons);
+		/*
+		 * If console changed from mono<->color, the best we can do
+		 * is to clear the buffer attributes. As it currently stands,
+		 * rebuilding new attributes from the old buffer is not doable
+		 * without overly complex code.
+		 */
+		if (old_was_color != vc_cons[currcons].d->vc_can_do_color) {
+			update_attr(currcons);
+			clear_buffer_attributes(currcons);
+		}
 		if (update && vcmode != KD_GRAPHICS)
 			do_update_region(currcons, origin, screenbuf_size/2);
 	}
@@ -2750,18 +2773,6 @@ void __init con_init(void)
 }
 
 #ifndef VT_SINGLE_DRIVER
-
-static void clear_buffer_attributes(int currcons)
-{
-	unsigned short *p = (unsigned short *) origin;
-	int count = screenbuf_size/2;
-	int mask = hi_font_mask | 0xff;
-
-	for (; count > 0; count--, p++) {
-		scr_writew((scr_readw(p)&mask) | (video_erase_char&~mask), p);
-	}
-}
-
 /*
  *	If we support more console drivers, this function is used
  *	when a driver wants to take over some existing consoles







-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285