term: depreciate rt, and switch to flanterm
This commit is contained in:
parent
020d4f092f
commit
621f268f5b
23 changed files with 3201 additions and 9941 deletions
|
@ -38,6 +38,15 @@ ints: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
|
||||||
-d int \
|
-d int \
|
||||||
$(QEMUFLAGS)
|
$(QEMUFLAGS)
|
||||||
|
|
||||||
|
.PHONY: run-x86_64
|
||||||
|
gdb-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
|
||||||
|
qemu-system-$(ARCH) \
|
||||||
|
-M q35 \
|
||||||
|
-drive if=pflash,unit=0,format=raw,file=ovmf/ovmf-code-$(ARCH).fd,readonly=on \
|
||||||
|
-cdrom $(IMAGE_NAME).iso \
|
||||||
|
$(QEMUFLAGS) \
|
||||||
|
-S -s
|
||||||
|
|
||||||
.PHONY: run-x86_64
|
.PHONY: run-x86_64
|
||||||
run-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
|
run-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
|
||||||
qemu-system-$(ARCH) \
|
qemu-system-$(ARCH) \
|
||||||
|
|
8260
kernel/src/font.c
8260
kernel/src/font.c
File diff suppressed because it is too large
Load diff
|
@ -1,4 +1,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
extern unsigned char VGA8[];
|
extern unsigned char VGA8[];
|
||||||
extern unsigned char NotoRegular[];
|
|
18
kernel/src/lib/gcc.c
Normal file
18
kernel/src/lib/gcc.c
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
#include <stdint.h>
|
||||||
|
/*int __eqdf2(double a, double b) {
|
||||||
|
union { double f; uint64_t i; } ua = { a }, ub = { b };
|
||||||
|
return ua.i == ub.i;
|
||||||
|
}
|
||||||
|
int __ltdf2(double a, double b) {
|
||||||
|
if (a < b) return -1;
|
||||||
|
if (a > b) return 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
double __truncxfdf2(double x) {
|
||||||
|
return (double)x;
|
||||||
|
}
|
||||||
|
int __gtdf2(double a, double b) {
|
||||||
|
if (a > b) return 1;
|
||||||
|
if (a < b) return -1;
|
||||||
|
return 0;
|
||||||
|
}**/
|
|
@ -1,29 +1,23 @@
|
||||||
#include "exec/elf.h"
|
#include "exec/elf.h"
|
||||||
#include "font.h"
|
|
||||||
#include "mm/pmm.h"
|
#include "mm/pmm.h"
|
||||||
#include "mm/vma.h"
|
#include "mm/vma.h"
|
||||||
#include "mm/vmm.h"
|
#include "mm/vmm.h"
|
||||||
#include "mm/liballoc/liballoc.h"
|
#include "mm/liballoc/liballoc.h"
|
||||||
#include "mm/memop.h"
|
|
||||||
#include "rt.h"
|
|
||||||
#include "sched/sched.h"
|
#include "sched/sched.h"
|
||||||
#include "sys/arch/x86_64/cpuid.h"
|
|
||||||
#include "sys/arch/x86_64/io.h"
|
|
||||||
#include "sys/arch/x86_64/pit.h"
|
#include "sys/arch/x86_64/pit.h"
|
||||||
#include "sys/arch/x86_64/rtc.h"
|
|
||||||
#include "sys/arch/x86_64/sse.h"
|
#include "sys/arch/x86_64/sse.h"
|
||||||
#include <sys/log.h>
|
#include <sys/log.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <limine.h>
|
#include <limine.h>
|
||||||
|
|
||||||
#include <sys/printf.h>
|
#include <sys/printf.h>
|
||||||
#include <sys/arch/x86_64/gdt.h>
|
#include <sys/arch/x86_64/gdt.h>
|
||||||
#include <sys/arch/x86_64/idt.h>
|
#include <sys/arch/x86_64/idt.h>
|
||||||
|
#include <sys/arch/x86_64/fpu.h>
|
||||||
#define SSFN_IMPLEMENTATION /* use the special renderer for 32 bit truecolor packed pixels */
|
#include <sys/gfx/flanterm/flanterm.h>
|
||||||
#include <sys/gfx/ssfn.h>
|
#include <sys/gfx/flanterm/backends/fb.h>
|
||||||
|
#include <font.h>
|
||||||
|
|
||||||
// Set the base revision to 3, this is recommended as this is the latest
|
// Set the base revision to 3, this is recommended as this is the latest
|
||||||
// base revision described by the Limine boot protocol specification.
|
// base revision described by the Limine boot protocol specification.
|
||||||
|
@ -77,15 +71,9 @@ static void hcf(void) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int init() {
|
|
||||||
asm("int $0x80");
|
|
||||||
while (1)
|
|
||||||
;;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct limine_framebuffer *fb;
|
struct limine_framebuffer *fb;
|
||||||
|
struct flanterm_context *ft_ctx;
|
||||||
|
uint32_t fg = 0xFFFFFF;
|
||||||
|
|
||||||
char kstack[8192];
|
char kstack[8192];
|
||||||
|
|
||||||
|
@ -107,21 +95,42 @@ void kmain(void) {
|
||||||
// Fetch the first framebuffer.
|
// Fetch the first framebuffer.
|
||||||
struct limine_framebuffer *framebuffer = framebuffer_request.response->framebuffers[0];
|
struct limine_framebuffer *framebuffer = framebuffer_request.response->framebuffers[0];
|
||||||
fb = framebuffer;
|
fb = framebuffer;
|
||||||
|
((uint32_t*)fb->address)[0] = 0xFFFFFF;
|
||||||
|
|
||||||
rt_context ctx;
|
ft_ctx = flanterm_fb_init(
|
||||||
ctx.framebuffer = fb->address;
|
NULL,
|
||||||
ctx.framebuffer_width = fb->width;
|
NULL,
|
||||||
ctx.framebuffer_height = fb->height;
|
framebuffer->address, framebuffer->width, framebuffer->height, framebuffer->pitch,
|
||||||
rt_init(ctx);
|
framebuffer->red_mask_size, framebuffer->red_mask_shift,
|
||||||
|
framebuffer->green_mask_size, framebuffer->green_mask_shift,
|
||||||
|
framebuffer->blue_mask_size, framebuffer->blue_mask_shift,
|
||||||
|
NULL,
|
||||||
|
NULL, NULL,
|
||||||
|
NULL, &fg,
|
||||||
|
NULL, NULL,
|
||||||
|
VGA8, 8, 16, 0,
|
||||||
|
0, 0,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!ft_ctx) {
|
||||||
|
asm("cli");
|
||||||
|
asm("hlt");
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n Soaplin 1.0-sild is booting up your computer...\n\n");
|
printf("\n Soaplin 1.0-sild is booting up your computer...\n\n");
|
||||||
//printf("Physical kernel EP: %p", entrypoint_request.entry);
|
//printf("Physical kernel EP: %p", entrypoint_request.entry);
|
||||||
|
|
||||||
gdt_init(&kstack[8192]);
|
gdt_init(&kstack[8192]);
|
||||||
idt_init();
|
idt_init();
|
||||||
|
fpu_activate();
|
||||||
|
|
||||||
sse_init();
|
sse_init();
|
||||||
|
|
||||||
|
float hi = 0.1;
|
||||||
|
hi = hi + 1.1;
|
||||||
|
log("fp: %2.6f\n", hi);
|
||||||
|
|
||||||
pmm_init();
|
pmm_init();
|
||||||
vmm_init();
|
vmm_init();
|
||||||
kernel_vma_context = vma_create_context(vmm_kernel_pm);
|
kernel_vma_context = vma_create_context(vmm_kernel_pm);
|
||||||
|
@ -132,10 +141,10 @@ void kmain(void) {
|
||||||
asm("hlt");
|
asm("hlt");
|
||||||
}
|
}
|
||||||
|
|
||||||
char *a = kmalloc(1);
|
char *a = malloc(1);
|
||||||
*a = 32;
|
*a = 32;
|
||||||
log("Allocated 1 byte at 0x%.16llx\n", (uint64_t)a);
|
log("Allocated 1 byte at 0x%.16llx\n", (uint64_t)a);
|
||||||
kfree(a);
|
free(a);
|
||||||
|
|
||||||
pit_init(1000);
|
pit_init(1000);
|
||||||
sched_init();
|
sched_init();
|
||||||
|
@ -146,48 +155,7 @@ void kmain(void) {
|
||||||
|
|
||||||
elf_load((char*)f->address);
|
elf_load((char*)f->address);
|
||||||
|
|
||||||
memset(framebuffer->address, 0, framebuffer->pitch * framebuffer->height);
|
log("kernel - Soaplin initialized sucessfully.\n");
|
||||||
|
|
||||||
ssfn_t sctx = { 0 }; /* the renderer context */
|
|
||||||
ssfn_buf_t buf = { /* the destination pixel buffer */
|
|
||||||
.ptr = framebuffer->address, /* address of the buffer */
|
|
||||||
.w = framebuffer->width, /* width */
|
|
||||||
.h = framebuffer->height, /* height */
|
|
||||||
.p = framebuffer->pitch, /* bytes per line */
|
|
||||||
.x = 100, /* pen position */
|
|
||||||
.y = 100,
|
|
||||||
.fg = 0xFF808080 /* foreground color */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* add one or more fonts to the context. Fonts must be already in memory */
|
|
||||||
ssfn_load(&sctx, &NotoRegular);
|
|
||||||
|
|
||||||
/* select the typeface to use */
|
|
||||||
ssfn_select(&sctx,
|
|
||||||
SSFN_FAMILY_SANS, NULL, /* family */
|
|
||||||
SSFN_STYLE_REGULAR | SSFN_STYLE_UNDERLINE, /* style */
|
|
||||||
64 /* size */
|
|
||||||
);
|
|
||||||
|
|
||||||
/* rasterize the first glyph in an UTF-8 string into a 32 bit packed pixel buffer */
|
|
||||||
/* returns how many bytes were consumed from the string */
|
|
||||||
ssfn_render(&sctx, &buf, "Hello World.");
|
|
||||||
|
|
||||||
/* free resources */
|
|
||||||
ssfn_free(&sctx);
|
|
||||||
|
|
||||||
|
|
||||||
//uint8_t *mem = pmm_request_page();
|
|
||||||
//mem[0] = 0xCD;
|
|
||||||
//mem[1] = 0x80;
|
|
||||||
//mem[2] = 0xF4;
|
|
||||||
|
|
||||||
//mem[3] = 0xFE;
|
|
||||||
//pagemap_t* pm = vmm_alloc_pm();
|
|
||||||
//vmm_map(pm, 0x1000, (uint64_t)mem, VMM_PRESENT | VMM_USER);
|
|
||||||
//sched_create("Init", 0x1000, pm, SCHED_USER_PROCESS);
|
|
||||||
|
|
||||||
//log("kernel - Soaplin initialized sucessfully.\n");
|
|
||||||
while (1)
|
while (1)
|
||||||
;;//__asm__ volatile ("hlt");
|
;;//__asm__ volatile ("hlt");
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <sys/log.h>
|
#include <sys/log.h>
|
||||||
|
|
||||||
#define PREFIX(func) k##func
|
#define PREFIX(func) func
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
void liballoc_dump();
|
void liballoc_dump();
|
||||||
|
|
|
@ -33,7 +33,8 @@ int liballoc_free(void *ptr, size_t pages)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
extern void *malloc(size_t s) { return PREFIX(malloc)(s); }
|
|
||||||
extern void *realloc(void *v, size_t s) { return PREFIX(realloc)(v, s); }
|
//void *malloc(size_t s) { return PREFIX(malloc)(s); }
|
||||||
extern void *calloc(size_t s1, size_t s) { return PREFIX(calloc)(s1, s); }
|
//void *realloc(void *v, size_t s) { return PREFIX(realloc)(v, s); }
|
||||||
extern void free(void *v) { return PREFIX(free)(v); }
|
//void *calloc(size_t s1, size_t s) { return PREFIX(calloc)(s1, s); }
|
||||||
|
//void free(void *v) { return PREFIX(free)(v); }
|
14
kernel/src/sys/arch/x86_64/fpu.c
Normal file
14
kernel/src/sys/arch/x86_64/fpu.c
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
void fpu_set_cw(const uint16_t cw) {
|
||||||
|
asm volatile("fldcw %0" :: "m"(cw));
|
||||||
|
}
|
||||||
|
|
||||||
|
void fpu_activate() {
|
||||||
|
size_t cr4;
|
||||||
|
asm volatile ("mov %%cr4, %0" : "=r"(cr4));
|
||||||
|
cr4 |= 0x200;
|
||||||
|
asm volatile ("mov %0, %%cr4" :: "r"(cr4));
|
||||||
|
fpu_set_cw(0x37F);
|
||||||
|
}
|
6
kernel/src/sys/arch/x86_64/fpu.h
Normal file
6
kernel/src/sys/arch/x86_64/fpu.h
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
void fpu_set_cw(const uint16_t cw);
|
||||||
|
void fpu_activate();
|
2
kernel/src/sys/gfx/flanterm/.gitignore
vendored
Normal file
2
kernel/src/sys/gfx/flanterm/.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
*.d
|
||||||
|
*.o
|
22
kernel/src/sys/gfx/flanterm/LICENSE
Normal file
22
kernel/src/sys/gfx/flanterm/LICENSE
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
Copyright (C) 2022-2025 mintsuki and contributors.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
43
kernel/src/sys/gfx/flanterm/README.md
Normal file
43
kernel/src/sys/gfx/flanterm/README.md
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
# Flanterm
|
||||||
|
|
||||||
|
Flanterm is a fast and reasonably complete terminal emulator with support for
|
||||||
|
multiple output backends. Included is a fast framebuffer backend.
|
||||||
|
|
||||||
|
### Quick usage
|
||||||
|
|
||||||
|
To quickly set up and use a framebuffer Flanterm instance, it is possible to
|
||||||
|
use the `flanterm_fb_init()` function as such:
|
||||||
|
```c
|
||||||
|
#include <flanterm/flanterm.h>
|
||||||
|
#include <flanterm/backends/fb.h>
|
||||||
|
|
||||||
|
struct flanterm_context *ft_ctx = flanterm_fb_init(
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
framebuffer_ptr, width, height, pitch,
|
||||||
|
red_mask_size, red_mask_shift,
|
||||||
|
green_mask_size, green_mask_shift,
|
||||||
|
blue_mask_size, blue_mask_shift,
|
||||||
|
NULL,
|
||||||
|
NULL, NULL,
|
||||||
|
NULL, NULL,
|
||||||
|
NULL, NULL,
|
||||||
|
NULL, 0, 0, 1,
|
||||||
|
0, 0,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
```
|
||||||
|
Where `framebuffer_ptr, width, height, pitch` and `{red,green,blue}_mask_{size,shift}`
|
||||||
|
represent the corresponding info about the framebuffer to use for this given instance.
|
||||||
|
|
||||||
|
The meaning of the other arguments can be found in `backends/fb.h`.
|
||||||
|
|
||||||
|
To then print to the terminal instance, simply use the `flanterm_write()`
|
||||||
|
function on the given instance. For example:
|
||||||
|
```c
|
||||||
|
#include <flanterm/flanterm.h>
|
||||||
|
|
||||||
|
const char msg[] = "Hello world\n";
|
||||||
|
|
||||||
|
flanterm_write(ft_ctx, msg, sizeof(msg));
|
||||||
|
```
|
1252
kernel/src/sys/gfx/flanterm/backends/fb.c
Normal file
1252
kernel/src/sys/gfx/flanterm/backends/fb.c
Normal file
File diff suppressed because it is too large
Load diff
68
kernel/src/sys/gfx/flanterm/backends/fb.h
Normal file
68
kernel/src/sys/gfx/flanterm/backends/fb.h
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
/* Copyright (C) 2022-2025 mintsuki and contributors.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FLANTERM_FB_H
|
||||||
|
#define FLANTERM_FB_H 1
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "../flanterm.h"
|
||||||
|
|
||||||
|
#ifdef FLANTERM_IN_FLANTERM
|
||||||
|
|
||||||
|
#include "fb_private.h"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
struct flanterm_context *flanterm_fb_init(
|
||||||
|
/* If _malloc and _free are nulled, use the bump allocated instance (1 use only). */
|
||||||
|
void *(*_malloc)(size_t size),
|
||||||
|
void (*_free)(void *ptr, size_t size),
|
||||||
|
uint32_t *framebuffer, size_t width, size_t height, size_t pitch,
|
||||||
|
uint8_t red_mask_size, uint8_t red_mask_shift,
|
||||||
|
uint8_t green_mask_size, uint8_t green_mask_shift,
|
||||||
|
uint8_t blue_mask_size, uint8_t blue_mask_shift,
|
||||||
|
uint32_t *canvas, /* If nulled, no canvas. */
|
||||||
|
uint32_t *ansi_colours, uint32_t *ansi_bright_colours, /* If nulled, default. */
|
||||||
|
uint32_t *default_bg, uint32_t *default_fg, /* If nulled, default. */
|
||||||
|
uint32_t *default_bg_bright, uint32_t *default_fg_bright, /* If nulled, default. */
|
||||||
|
/* If font is null, use default font and font_width and font_height ignored. */
|
||||||
|
void *font, size_t font_width, size_t font_height, size_t font_spacing,
|
||||||
|
/* If scale_x and scale_y are 0, automatically scale font based on resolution. */
|
||||||
|
size_t font_scale_x, size_t font_scale_y,
|
||||||
|
size_t margin
|
||||||
|
);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
121
kernel/src/sys/gfx/flanterm/backends/fb_private.h
Normal file
121
kernel/src/sys/gfx/flanterm/backends/fb_private.h
Normal file
|
@ -0,0 +1,121 @@
|
||||||
|
/* Copyright (C) 2022-2025 mintsuki and contributors.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FLANTERM_FB_PRIVATE_H
|
||||||
|
#define FLANTERM_FB_PRIVATE_H 1
|
||||||
|
|
||||||
|
#ifndef FLANTERM_IN_FLANTERM
|
||||||
|
#error "Do not use fb_private.h. Use interfaces defined in fb.h only."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define FLANTERM_FB_FONT_GLYPHS 256
|
||||||
|
|
||||||
|
struct flanterm_fb_char {
|
||||||
|
uint32_t c;
|
||||||
|
uint32_t fg;
|
||||||
|
uint32_t bg;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct flanterm_fb_queue_item {
|
||||||
|
size_t x, y;
|
||||||
|
struct flanterm_fb_char c;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct flanterm_fb_context {
|
||||||
|
struct flanterm_context term;
|
||||||
|
|
||||||
|
void (*plot_char)(struct flanterm_context *ctx, struct flanterm_fb_char *c, size_t x, size_t y);
|
||||||
|
|
||||||
|
size_t font_width;
|
||||||
|
size_t font_height;
|
||||||
|
size_t glyph_width;
|
||||||
|
size_t glyph_height;
|
||||||
|
|
||||||
|
size_t font_scale_x;
|
||||||
|
size_t font_scale_y;
|
||||||
|
|
||||||
|
size_t offset_x, offset_y;
|
||||||
|
|
||||||
|
volatile uint32_t *framebuffer;
|
||||||
|
size_t pitch;
|
||||||
|
size_t width;
|
||||||
|
size_t height;
|
||||||
|
size_t bpp;
|
||||||
|
|
||||||
|
uint8_t red_mask_size, red_mask_shift;
|
||||||
|
uint8_t green_mask_size, green_mask_shift;
|
||||||
|
uint8_t blue_mask_size, blue_mask_shift;
|
||||||
|
|
||||||
|
size_t font_bits_size;
|
||||||
|
uint8_t *font_bits;
|
||||||
|
size_t font_bool_size;
|
||||||
|
bool *font_bool;
|
||||||
|
|
||||||
|
uint32_t ansi_colours[8];
|
||||||
|
uint32_t ansi_bright_colours[8];
|
||||||
|
uint32_t default_fg, default_bg;
|
||||||
|
uint32_t default_fg_bright, default_bg_bright;
|
||||||
|
|
||||||
|
size_t canvas_size;
|
||||||
|
uint32_t *canvas;
|
||||||
|
|
||||||
|
size_t grid_size;
|
||||||
|
size_t queue_size;
|
||||||
|
size_t map_size;
|
||||||
|
|
||||||
|
struct flanterm_fb_char *grid;
|
||||||
|
|
||||||
|
struct flanterm_fb_queue_item *queue;
|
||||||
|
size_t queue_i;
|
||||||
|
|
||||||
|
struct flanterm_fb_queue_item **map;
|
||||||
|
|
||||||
|
uint32_t text_fg;
|
||||||
|
uint32_t text_bg;
|
||||||
|
size_t cursor_x;
|
||||||
|
size_t cursor_y;
|
||||||
|
|
||||||
|
uint32_t saved_state_text_fg;
|
||||||
|
uint32_t saved_state_text_bg;
|
||||||
|
size_t saved_state_cursor_x;
|
||||||
|
size_t saved_state_cursor_y;
|
||||||
|
|
||||||
|
size_t old_cursor_x;
|
||||||
|
size_t old_cursor_y;
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
1388
kernel/src/sys/gfx/flanterm/flanterm.c
Normal file
1388
kernel/src/sys/gfx/flanterm/flanterm.c
Normal file
File diff suppressed because it is too large
Load diff
80
kernel/src/sys/gfx/flanterm/flanterm.h
Normal file
80
kernel/src/sys/gfx/flanterm/flanterm.h
Normal file
|
@ -0,0 +1,80 @@
|
||||||
|
/* Copyright (C) 2022-2025 mintsuki and contributors.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FLANTERM_H
|
||||||
|
#define FLANTERM_H 1
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define FLANTERM_CB_DEC 10
|
||||||
|
#define FLANTERM_CB_BELL 20
|
||||||
|
#define FLANTERM_CB_PRIVATE_ID 30
|
||||||
|
#define FLANTERM_CB_STATUS_REPORT 40
|
||||||
|
#define FLANTERM_CB_POS_REPORT 50
|
||||||
|
#define FLANTERM_CB_KBD_LEDS 60
|
||||||
|
#define FLANTERM_CB_MODE 70
|
||||||
|
#define FLANTERM_CB_LINUX 80
|
||||||
|
|
||||||
|
#define FLANTERM_OOB_OUTPUT_OCRNL (1 << 0)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_OFDEL (1 << 1)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_OFILL (1 << 2)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_OLCUC (1 << 3)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_ONLCR (1 << 4)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_ONLRET (1 << 5)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_ONOCR (1 << 6)
|
||||||
|
#define FLANTERM_OOB_OUTPUT_OPOST (1 << 7)
|
||||||
|
|
||||||
|
#ifdef FLANTERM_IN_FLANTERM
|
||||||
|
|
||||||
|
#include "flanterm_private.h"
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
struct flanterm_context;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void flanterm_write(struct flanterm_context *ctx, const char *buf, size_t count);
|
||||||
|
void flanterm_flush(struct flanterm_context *ctx);
|
||||||
|
void flanterm_full_refresh(struct flanterm_context *ctx);
|
||||||
|
void flanterm_deinit(struct flanterm_context *ctx, void (*_free)(void *ptr, size_t size));
|
||||||
|
|
||||||
|
void flanterm_get_dimensions(struct flanterm_context *ctx, size_t *cols, size_t *rows);
|
||||||
|
void flanterm_set_autoflush(struct flanterm_context *ctx, bool state);
|
||||||
|
void flanterm_set_callback(struct flanterm_context *ctx, void (*callback)(struct flanterm_context *, uint64_t, uint64_t, uint64_t, uint64_t));
|
||||||
|
uint64_t flanterm_get_oob_output(struct flanterm_context *ctx);
|
||||||
|
void flanterm_set_oob_output(struct flanterm_context *ctx, uint64_t oob_output);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
122
kernel/src/sys/gfx/flanterm/flanterm_private.h
Normal file
122
kernel/src/sys/gfx/flanterm/flanterm_private.h
Normal file
|
@ -0,0 +1,122 @@
|
||||||
|
/* Copyright (C) 2022-2025 mintsuki and contributors.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FLANTERM_PRIVATE_H
|
||||||
|
#define FLANTERM_PRIVATE_H 1
|
||||||
|
|
||||||
|
#ifndef FLANTERM_IN_FLANTERM
|
||||||
|
#error "Do not use flanterm_private.h. Use interfaces defined in flanterm.h only."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define FLANTERM_MAX_ESC_VALUES 16
|
||||||
|
|
||||||
|
struct flanterm_context {
|
||||||
|
/* internal use */
|
||||||
|
|
||||||
|
size_t tab_size;
|
||||||
|
bool autoflush;
|
||||||
|
bool cursor_enabled;
|
||||||
|
bool scroll_enabled;
|
||||||
|
bool control_sequence;
|
||||||
|
bool escape;
|
||||||
|
bool osc;
|
||||||
|
bool osc_escape;
|
||||||
|
bool rrr;
|
||||||
|
bool discard_next;
|
||||||
|
bool bold;
|
||||||
|
bool bg_bold;
|
||||||
|
bool reverse_video;
|
||||||
|
bool dec_private;
|
||||||
|
bool insert_mode;
|
||||||
|
uint64_t code_point;
|
||||||
|
size_t unicode_remaining;
|
||||||
|
uint8_t g_select;
|
||||||
|
uint8_t charsets[2];
|
||||||
|
size_t current_charset;
|
||||||
|
size_t escape_offset;
|
||||||
|
size_t esc_values_i;
|
||||||
|
size_t saved_cursor_x;
|
||||||
|
size_t saved_cursor_y;
|
||||||
|
size_t current_primary;
|
||||||
|
size_t current_bg;
|
||||||
|
size_t scroll_top_margin;
|
||||||
|
size_t scroll_bottom_margin;
|
||||||
|
uint32_t esc_values[FLANTERM_MAX_ESC_VALUES];
|
||||||
|
uint64_t oob_output;
|
||||||
|
bool saved_state_bold;
|
||||||
|
bool saved_state_bg_bold;
|
||||||
|
bool saved_state_reverse_video;
|
||||||
|
size_t saved_state_current_charset;
|
||||||
|
size_t saved_state_current_primary;
|
||||||
|
size_t saved_state_current_bg;
|
||||||
|
|
||||||
|
/* to be set by backend */
|
||||||
|
|
||||||
|
size_t rows, cols;
|
||||||
|
|
||||||
|
void (*raw_putchar)(struct flanterm_context *, uint8_t c);
|
||||||
|
void (*clear)(struct flanterm_context *, bool move);
|
||||||
|
void (*set_cursor_pos)(struct flanterm_context *, size_t x, size_t y);
|
||||||
|
void (*get_cursor_pos)(struct flanterm_context *, size_t *x, size_t *y);
|
||||||
|
void (*set_text_fg)(struct flanterm_context *, size_t fg);
|
||||||
|
void (*set_text_bg)(struct flanterm_context *, size_t bg);
|
||||||
|
void (*set_text_fg_bright)(struct flanterm_context *, size_t fg);
|
||||||
|
void (*set_text_bg_bright)(struct flanterm_context *, size_t bg);
|
||||||
|
void (*set_text_fg_rgb)(struct flanterm_context *, uint32_t fg);
|
||||||
|
void (*set_text_bg_rgb)(struct flanterm_context *, uint32_t bg);
|
||||||
|
void (*set_text_fg_default)(struct flanterm_context *);
|
||||||
|
void (*set_text_bg_default)(struct flanterm_context *);
|
||||||
|
void (*set_text_fg_default_bright)(struct flanterm_context *);
|
||||||
|
void (*set_text_bg_default_bright)(struct flanterm_context *);
|
||||||
|
void (*move_character)(struct flanterm_context *, size_t new_x, size_t new_y, size_t old_x, size_t old_y);
|
||||||
|
void (*scroll)(struct flanterm_context *);
|
||||||
|
void (*revscroll)(struct flanterm_context *);
|
||||||
|
void (*swap_palette)(struct flanterm_context *);
|
||||||
|
void (*save_state)(struct flanterm_context *);
|
||||||
|
void (*restore_state)(struct flanterm_context *);
|
||||||
|
void (*double_buffer_flush)(struct flanterm_context *);
|
||||||
|
void (*full_refresh)(struct flanterm_context *);
|
||||||
|
void (*deinit)(struct flanterm_context *, void (*)(void *, size_t));
|
||||||
|
|
||||||
|
/* to be set by client */
|
||||||
|
|
||||||
|
void (*callback)(struct flanterm_context *, uint64_t, uint64_t, uint64_t, uint64_t);
|
||||||
|
};
|
||||||
|
|
||||||
|
void flanterm_context_reinit(struct flanterm_context *ctx);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
File diff suppressed because it is too large
Load diff
|
@ -1,11 +1,16 @@
|
||||||
#include "rt.h"
|
#include "rt.h"
|
||||||
#include "sys/arch/x86_64/io.h"
|
#include "sys/arch/x86_64/io.h"
|
||||||
|
#include "sys/gfx/flanterm/flanterm.h"
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <sys/printf.h>
|
#include <sys/printf.h>
|
||||||
|
|
||||||
|
extern struct flanterm_context *ft_ctx;
|
||||||
|
|
||||||
void log(char *format, ...) {
|
void log(char *format, ...) {
|
||||||
// TODO: replace this call with a call to printf() when the RTC is implemented.
|
// TODO: replace this call with a call to printf() when the RTC is implemented.
|
||||||
rt_print("1970-01-01 00:00:00 | ");
|
char *date = "1970-01-01 00:00:00 | ";
|
||||||
|
int i2 = 0; for (i2; date[i2] != 0; i2++);;
|
||||||
|
flanterm_write(ft_ctx, date, i2);
|
||||||
|
|
||||||
char buf[2048];
|
char buf[2048];
|
||||||
va_list l;
|
va_list l;
|
||||||
|
@ -13,9 +18,9 @@ void log(char *format, ...) {
|
||||||
npf_vsnprintf(buf, 2048, format, l);
|
npf_vsnprintf(buf, 2048, format, l);
|
||||||
va_end(l);
|
va_end(l);
|
||||||
|
|
||||||
rt_print(buf);
|
int i = 0; for (i; buf[i] != 0; i++);;
|
||||||
|
flanterm_write(ft_ctx, buf, i);
|
||||||
|
|
||||||
char *date = "1970-01-01 00:00:00 | ";
|
|
||||||
for (int i=0;;i++) {
|
for (int i=0;;i++) {
|
||||||
if (date[i] == '\0')
|
if (date[i] == '\0')
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
// Copyright (C) 2024 Sipaa Projects
|
// Copyright (C) 2024 Sipaa Projects
|
||||||
// This code is part of the Soaplin kernel and is licensed under the terms of
|
// This code is part of the Soaplin kernel and is licensed under the terms of
|
||||||
// the MIT License.
|
// the MIT License.
|
||||||
|
#include "sys/gfx/flanterm/flanterm.h"
|
||||||
#include <rt.h>
|
#include <rt.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
@ -15,6 +16,8 @@
|
||||||
#define NANOPRINTF_IMPLEMENTATION
|
#define NANOPRINTF_IMPLEMENTATION
|
||||||
#include <sys/printf.h>
|
#include <sys/printf.h>
|
||||||
|
|
||||||
|
extern struct flanterm_context *ft_ctx;
|
||||||
|
|
||||||
void printf(char *format, ...) {
|
void printf(char *format, ...) {
|
||||||
char buf[2048];
|
char buf[2048];
|
||||||
va_list lst;
|
va_list lst;
|
||||||
|
@ -22,5 +25,7 @@ void printf(char *format, ...) {
|
||||||
npf_vsnprintf(buf, 2048, format, lst);
|
npf_vsnprintf(buf, 2048, format, lst);
|
||||||
va_end(lst);
|
va_end(lst);
|
||||||
|
|
||||||
rt_print(buf);
|
//rt_print(buf);
|
||||||
|
int i = 0; for (i; buf[i] != 0; i++);;
|
||||||
|
flanterm_write(ft_ctx, buf, i);
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue