Made status bar into a namespace, and added functionnalities

4 files changed, 155 insertions, 41 deletions

diff --git a/Source/Kernel/Core/SB.ns.cpp b/Source/Kernel/Core/SB.ns.cpp
new file mode 100644
index 0000000..62714a1
--- /dev/null
+++ b/Source/Kernel/Core/SB.ns.cpp
@@ -0,0 +1,101 @@
+#include "SB.ns.h"
+#include <Mutex.class.h>
+#include <TaskManager/Task.ns.h>
+#include <MemoryManager/PhysMem.ns.h>
+#include <DeviceManager/Disp.ns.h>
+
+namespace SB {
+
+SimpleVT *sb = NULL;
+
+String msg;
+
+u16int boot_progress = 0;
+bool gone_multi = false;
+
+Mutex lock(MUTEX_FALSE);
+
+void init() {
+	sb = new SimpleVT(1, 80, STATUSBAR_FGCOLOR, STATUSBAR_BGCOLOR);
+	sb->map(0, 0);
+	sb->hideCursor();
+}
+
+void reinit() {
+	if (!gone_multi) return;
+	lock.waitLock();
+	delete sb;
+	sb = new SimpleVT(1, Disp::mode.textCols, STATUSBAR_FGCOLOR, STATUSBAR_BGCOLOR);
+	sb->map(0, 0);
+	sb->hideCursor();
+	lock.unlock();
+}
+
+void drawprogress(const String& s) {
+	*sb << "\nMelon is loading :       {";
+	for (u32int i = 0; i < boot_progress; i++) *sb << ":";
+	*sb << ".";
+	sb->moveCursor(0, 45);
+	*sb << "}";
+	sb->moveCursor(0, 51);
+	*sb << "[" << s;
+	sb->moveCursor(0, 78);
+	*sb << "]";
+}
+
+void drawnormal() {
+	*sb << "\n [Up:" << (s64int)Time::uptime() << "s";
+	sb->moveCursor(0, 10);
+	*sb << "] [Mem:" << (s64int)PhysMem::free() << "/" << (s64int)PhysMem::total();
+	sb->moveCursor(0, 28);
+	*sb << "] [Proc.:" << (s64int)Task::processes->size();
+	sb->moveCursor(0, 39);
+	*sb << "] [Threads:" << (s64int)Task::threads->size();
+	sb->moveCursor(0, 52);
+	*sb << "] [" << msg;
+	sb->moveCursor(0, sb->width() - 2);
+	*sb << "]";
+}
+
+u32int thread(void*) {
+	while (!gone_multi);	//Synchronize
+	while (1) {
+		lock.waitLock();
+		if (boot_progress != 0) {
+			drawprogress(msg);
+		} else {
+			drawnormal();
+		}
+		lock.unlock();
+		Task::currThread()->sleep(100);
+	}
+	return 0;
+}
+
+void gomulti() {
+	new Thread(thread, 0, true);
+	gone_multi = true;
+}
+
+void progress(const String& s) {
+	if (gone_multi) {
+		lock.waitLock();
+		boot_progress++;
+		msg = s;
+		lock.unlock();
+	} else {
+		boot_progress++;
+		drawprogress(s);
+	}
+}
+
+void message(const String& s) {
+	if (!gone_multi) return;
+	lock.waitLock();
+	boot_progress = 0;
+	msg = s;
+	drawnormal();
+	lock.unlock();
+}
+
+} //END NS
diff --git a/Source/Kernel/Core/SB.ns.h b/Source/Kernel/Core/SB.ns.h
new file mode 100644
index 0000000..687be02
--- /dev/null
+++ b/Source/Kernel/Core/SB.ns.h
@@ -0,0 +1,16 @@
+#ifndef DEF_SB_NS_H
+#define DEF_SB_NS_H
+
+//StatusBar namespace :)
+#include <VTManager/SimpleVT.class.h>
+
+namespace SB {
+	void init();	//Setup status bar with default 80col configuration
+	void reinit();	//Setup status bar querying Disp:: for text screen width
+	void gomulti();	//Launch new thread for status bar
+	void progress(const String& s);	//Update progress
+	void message(const String& s);	//Set a message
+
+}
+
+#endif
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp
index 59da244..05e0d7d 100644
--- a/Source/Kernel/Core/Sys.ns.cpp
+++ b/Source/Kernel/Core/Sys.ns.cpp
@@ -7,6 +7,7 @@
 #include <UserManager/Usr.ns.h>
 #include <MemoryManager/PhysMem.ns.h>
 #include <DeviceManager/Time.ns.h>
+#include <Core/SB.ns.h>
 
 #define DEBUGVT(x) SimpleVT *x = new SimpleVT(4, 56, PANIC_FGCOLOR, PANIC_BGCOLOR); x->map(); x->put('\n');
 
@@ -95,6 +96,7 @@ void stackTrace(u32int ebp, VirtualTerminal& vt, u32int maxframes, bool isUser)
 
 //Used by PANIC() macro (see common.wtf.h)
 void panic(char *message, char *file, u32int line) {
+	SB::message("PANIC");
 	asm volatile("cli");
 
 	DEBUGVT(vt);
@@ -106,6 +108,7 @@ void panic(char *message, char *file, u32int line) {
 }
 
 void panic(char *message, registers_t *regs, char *file, u32int line) {
+	SB::message("PANIC");
 	asm volatile("cli");
 
 	SimpleVT vt(15, 70, BSOD_FGCOLOR, BSOD_BGCOLOR);
@@ -129,6 +132,7 @@ void panic(char *message, registers_t *regs, char *file, u32int line) {
 
 //Used by ASSERT() macro (see common.wtf.h)
 void panic_assert(char *file, u32int line, char *desc) {
+	SB::message("ASSERTION FAILED");
 	asm volatile("cli");
 
 	DEBUGVT(vt);
@@ -140,17 +144,20 @@ void panic_assert(char *file, u32int line, char *desc) {
 }
 
 void shutdown_cleanup() {
+	SB::message("Cleaning up system");
 	asm volatile("cli");
 	Log::close();
 }
 
 void reboot() {
 	shutdown_cleanup();
+	SB::message("Rebooting...");
 	outb(0x64, 0xFE);
 }
 
 void halt() {
 	shutdown_cleanup();
+	SB::message("Halting");
 	String message("MELON SEZ : KTHXBYE, U CAN NAOW TURNZ OFF UR COMPUTER.");
 	SimpleVT vt(3, message.size() + 16, HALT_FGCOLOR, HALT_BGCOLOR);
 	vt.map();
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index 2dc0377..83fca7b 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -31,6 +31,7 @@
 #include <VFS/VFS.ns.h>
 #include <VFS/DirectoryNode.class.h>
 #include <Core/Log.ns.h>
+#include <Core/SB.ns.h>
 #include <Shell/KernelShell.class.h>
 
 #include <Ressources/Graphics/logo.text.cxd>
@@ -107,6 +108,7 @@ void selectVideoMode(SimpleVT& v) {
 		u32int n = answer.toInt();
 		v.unmap();
 		if (n >= 0 and n < Disp::modes.size() and Disp::setMode(Disp::modes[n])) {
+			SB::reinit();
 			return;
 		} else {
 			Disp::setMode(Disp::modes[1]);
@@ -116,29 +118,9 @@ void selectVideoMode(SimpleVT& v) {
 	}
 }
 
-#define STATUS(stat) { \
-	progress++;		\
-	kvt->setColor(STATUSBAR_FGCOLOR, STATUSBAR_BGCOLOR);	\
-	line = kvt->csrlin();	\
-	kvt->moveCursor(0, 0);	\
-	*kvt << "Melon is loading :       {";	\
-	for (u32int i = 0; i < progress; i++) *kvt << ":";	\
-	*kvt << ".              ";	\
-	kvt->moveCursor(0, 42);	\
-	*kvt << "}                                    ";	\
-	kvt->moveCursor(0, 51);	\
-	*kvt << "[" << stat;	\
-	kvt->moveCursor(0, 78);	\
-	*kvt << "] ";	\
-	kvt->setColor(KVT_FGCOLOR, KVT_BGCOLOR);	\
-	kvt->moveCursor(line, 0);	\
-}
-
 void kmain(multiboot_info_t* mbd, u32int magic) {
 	DEBUG("Entering kmain.");
 
-	u16int progress = 0, line;	//For logger
-
 	if (magic != MULTIBOOT_BOOTLOADER_MAGIC) {
 		Mem::placementAddress = (u32int)&end;	//Setup basic stuff so that PANIC will work
 		VGATextOutput *vgaout = new VGATextOutput();
@@ -163,37 +145,41 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	VGATextOutput *vgaout = new VGATextOutput();
 	Disp::setText(vgaout);
 
+	SB::init();
+
 	//Create a VT for logging what kernel does
-	kvt = new ScrollableVT(25, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR);
-	kvt->map(0, 0);
-	*kvt << "Melon is loading :\n";
+	SB::progress("Create kernel VT");
+	kvt = new ScrollableVT(24, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR);
+	kvt->map(1, 0);
+	kvt->moveCursor(0, 0);
 
-	STATUS("IDT");
+	SB::progress("IDT");
 	IDT::init();		//Setup interrupts 
 
-	STATUS("Paging");
+	SB::progress("Paging");
 	u32int totalRam = ((mbd->mem_upper + mbd->mem_lower) * 1024);
 	PhysMem::initPaging(totalRam);		//Setup paging 
 
-	STATUS("GDT");
+	SB::progress("GDT");
 	GDT::init();		//Initialize real GDT, not fake one from loader.wtf.asm
 	PhysMem::removeTemporaryPages(); 	//Remove useless page mapping
 
-	STATUS("Heap");
+	SB::progress("Heap");
 	Mem::createHeap();		//Create kernel heap 
 	Dev::registerDevice(vgaout);
 
-	STATUS("Timer");
+	SB::progress("Timer");
 	Dev::registerDevice(new Timer()); 	//Initialize timer
 	String kcmdline((char*)mbd->cmdline);
-	STATUS("Multitasking");
+	SB::progress("Multitasking");
 	Task::initialize(kcmdline, kvt);	//Initialize multitasking 
+	SB::gomulti();
 
 	asm volatile("sti");
 
 	//***************************************	PARSE COMMAND LINE
 	
-	STATUS("Parse command line");
+	SB::progress("Parse command line");
 	Vector<String> opts = kcmdline.split(" ");
 	String keymap = "builtin", init = "/System/Applications/PaperWork.app";
 	String root = "ramfs:0";
@@ -210,15 +196,15 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 
 	//*************************************** 	DEVICE SETUP
 
-	STATUS("Keyboard");		Dev::registerDevice(new PS2Keyboard());	//Initialize keyboard driver
+	SB::progress("Keyboard");		Dev::registerDevice(new PS2Keyboard());	//Initialize keyboard driver
 	Kbd::setFocus(kvt);	//Set focus to virtual terminal
-	STATUS("VESA");			if (enableVESA) Dev::registerDevice(new VESADisplay());
-	STATUS("Floppy");		FloppyController::detect();
-	STATUS("Hard disk drives");	ATAController::detect();
+	SB::progress("VESA");			if (enableVESA) Dev::registerDevice(new VESADisplay());
+	SB::progress("Floppy");		FloppyController::detect();
+	SB::progress("Hard disk drives");	ATAController::detect();
 
 	//***************************************	MOUNT FILESYSTEMS
 
-	STATUS("Root filesystem");
+	SB::progress("Root filesystem");
 	{	// mount root filesystem
 		if (!VFS::mount(String("/:") += root, kvt, mbd)) PANIC("Cannot mount root filesystem.");
 	}
@@ -226,7 +212,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	cwd = VFS::getRootNode();
 	Task::currProcess()->setCwd(cwd);
 
-	STATUS("File systems");
+	SB::progress("File systems");
 	// mount other filesystems
 	for (u32int i = 0; i < mount.size(); i++) {
 		VFS::mount(mount[i], kvt, mbd);
@@ -243,35 +229,38 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	
 	//***************************************	LOAD SYSTEM STUFF
 
-	STATUS("Logging");
+	SB::progress("Logging");
 	Log::init(KL_STATUS);	//Setup logging
 	Log::log(KL_STATUS, "kmain : Melon booting.");
 
 	if (keymap != "builtin") {
-		STATUS("Keymap");
+		SB::progress("Keymap");
 		if (!Kbd::loadKeymap(keymap)) Log::log(KL_WARNING, String("WARNING : Could not load keymap ") += keymap += ", using built-in keymap instead.");
 	}
 
-	STATUS("Users");
+	SB::progress("Users");
 	Usr::load();			//Setup user managment
 	Log::log(KL_STATUS, "kmain : User list loaded");
 
 	if (init.empty()) {
-		STATUS("= LAUNCHING KERNEL SHELL =");
+		SB::progress("Start kernel shell");
 		*kvt << "\n";
 		new KernelShell(cwd, kvt);
+		SB::message("Melon is running \\o/");
 		while (KernelShell::getInstances() > 0) {
 			Task::currThread()->sleep(100);
 		}
 		Sys::halt();
 	} else {
-		STATUS("=  VIDEO MODE DETECTION  =");
+		SB::progress("Video mode selection");
 		selectVideoMode(*kvt);
+		SB::progress("Logo setup");
 		//Create a VT for handling the Melon bootup logo
 		SimpleVT *melonLogoVT = new SimpleVT(melonLogoLines, melonLogoCols, TXTLOGO_FGCOLOR, TXTLOGO_BGCOLOR);
 		melonLogoVT->map(1);
 		new Thread(logoAnimation, (void*)melonLogoVT, true);
 
+		SB::progress("Launch INIT");
 		Process* p = Process::run(init, 0);
 		if (p == 0) {
 			PANIC((char*)(u8int*)ByteArray(String("Could not launch init : ") += init));
@@ -284,6 +273,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 			p->setInVT(vt);
 			p->setOutVT(vt);
 			p->start();
+			SB::message("Init started");
 			while (p->getState() != P_FINISHED) Task::currThread()->sleep(100);
 			PANIC("Init has terminated");
 		}