Color scheme is now configured in Config.h

8 files changed, 22 insertions, 15 deletions

diff --git a/Init.rfs b/Init.rfs
index 87e0d5b..db9bdcf 100644
--- a/Init.rfs
+++ b/Init.rfs
diff --git a/Source/Kernel/Config.h b/Source/Kernel/Config.h
index e4726a2..2767104 100644
--- a/Source/Kernel/Config.h
+++ b/Source/Kernel/Config.h
@@ -3,4 +3,14 @@
 
 #define OPT_DEBUG
 
+//Color scheme
+#define TXTLOGO_FGCOLOR 9
+#define TXTLOGO_BGCOLOR 0
+#define KVT_FGCOLOR 0
+#define KVT_BGCOLOR 7
+#define KVT_OKCOLOR 1
+#define KVT_BLECOLOR 4	//BLE = Boot Log Entry
+#define KVT_ENTRYCOLOR 6
+#define KVT_LIGHTCOLOR 8
+
 #endif
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index b8ebe49..857e167 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -32,10 +32,10 @@ extern u32int end;	//Placement address
 
 extern "C" void kmain(multiboot_info_t* mbd, u32int magic);
 
-#define INFO(vt) vt->setColor(0); *vt << " - "; vt->setColor(8);
-#define PROCESSING(vt, m) vt->setColor(6); *vt << " > "; vt->setColor(0); *vt << m; \
-	vt->setCursorCol(60); vt->setColor(8); *vt << ": ";
-#define OK(vt) vt->setColor(0); *vt << "[ "; vt->setColor(1); *vt << "OK"; vt->setColor(0); *vt << " ]\n";
+#define INFO(vt) vt->setColor(KVT_FGCOLOR); *vt << " - "; vt->setColor(KVT_LIGHTCOLOR);
+#define PROCESSING(vt, m) vt->setColor(KVT_BLECOLOR); *vt << " > "; vt->setColor(KVT_FGCOLOR); *vt << m; \
+	vt->setCursorCol(60); vt->setColor(KVT_LIGHTCOLOR); *vt << ": ";
+#define OK(vt) vt->setColor(KVT_FGCOLOR); *vt << "[ "; vt->setColor(KVT_OKCOLOR); *vt << "OK"; vt->setColor(KVT_FGCOLOR); *vt << " ]\n";
 
 void kmain(multiboot_info_t* mbd, u32int magic) {
 	DEBUG("Entering kmain.");
@@ -63,7 +63,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	Disp::setDisplay(vgaout);
 
 	//Create a VT for handling the Melon bootup logo
-	VirtualTerminal *melonLogoVT = new VirtualTerminal(melonLogoLines, melonLogoCols, 9, 0);
+	VirtualTerminal *melonLogoVT = new VirtualTerminal(melonLogoLines, melonLogoCols, TXTLOGO_FGCOLOR, TXTLOGO_BGCOLOR);
 	for (int i = 0; i < melonLogoLines; i++) {
 		for (int j = 0; j < melonLogoCols; j++) {
 			melonLogoVT->putChar(i, j, melonLogo[i][j]);
@@ -72,7 +72,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	melonLogoVT->map(1);
 
 	//Create a VT for logging what kernel does
-	VirtualTerminal *kvt = new VirtualTerminal(15, 76, 0, 7);
+	VirtualTerminal *kvt = new VirtualTerminal(15, 76, KVT_FGCOLOR, KVT_BGCOLOR);
 	kvt->map(melonLogoLines + 2);
 
 	INFO(kvt); *kvt << "Lower ram : " << (s32int)mbd->mem_lower << "k, upper : " << (s32int)mbd->mem_upper << "k.\n";
@@ -121,11 +121,11 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	asm volatile("sti");
 
 	while(1) {
-		kvt->setColor(8);
+		kvt->setColor(KVT_LIGHTCOLOR);
 		*kvt << "[" << cwd->getName() << "]# ";
-		kvt->setColor(1);
+		kvt->setColor(KVT_ENTRYCOLOR);
 		Vector<String> tokens = kvt->readLine().split(" ");
-		kvt->setColor(0);
+		kvt->setColor(KVT_FGCOLOR);
 		if (tokens[0] == "help") {
 			*kvt << " - Command list for integrated kernel shell:\n";
 			*kvt << "  - help          shows this help screen\n";
diff --git a/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp b/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp
index c5d0656..ca8dd21 100644
--- a/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp
+++ b/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp
@@ -25,7 +25,6 @@ RamFS::RamFS(u8int *ptr, u32int maxSize, bool writable) {
 	if (curr.i->magic != INITRD_MAGIC) return;
 	u32int files = curr.i->files;
 	curr.i++;	//Increment pointer of size of initrd header
-	DEBUG_HEX(files); DEBUG(" is initrd file count.");
 	for (u32int i = 0; i < files; i++) {
 		initrd_file_header h = *(curr.f);
 		curr.f++;	//Increment pointer of size of file header
diff --git a/Source/Kernel/Library/WChar.class.cpp b/Source/Kernel/Library/WChar.class.cpp
index aad46c3..8b8b2e8 100644
--- a/Source/Kernel/Library/WChar.class.cpp
+++ b/Source/Kernel/Library/WChar.class.cpp
@@ -1,6 +1,6 @@
 #include "WChar.class.h"
 
-WChar WChar::CP437[] = {	//These are the UTF8 equivalents for the 128 extra characters of code page 850
+WChar WChar::CP437[] = {	//These are the UTF8 equivalents for the 128 extra characters of code page 437
 	"Ç", "ü", "é", "â", "ä", "à", "å", "ç", "ê", "ë", "è", "ï", "î", "ì", "Ä", "Å",
 	"É", "æ", "Æ", "ô", "ö", "ò", "û", "ù", "ÿ", "Ö", "Ü", "¢", "£", "¥", "₧", "ƒ",
 	"á", "í", "ó", "ú", "ñ", "Ñ", "ª", "º", "¿", "⌐", "¬", "½", "¼", "¡", "«", "»",
@@ -34,13 +34,13 @@ u32int WChar::utfLen(const char* c, u8int encoding) {
 			else if ((c[i] & 0xF0) == 0xE0) i += 3;
 			else if ((c[i] & 0xF8) == 0xF0) i += 4;
 			else i += 1;
-			co++;
 		} else if (encoding == UE_UTF16) {
 			if ((c[i] & 0xFC) == 0xD8 and (c[i + 2] & 0xFC) == 0xDC) i += 4;
 			else i += 2;
 		} else if (encoding == UE_UTF32) {
 			i += 4;
 		}
+		co++;
 	}
 	return co;
 }
diff --git a/Source/Kernel/Melon.ke b/Source/Kernel/Melon.ke
index 44d5f3c..c1e9c75 100755
--- a/Source/Kernel/Melon.ke
+++ b/Source/Kernel/Melon.ke
diff --git a/Source/Kernel/MemoryManager/PhysMem.ns.cpp b/Source/Kernel/MemoryManager/PhysMem.ns.cpp
index 19323a7..08fa882 100644
--- a/Source/Kernel/MemoryManager/PhysMem.ns.cpp
+++ b/Source/Kernel/MemoryManager/PhysMem.ns.cpp
@@ -20,8 +20,6 @@ void initPaging(u32int mem_size) {
 	while (i < Mem::placementAddress) {
 		page_t *p2 = kernelPageDirectory->getPage(i, true);
 		allocFrame(p2, true, false);
-		/* /DEBUG_HEX(i); DEBUG(" =>");
-		DEBUG_HEX(p2->frame); DEBUG("."); */
 		i += 0x1000;
 	}
 	//Also map thoses pages at begning of virtual memory
diff --git a/Source/Kernel/Ressources/Welcome.txt b/Source/Kernel/Ressources/Welcome.txt
index 882a4a7..67bb8b2 100644
--- a/Source/Kernel/Ressources/Welcome.txt
+++ b/Source/Kernel/Ressources/Welcome.txt
@@ -1,7 +1,7 @@
 EN :
 Welcome to this Melon live-floppy ! For the moment, the project isn't very
 advanced, but if you can read this text, it's already because of a lot of
-great efforts I'v made in Melon's developpment.
+great efforts I've made in Melon's developpment.
 
 FR :
 Bienvenue sur cette live-disquette de Melon ! Pour l'instant, le projet