* Semi implemented customisable prompt

* Added some settings variable
* Added func.h

Author: Arun007coder

Drivers/Keyboard.cpp

@@ -3,12 +3,15 @@
 static bool isCTRLed = false;
 bool canNewLine = true;
 
+void PrintPrompt();
+
 bool isUSRChanged = false;
 void printf(char *);
 void printfchar(char st);
 void printHex(uint8_t key);
 void PrintDate();
 char* INTTOCHARPOINT(int num);
+void beep();
 void ColourPrint(int type);
 bool txtcolor;
 bool isESPChanged = false;
@@ -60,8 +63,8 @@ CommandPort(0x64)
         SP[i] = "\0";
     }
 
-    char* Shell_Prompt[15] = {"r","o","o","t","@","s","e","c","o","s",":","~","#",">", " "};
-    for (int i = 0; i < 15; i++)
+    char *Shell_Prompt[14] = {"%", "u", "@", "%", "h", "[", "%", "d" , "}" , ";", "~", "#", ">", " "};
+    for (int i = 0; i < 14; i++)
     {
         SP[SPIndex] = Shell_Prompt[i];
         SPIndex++;
@@ -523,6 +526,10 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         {
             //power.shutdown();
         }
+        else if (key_buffer[0] == "b" && key_buffer[1] == "e" && key_buffer[2] == "e" && key_buffer[3] == "p")
+        {
+            beep();
+        }
         else
         {
             printf("Unknown Command \"");
@@ -535,13 +542,12 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         if(!isTxtMode){
             if (canNewLine)
                 printf("\n");
-            for (int i = 0; SPIndex > i; i++)
-            {
-                printf(SP[i]);
-            }
             canNewLine = true;
         }
-        serialport.logToSerialPort("Command interpreter got a command :- "); serialport.logToSerialPort(COMNAME); serialport.logToSerialPort("\n");
+        PrintPrompt();
+        serialport.logToSerialPort("Command interpreter got a command :- ");
+        serialport.logToSerialPort(COMNAME);
+        serialport.logToSerialPort("\n");
         clear_key_buffer();
     }
 }

Include/Public_VAR.h

@@ -5,7 +5,7 @@ inline char* OS_NAME = "SectorOS";
 
 inline char* KERNEL_NAME = "SectorOS";
 inline char* KERNEL_VERSION = "V2.3.1";
-inline char* KERNEL_BUILD = "Build: 2022-01-09";
+inline char* KERNEL_BUILD = "Build: 2022-01-25";
 inline char* KERNEL_ARCH = "x86";
 
 inline char* SHELL_NAME = "SOSH";
@@ -141,7 +141,7 @@ inline char* KeycodeToASCII(uint8_t Keycode)
             case 0x2D:if (!isShift) result = "x"; else result = "X"; break;
             case 0x2E:if (!isShift) result = "c"; else result = "C"; break;
             case 0x2F:if (!isShift) result = "v"; else result = "V"; break;
-            case 0x30:if (!isShift) result = "v"; else result = "B"; break;
+            case 0x30:if (!isShift) result = "b"; else result = "B"; break;
             case 0x31:if (!isShift) result = "n"; else result = "N"; break;
             case 0x32:if (!isShift) result = "m"; else result = "M"; break;
             case 0x33:if (!isShift) result = ","; else result = "<"; break;

Include/func.h

@@ -0,0 +1,9 @@
+#ifndef FUNC_H
+#define FUNC_H
+
+inline char CharPOINTERToChar(char* c)
+{
+    return *c;
+}
+
+#endif

kernel/Settings.h

@@ -0,0 +1,19 @@
+#ifndef __SETTINGS_H
+#define __SETTINGS_H
+
+#include "../Include/types.h"
+
+class Settings
+{
+public:
+    char *UserName = "root";
+    int UserNameLength = 4;
+    char *UserPassword = "root";
+    char* Hostname = "localhost";
+    int HostnameLength = 10;
+
+    bool IsNetworkEnabled = false;
+    bool IsHDDEnabled = true;
+};
+
+#endif

kernel/kernel.cpp

@@ -5,6 +5,8 @@
 #include "../Drivers/Keyboard.h"
 #include "../Shell/Shell.h"
 #include "../Include/multiboot.h"
+#include "../Include/func.h"
+#include "Settings.h"
 #include "../Hardcom/SerialPort.h"
 #include "../CPU/syscall.h"
 #include "../Drivers/Mouse.h"
@@ -25,11 +27,16 @@ static uint8_t cursorx;
 static bool useMouse = true;
 bool isused;
 
+bool isPrefix;
+bool lkl;
+int index = 0;
+int spind = 0;
+
 static uint8_t x = 0, y = 0;
 
 bool isTxtMode;
-KeyboardDriver* kbrd;
-DriverManager* drvMngr;
+KeyboardDriver *kbrd;
+DriverManager *drvMngr;
 InterruptManager* intMngr;
 SyscallHandler* shand;
 extern const void *mb;
@@ -45,6 +52,7 @@ port8BIT port61(0x61);
 int delay;
 volatile int done;
 static uint16_t *VideoMemory = (uint16_t *)0xb8000;
+Settings set;
 
 static void play_sound(uint32_t nFrequence)
 {
@@ -724,7 +732,6 @@ void printf(char *str)
             for (int i = 0; i != 80; i++)
                 VideoMemory[80 * 1 + i] = (VideoMemory[80 * 1 + i] & 0xFF00) | foo[i];
             printf("\n");
-            play_sound(440);
         }
     }
 
@@ -743,6 +750,42 @@ void PrintDate()
     printf(INTTOCHARPOINT(rtclock.year));
 }
 
+void PrintPrompt()
+{
+    for (int i = 0; SPIndex > i; i++)
+    {
+        if (SP[i][0] == '%')
+        {
+            switch (SP[i + 1][0])
+            {
+            case 'd':
+            {
+                PrintDate();
+                index = 2;
+                break;
+            }
+            case 'u':
+            {
+                printf(set.UserName);
+                index = 2;
+                break;
+            }
+            case 'h':
+            {
+                printf(set.Hostname);
+                index = 2;
+                break;
+            }
+            }
+        }
+        else if (index <= 0)
+        {
+            printf(SP[i]);
+        }
+        index--;
+    }
+}
+
 void printTime()
 {
     if (!done && delay)
@@ -1162,7 +1205,8 @@ extern "C" void kernelMain(const void *multiboot_structure, uint32_t multiboot_m
 
     printf("Allocating Memory....\n");
     PrintMEM(multiboot_structure);
-    //PrintPartitions();
+
+    // PrintPartitions();
     sp.logToSerialPort("\nHardware initialising stage 3 finished");
     detect_cpu();
 
@@ -1186,9 +1230,10 @@ extern "C" void kernelMain(const void *multiboot_structure, uint32_t multiboot_m
     printf("Welcome to SectorOS Shell\nRun help to get the list of commands which is implemented \n \n");
     sp.logToSerialPort("\nKernel initialization surcessful.\nGiving execution access to the kernel.\nAwaiting user input...");
 
-    SPIndex = 15;
+    SPIndex = set.UserNameLength + set.HostnameLength + 5 + 11;
 
-    asm("int $0x80" :: "a"(1), "b"("root@secos:~#> ")); // Used syscall to print this prompt
+    //asm("int $0x80" :: "a"(1), "b"("root@secos:~#> ")); // Used syscall to print this prompt
+    PrintPrompt();
     SPOMEMLOC(sp);
 
     while (1);