Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-07-11 15:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement Virtual Terminal and fix /dev/kcon

Browse Source
This commit is contained in:
EnderIce2
2024-09-22 13:17:19 +03:00
parent 6f8e486740
commit 85b6fdef80
38 changed files with 1447 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kshell/cmds.hpp
View File

@ -43,6 +43,7 @@ void cmd_lsmod(const char *args);
void cmd_modinfo(const char *args);
void cmd_panic(const char *args);
void cmd_dump(const char *args);
void cmd_theme(const char *args);
#define IF_ARG(x) strcmp(args, x) == 0

3
kshell/commands/clear.cpp
View File

@ -21,6 +21,5 @@
void cmd_clear(const char *)
{
Display->SetBufferCursor(0, 0);
Display->ClearBuffer();
printf("\x1b[2J");
}

16
kshell/commands/ls.cpp
View File

@ -26,19 +26,19 @@ using namespace vfs;
const char *ColorNodeType(FileNode *node)
{
if (node->IsRegularFile())
return "\eCCCCCC";
return "\x1b[32m";
else if (node->IsDirectory())
return "\e3871F5";
return "\x1b[34m";
else if (node->IsBlockDevice())
return "\eE8CD1E";
return "\x1b[33m";
else if (node->IsCharacterDevice())
return "\e86E01F";
return "\x1b[33m";
else if (node->IsFIFO())
return "\eE0991F";
return "\x1b[33m";
else if (node->IsSymbolicLink())
return "\e1FB9E0";
return "\x1b[35m";
else
return "\eF72020";
return "\x1b[0m";
}
__no_sanitize("alignment") size_t MaxNameLength(FileNode *nodes)
@ -100,7 +100,7 @@ __no_sanitize("alignment") void PrintLS(FileNode *node)
offset += read / sizeof(kdirent);
}
printf("\eCCCCCC\n");
printf("\x1b[0m\n");
delete[] dirBuffer;
}

25
kshell/commands/theme.cpp Normal file
View File

@ -0,0 +1,25 @@
/*
This file is part of Fennix Kernel.
Fennix Kernel is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version.
Fennix Kernel is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
*/
#include "../cmds.hpp"
#include "../../kernel.h"
void cmd_theme(const char *args)
{
KernelConsole::SetTheme(args);
}

10
kshell/commands/top.cpp
View File

@ -41,16 +41,16 @@ const char *TaskStateStrings[] = {
void cmd_top(const char *)
{
printf("\e9400A1PID \e9CA100Name \e00A15BState \eCCCCCCPriority Memory Usage CPU Usage\n");
printf("PID Name State Priority Memory Usage CPU Usage\n");
foreach (auto Proc in TaskManager->GetProcessList())
{
#if defined(a64)
printf("\e9400A1%-4d \e9CA100%-20s \e00A15B%s \eCCCCCC%d %ld KiB %ld\n",
printf("%-4d %-20s %s %d %ld KiB %ld\n",
Proc->ID, Proc->Name, TaskStateStrings[Proc->State.load()],
Proc->Info.Priority, TO_KiB(Proc->GetSize()),
Proc->Info.UserTime + Proc->Info.KernelTime);
#elif defined(a32)
printf("\e9400A1%-4d \e9CA100%-20s \e00A15B%s \eCCCCCC%d %lld KiB %lld\n",
printf("%-4d %-20s %s %d %lld KiB %lld\n",
Proc->ID, Proc->Name, TaskStateStrings[Proc->State.load()],
Proc->Info.Priority, TO_KiB(Proc->GetSize()),
Proc->Info.UserTime + Proc->Info.KernelTime);
@ -59,12 +59,12 @@ void cmd_top(const char *)
foreach (auto Thrd in Proc->Threads)
{
#if defined(a64)
printf(" \eA80011%-4d \e9CA100%-20s \e00A15B%s \eCCCCCC%d %ld KiB %ld\n",
printf(" %-4d %-20s %s %d %ld KiB %ld\n",
Thrd->ID, Thrd->Name, TaskStateStrings[Thrd->State.load()],
Thrd->Info.Priority, TO_KiB(Thrd->GetSize()),
Thrd->Info.UserTime + Thrd->Info.KernelTime);
#elif defined(a32)
printf(" \eA80011%-4d \e9CA100%-20s \e00A15B%s \eCCCCCC%d %lld KiB %lld\n",
printf(" %-4d %-20s %s %d %lld KiB %lld\n",
Thrd->ID, Thrd->Name, TaskStateStrings[Thrd->State.load()],
Thrd->Info.Priority, TO_KiB(Thrd->GetSize()),
Thrd->Info.UserTime + Thrd->Info.KernelTime);

272
kshell/shell.cpp
View File

@ -77,89 +77,17 @@ static Command commands[] = {
{"depmod", nullptr},
{"panic", cmd_panic},
{"dump", cmd_dump},
{"theme", cmd_theme},
{"builtin", __cmd_builtin},
};
std::atomic_uint32_t CurX = 0x10, CurY = 0x10;
std::atomic_bool CurBlinking = false;
std::atomic_bool CurHalt = true;
std::atomic_uint64_t BlinkerSleep = 0;
NewLock(BlinkerLock);
void PrintBlinker(uint32_t fx, uint32_t fy)
void KShellThread()
{
for (uint32_t i = 0; i < fx; i++)
{
for (uint32_t j = 0; j < fy; j++)
{
uint32_t px = CurX.load() + i;
uint32_t py = CurY.load() + j;
uint32_t color = Display->GetPixel(px, py);
Display->SetPixel(px, py, ~color);
}
}
}
assert(!ShellLock.Locked());
ShellLock.Lock(__FUNCTION__);
void UpdateBlinker(bool force = false)
{
SmartLock(BlinkerLock);
if (CurBlinking.load() || force)
{
uint32_t fx = 0, fy = 0;
if (unlikely(fx == 0 || fy == 0))
{
fx = Display->GetCurrentFont()->GetInfo().Width;
fy = Display->GetCurrentFont()->GetInfo().Height;
}
PrintBlinker(fx, fy);
CurBlinking.store(force);
Display->UpdateBuffer();
}
}
void CursorBlink()
{
uint32_t fx, fy;
fx = Display->GetCurrentFont()->GetInfo().Width;
fy = Display->GetCurrentFont()->GetInfo().Height;
while (true)
{
if (CurHalt.load() ||
BlinkerSleep.load() > TimeManager->GetCounter())
{
TaskManager->Sleep(250);
continue;
}
{
SmartLock(BlinkerLock);
PrintBlinker(fx, fy);
CurBlinking.store(!CurBlinking.load());
Display->UpdateBuffer();
}
TaskManager->Sleep(500);
{
SmartLock(BlinkerLock);
PrintBlinker(fx, fy);
CurBlinking.store(!CurBlinking.load());
Display->UpdateBuffer();
}
TaskManager->Sleep(500);
}
}
void StartKernelShell()
{
if (ShellLock.Locked())
return;
SmartLock(ShellLock);
debug("Starting kernel shell...");
KPrint("Starting kernel shell...");
thisThread->SetPriority(Tasking::TaskPriority::High);
thisThread->SetPriority(Tasking::TaskPriority::Normal);
std::string strBuf = "";
std::vector<std::string *> history;
@ -168,7 +96,8 @@ void StartKernelShell()
bool upperCase = false;
bool tabDblPress = false;
FileNode *kfd = fs->GetByPath("/dev/input/keyboard", fs->GetRoot(0));
const char *keyDevPath = "/dev/input/keyboard";
FileNode *kfd = fs->GetByPath(keyDevPath, fs->GetRoot(0));
if (kfd == nullptr)
{
KPrint("Failed to open keyboard device!");
@ -179,12 +108,14 @@ void StartKernelShell()
auto strBufBck = [&]()
{
for (size_t i = 0; i < strBuf.size(); i++)
Display->Print('\b');
{
putchar('\b');
putchar(' ');
putchar('\b');
}
};
std::thread thd(CursorBlink);
printf("Using \eCA21F6/dev/key\eCCCCCC for keyboard input.\n");
printf("Using \x1b[1;34m%s\x1b[0m for keyboard input.\n", keyDevPath);
while (true)
{
size_t bsCount = 0;
@ -198,26 +129,20 @@ void StartKernelShell()
cwd = fs->GetRoot(0);
std::string cwdStr = fs->GetByNode(cwd);
printf("\e34C6EB%s@%s:%s$ \eCCCCCC",
printf("\x1b[1;34m%s@%s:%s$ \x1b[0m",
"kernel", "fennix",
cwdStr.c_str());
Display->UpdateBuffer();
Display->GetBufferCursor(&homeX, &homeY);
KeyboardReport scBuf{};
ssize_t nBytes;
while (true)
{
uint32_t __cx, __cy;
Display->GetBufferCursor(&__cx, &__cy);
CurX.store(__cx);
CurY.store(__cy);
CurHalt.store(false);
nBytes = kfd->Read(&scBuf, sizeof(KeyboardReport), 0);
if (nBytes == 0)
{
debug("Empty read from keyboard device!");
continue;
}
if (nBytes < (ssize_t)sizeof(KeyboardReport))
{
KPrint("Failed to read from keyboard device: %s",
@ -225,10 +150,6 @@ void StartKernelShell()
return;
}
BlinkerSleep.store(TimeManager->CalculateTarget(250, Time::Units::Milliseconds));
CurHalt.store(true);
UpdateBlinker();
const KeyScanCodes &sc = scBuf.Key;
switch (sc & ~KEY_PRESSED)
{
@ -263,28 +184,14 @@ void StartKernelShell()
tabDblPress = false;
if (strBuf.size() == 0)
{
if (unseekX != 0 || unseekY != 0)
{
Display->SetBufferCursor(unseekX, unseekY);
unseekX = unseekY = 0;
}
for (size_t i = 0; i < sizeof(commands) / sizeof(commands[0]); i++)
printf("%s ", commands[i].Name);
Display->Print('\n');
Display->UpdateBuffer();
putchar('\n');
goto SecLoopEnd;
}
if (unseekX != 0 || unseekY != 0)
{
Display->SetBufferCursor(unseekX, unseekY);
unseekX = unseekY = 0;
}
strBufBck();
Display->UpdateBuffer();
for (size_t i = 0; i < sizeof(commands) / sizeof(commands[0]); i++)
{
@ -293,9 +200,8 @@ void StartKernelShell()
strBuf = commands[i].Name;
for (size_t i = 0; i < strlen(strBuf.c_str()); i++)
Display->Print(strBuf[i]);
putchar(strBuf[i]);
seekCount = bsCount = strBuf.size();
Display->UpdateBuffer();
break;
}
continue;
@ -312,31 +218,24 @@ void StartKernelShell()
{
debug("seekCount == bsCount (%d == %d)",
seekCount, bsCount);
Display->Print('\b');
putchar('\b');
putchar(' ');
putchar('\b');
strBuf.pop_back();
seekCount = --bsCount;
Display->UpdateBuffer();
continue;
}
uint32_t tmpX, tmpY;
Display->GetBufferCursor(&tmpX, &tmpY);
Display->SetBufferCursor(unseekX, unseekY);
strBufBck();
size_t strSeek = seekCount ? seekCount - 1 : 0;
seekCount = strSeek;
debug("strSeek: %d: %s", strSeek, strBuf.c_str());
strBuf.erase(strSeek);
Display->PrintString(strBuf.c_str());
printf("%s", strBuf.c_str());
debug("after strBuf: %s", strBuf.c_str());
uint32_t fx = Display->GetCurrentFont()->GetInfo().Width;
Display->SetBufferCursor(tmpX - fx, tmpY);
unseekX -= fx;
bsCount--;
Display->UpdateBuffer();
continue;
}
case KEY_DELETE:
@ -354,20 +253,13 @@ void StartKernelShell()
continue;
}
uint32_t tmpX, tmpY;
Display->GetBufferCursor(&tmpX, &tmpY);
Display->SetBufferCursor(unseekX, unseekY);
strBufBck();
debug("seekCount: %d: %s", seekCount, strBuf.c_str());
strBuf.erase(seekCount);
Display->PrintString(strBuf.c_str());
printf("%s", strBuf.c_str());
debug("after strBuf: %s", strBuf.c_str());
Display->SetBufferCursor(tmpX, tmpY);
unseekX -= Display->GetCurrentFont()->GetInfo().Width;
bsCount--;
Display->UpdateBuffer();
continue;
}
case KEY_UP_ARROW:
@ -383,19 +275,16 @@ void StartKernelShell()
if (unseekX != 0 || unseekY != 0)
{
Display->SetBufferCursor(unseekX, unseekY);
unseekX = unseekY = 0;
}
strBufBck();
Display->UpdateBuffer();
strBuf = history[hIdx]->c_str();
for (size_t i = 0; i < strlen(strBuf.c_str()); i++)
Display->Print(strBuf[i]);
putchar(strBuf[i]);
seekCount = bsCount = strBuf.size();
Display->UpdateBuffer();
continue;
}
case KEY_DOWN_ARROW:
@ -410,35 +299,26 @@ void StartKernelShell()
if (hIdx == history.size() - 1)
{
if (unseekX != 0 || unseekY != 0)
{
Display->SetBufferCursor(unseekX, unseekY);
unseekX = unseekY = 0;
}
hIdx++;
strBufBck();
seekCount = bsCount = strBuf.size();
Display->UpdateBuffer();
continue;
}
if (unseekX != 0 || unseekY != 0)
{
Display->SetBufferCursor(unseekX, unseekY);
unseekX = unseekY = 0;
}
strBufBck();
Display->UpdateBuffer();
hIdx++;
strBuf = history[hIdx]->c_str();
for (size_t i = 0; i < strlen(strBuf.c_str()); i++)
Display->Print(strBuf[i]);
putchar(strBuf[i]);
seekCount = bsCount = strBuf.size();
Display->UpdateBuffer();
continue;
}
case KEY_LEFT_ARROW:
@ -446,7 +326,6 @@ void StartKernelShell()
if (!(sc & KEY_PRESSED))
continue;
UpdateBlinker();
if (seekCount == 0)
continue;
@ -454,9 +333,6 @@ void StartKernelShell()
seekCount--;
if (unseekX == 0 && unseekY == 0)
Display->GetBufferCursor(&unseekX, &unseekY);
if (ctrlDown)
{
uint32_t offset = 0;
@ -474,27 +350,9 @@ void StartKernelShell()
}
seekCount++;
debug("offset: %d; seekCount: %d", offset, seekCount);
uint32_t fx = Display->GetCurrentFont()->GetInfo().Width;
uint32_t cx, cy;
Display->GetBufferCursor(&cx, &cy);
Display->SetBufferCursor(cx - (fx * offset), cy);
CurX.store(cx - (fx * offset));
CurY.store(cy);
UpdateBlinker(true);
Display->UpdateBuffer();
continue;
}
uint32_t cx, cy;
Display->GetBufferCursor(&cx, &cy);
uint32_t fx = Display->GetCurrentFont()->GetInfo().Width;
Display->SetBufferCursor(cx - fx, cy);
CurX.store(cx - fx);
CurY.store(cy);
UpdateBlinker(true);
Display->UpdateBuffer();
continue;
}
case KEY_RIGHT_ARROW:
@ -502,16 +360,12 @@ void StartKernelShell()
if (!(sc & KEY_PRESSED))
continue;
UpdateBlinker();
if (seekCount == bsCount)
continue;
seekCount++;
debug("orig seekCount: %d", seekCount);
if (unseekX == 0 && unseekY == 0)
Display->GetBufferCursor(&unseekX, &unseekY);
if (ctrlDown)
{
uint32_t offset = 0;
@ -528,28 +382,9 @@ void StartKernelShell()
seekCount--;
debug("offset: %d; seekCount: %d", offset, seekCount);
uint32_t fx = Display->GetCurrentFont()->GetInfo().Width;
uint32_t cx, cy;
Display->GetBufferCursor(&cx, &cy);
Display->SetBufferCursor(cx + (fx * offset), cy);
CurX.store(cx + (fx * offset));
CurY.store(cy);
UpdateBlinker(true);
Display->UpdateBuffer();
continue;
}
uint32_t cx, cy;
Display->GetBufferCursor(&cx, &cy);
uint32_t fx = Display->GetCurrentFont()->GetInfo().Width;
Display->SetBufferCursor(cx + fx, cy);
CurX.store(cx + fx);
CurY.store(cy);
Display->UpdateBuffer();
UpdateBlinker(true);
continue;
}
case KEY_HOME:
@ -560,20 +395,9 @@ void StartKernelShell()
if (homeX == 0 || homeY == 0)
continue;
UpdateBlinker();
if (unseekX == 0 || unseekY == 0)
Display->GetBufferCursor(&unseekX, &unseekY);
Display->SetBufferCursor(homeX, homeY);
seekCount = 0;
debug("seekCount set to 0");
CurX.store(homeX);
CurY.store(homeY);
Display->UpdateBuffer();
UpdateBlinker(true);
continue;
}
case KEY_END:
@ -584,16 +408,8 @@ void StartKernelShell()
if (unseekX == 0 || unseekY == 0)
continue;
UpdateBlinker();
Display->SetBufferCursor(unseekX, unseekY);
seekCount = bsCount;
debug("seekCount set to bsCount (%d)", bsCount);
CurX.store(unseekX);
CurY.store(unseekY);
Display->UpdateBuffer();
UpdateBlinker(true);
continue;
}
default:
@ -614,20 +430,18 @@ void StartKernelShell()
{
case 'C':
{
Display->Print('^');
Display->Print('C');
Display->Print('\n');
putchar('^');
putchar('C');
putchar('\n');
fixme("No SIGINT handler yet.");
Display->UpdateBuffer();
goto SecLoopEnd;
}
case 'D':
{
Display->Print('^');
Display->Print('D');
Display->Print('\n');
putchar('^');
putchar('D');
putchar('\n');
fixme("No SIGKILL handler yet.");
Display->UpdateBuffer();
goto SecLoopEnd;
}
default:
@ -637,7 +451,7 @@ void StartKernelShell()
if (c == '\n')
{
Display->Print(c);
putchar(c);
if (strBuf.length() > 0)
{
std::string *hBuff = new std::string(strBuf.c_str());
@ -648,34 +462,23 @@ void StartKernelShell()
}
else if (seekCount >= bsCount)
{
Display->Print(c);
putchar(c);
strBuf += c;
seekCount = ++bsCount;
}
else
{
uint32_t tmpX, tmpY;
Display->GetBufferCursor(&tmpX, &tmpY);
if (unseekX != 0 && unseekY != 0)
Display->SetBufferCursor(unseekX, unseekY);
strBufBck();
// size_t strSeek = seekCount ? seekCount - 1 : 0;
debug("seekCount: %d; \"%s\"", seekCount, strBuf.c_str());
strBuf.insert(seekCount, (size_t)1, c);
Display->PrintString(strBuf.c_str());
printf("%s", strBuf.c_str());
debug("after strBuf: %s (seek and bs is +1 [seek: %d; bs: %d])",
strBuf.c_str(), seekCount + 1, bsCount + 1);
uint32_t fx = Display->GetCurrentFont()->GetInfo().Width;
Display->SetBufferCursor(tmpX + fx, tmpY);
unseekX += fx;
seekCount++;
bsCount++;
}
Display->UpdateBuffer();
}
SecLoopEnd:
@ -817,10 +620,5 @@ void StartKernelShell()
printf("%s: command not found\n",
cmd_only.c_str());
}
}
void KShellThread()
{
StartKernelShell();
inf_loop;
}