enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

Add cursor blinking functionality

Browse Source
This commit is contained in:
EnderIce2 2024-02-29 02:18:20 +02:00
parent d3a22aa7b3
commit 10aa3d31ec
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
kshell/shell.cpp
View File

@ -21,6 +21,7 @@
#include <driver.hpp>
#include <lock.hpp>
#include <debug.h>
#include <thread>
#include "../kernel.h"
#include "../driver.h"
@ -81,6 +82,77 @@ static Command commands[] = {
{"dump", cmd_dump},
};
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)
{
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);
}
}
}
void UpdateBlinker()
{
if (CurBlinking.load())
{
SmartLock(BlinkerLock);
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(false);
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())
@ -106,6 +178,8 @@ void StartKernelShell()
return;
}
std::thread thd(CursorBlink);
printf("Using \eCA21F6/dev/key\eCCCCCC for keyboard input.\n");
while (true)
{
@ -127,6 +201,12 @@ void StartKernelShell()
ssize_t nBytes;
while (true)
{
uint32_t cx, cy;
Display->GetBufferCursor(&cx, &cy);
CurX.store(cx);
CurY.store(cy);
CurHalt.store(false);
nBytes = fread(kfd, scBuf, 2);
if (nBytes == 0)
continue;
@ -140,6 +220,10 @@ void StartKernelShell()
if (scBuf[0] == 0x00)
continue;
UpdateBlinker();
BlinkerSleep.store(TimeManager->CalculateTarget(250, Time::Units::Milliseconds));
CurHalt.store(true);
uint8_t sc = scBuf[0];
switch (sc & ~KEY_PRESSED)
{