SOURCES: fbterm-256_colors.patch - updated for 1.3 - it is not done the rig...

[witekfl]

Author: witekfl                      Date: Thu Dec 25 12:29:51 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.3
- it is not done the right way. The separate entry for the fbterm ought
  to be added and 256 colors enabled only for the fbterm

---- Files affected:
SOURCES:
   fbterm-256_colors.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/fbterm-256_colors.patch
diff -u SOURCES/fbterm-256_colors.patch:1.1 SOURCES/fbterm-256_colors.patch:1.2
--- SOURCES/fbterm-256_colors.patch:1.1	Tue Dec 16 15:15:52 2008
+++ SOURCES/fbterm-256_colors.patch	Thu Dec 25 13:29:45 2008
@@ -288,22 +288,6 @@
  };
  
  u16 VTerm::init_history_lines()
-diff -Nru fbterm-1.2/src/fbshell.h fbterm-1.2.new/src/fbshell.h
---- fbterm-1.2/src/fbshell.h	2008-10-12 11:50:02.000000000 +0200
-+++ fbterm-1.2.new/src/fbshell.h	2008-12-16 14:57:08.000000000 +0100
-@@ -23,10 +23,10 @@
- #include "instance.h"
- #include "shell.h"
- 
--#define NR_COLORS 16
-+#define NR_COLORS 256
- 
- struct Color {
--	u8 blue, green, red;
-+	u8 red, green, blue;
- };
- 	
- class FbShell : public Shell {
 diff -Nru fbterm-1.2/src/lib/vterm_action.cpp fbterm-1.2.new/src/lib/vterm_action.cpp
 --- fbterm-1.2/src/lib/vterm_action.cpp	2008-10-12 11:50:02.000000000 +0200
 +++ fbterm-1.2.new/src/lib/vterm_action.cpp	2008-12-16 14:28:19.000000000 +0100
@@ -357,7 +341,7 @@
  		case 38:
 +			tmp_fcolor = char_attr.fcolor;
 +			tmp_underline = char_attr.underline;
- 			char_attr.fcolor = default_fcolor;
+ 			char_attr.fcolor = cur_fcolor;
  			char_attr.underline = true;
 +			mode = MODE_256_WAS_FOREGROUND_38;
  			break;
@@ -373,17 +357,32 @@
  		case 49:
  			char_attr.bcolor = default_bcolor;
  			break;
-diff -Nru fbterm-1.2/src/lib/vterm.h fbterm-1.2.new/src/lib/vterm.h
---- fbterm-1.2/src/lib/vterm.h	2008-10-12 11:50:02.000000000 +0200
-+++ fbterm-1.2.new/src/lib/vterm.h	2008-12-16 14:23:50.000000000 +0100
-@@ -39,8 +39,8 @@
+--- fbterm-1.3/src/lib/vterm.h.orig	2008-12-20 03:48:36.000000000 +0100
++++ fbterm-1.3/src/lib/vterm.h	2008-12-25 13:21:40.000000000 +0100
+@@ -35,8 +35,8 @@
  				|| italic != a.italic || underline != a.underline || blink != a.blink || reverse != a.reverse;
  		}
+ 		
+-		u16 fcolor : 4;
+-		u16 bcolor : 4;
++		u16 fcolor : 8;
++		u16 bcolor : 8;
+ 		u16 intensity : 2; // 0 = half-bright, 1 = normal, 2 = bold
+ 		u16 italic : 1;
+ 		u16 underline : 1;
+diff -Nru fbterm-1.3.old/src/screen.h fbterm-1.3/src/screen.h
+--- fbterm-1.3.old/src/screen.h	2008-12-20 03:48:36.000000000 +0100
++++ fbterm-1.3/src/screen.h	2008-12-25 13:04:41.000000000 +0100
+@@ -24,10 +24,10 @@
+ #include "type.h"
+ #include "instance.h"
+ 
+-#define NR_COLORS 16
++#define NR_COLORS 256
+ 
+ struct Color {
+-    u8 blue, green, red;
++    u8 red, green, blue;
+ };
  
--		s32 fcolor : 5;	// -1 = default
--		s32 bcolor : 5;	// -1 = default
-+		s32 fcolor : 9;	// -1 = default
-+		s32 bcolor : 9;	// -1 = default
- 		u32 intensity : 2; // 0 = half-bright, 1 = normal, 2 = bold
- 		u32 italic : 1;
- 		u32 underline : 1;
+ struct Rectangle {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/fbterm-256_colors.patch?r1=1.1&r2=1.2&f=u