c/helos1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

graphics, kernel: update cursor pos on kMain hlt hit

Browse Source
This commit is contained in:
Edgaru089
2021-10-10 23:20:00 +08:00
parent def2c3bf7a
commit dfce649314
3 changed files with 116 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kernel/kmain.c
View File

@ -15,6 +15,10 @@
#include "../execformat/pe/reloc.h"
void execformat_pe_ReadSystemHeader(execformat_pe_PortableExecutable *pe);
#include "../graphics/graphics.h"
#include "../graphics/xcursor/xcursor.h"
#include "../embed/files.h"
static void tellRIP() {
uint64_t a, b;
asm volatile("leaq (%%rip), %0\n\tleaq runtime_InitPaging(%%rip), %1"
@ -22,6 +26,14 @@ static void tellRIP() {
io_Printf("tellRIP(): Stack position: %llx, RIP=%llx, kMain_StackPosition:%llx(%llx), interrupt_Int128: %llx\n", &a, a, (uint64_t)&kMain_StackPosition, b, (uint64_t)interrupt_Int128);
}
static inline int minmax(int val, int min, int max) {
if (val > max)
return max;
if (val < min)
return min;
return val;
}
SYSV_ABI void kMain() {
io_WriteConsoleASCII("Yes! kMain survived!\n");
@ -44,8 +56,43 @@ SYSV_ABI void kMain() {
irq_pic_ps2_Init();
io_WriteConsoleASCII("PIC PS/2 OK\n");
xcursor_Xcursor cursor;
xcursor_LoadMemory(&cursor, (void *)embed_Xcursor_Default_Data, embed_Xcursor_Default_Data_End - embed_Xcursor_Default_Data);
if (cursor.header) {
for (int i = 0; i < cursor.n; i++) {
if (cursor.toc[i].type == XCURSOR_CHUNKTYPE_IMAGE /*&& ((xcursor_ChunkHeader_Image *)(embed_Xcursor_Default_Data + cursor.toc[i].offset))->subtype == 24*/) {
xcursor_ChunkHeader_Image *image = (xcursor_ChunkHeader_Image *)(embed_Xcursor_Default_Data + cursor.toc[i].offset);
io_Printf("xcursor_Default: Loading size=%dx%d\n", image->width, image->height);
graphics_Cursor = image;
break;
}
}
} else
io_WriteConsoleASCII("xcursor_Default: failed to load\n");
for (;;) {
asm volatile("hlt");
io_WriteConsoleASCII("kMain: Interrupt hit\n");
while (queue_Size(&irq_pic_ps2_QueueMouse) >= (irq_pic_ps2_Mouse4Bytes ? 4 : 3)) {
unsigned int moveX, moveY, state;
do {
state = queue_PopByte(&irq_pic_ps2_QueueMouse);
} while (!(state & (1u << 3)));
unsigned int d = queue_PopByte(&irq_pic_ps2_QueueMouse);
moveX = d - ((state << 4) & 0x100);
d = queue_PopByte(&irq_pic_ps2_QueueMouse);
moveY = d - ((state << 3) & 0x100);
graphics_MouseCursorX = minmax(graphics_MouseCursorX + *((int *)&moveX), 0, graphics_SystemVideoMode.Width - 1);
graphics_MouseCursorY = minmax(graphics_MouseCursorY - *((int *)&moveY), 0, graphics_SystemVideoMode.Height - 1);
if (irq_pic_ps2_Mouse4Bytes)
queue_PopByte(&irq_pic_ps2_QueueMouse);
}
//io_WriteConsoleASCII("kMain: Interrupt hit\n");
graphics_SwapBuffer();
}
}