From 1a877f4781d9a6f9c4d60a2246859274b106cbfc Mon Sep 17 00:00:00 2001 From: witekfl Date: Thu, 25 Dec 2008 12:29:45 +0000 Subject: [PATCH] - 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 Changed files: fbterm-256_colors.patch -> 1.2 --- fbterm-256_colors.patch | 55 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/fbterm-256_colors.patch b/fbterm-256_colors.patch index 18dc973..b9e3c25 100644 --- a/fbterm-256_colors.patch +++ b/fbterm-256_colors.patch @@ -288,22 +288,6 @@ diff -Nru fbterm-1.2/src/fbshell.cpp fbterm-1.2.new/src/fbshell.cpp }; 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 @@ diff -Nru fbterm-1.2/src/lib/vterm_action.cpp fbterm-1.2.new/src/lib/vterm_actio 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 @@ diff -Nru fbterm-1.2/src/lib/vterm_action.cpp fbterm-1.2.new/src/lib/vterm_actio 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 { -- 2.44.0