KolibriOS/umka
13
1
Fork 2
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Switch to SDL3, update README and makefile

Browse Source
This commit is contained in:
Ivan B
2026-04-20 20:23:12 +01:00
parent 88c64eaf04
commit b0767599d1
6 changed files with 130 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README
+5 -4
View File
@@ -65,7 +65,7 @@ Linux:
$ KOLIBRIOS=/path/to/kolibrios HOST=linux CC=gcc make
/path/to/kolibrios is where you checked out 'svn co svn://kolibrios.org'.
/path/to/kolibrios is where you cloned the main KolibriOS repository.
Windows:
@@ -85,7 +85,8 @@ Testing
# Run all the tests
$ HOST=linux make -B
$ cd test
$ ../runtests
# Copy ACPI tables and PCI configs
@@ -106,7 +107,7 @@ Troubleshooting
# Build
Install toolchain for the 32-bit target, e.g. gcc-multilib, lib32-glibc,
32-bit and develop packages of libfuse and libsdl2, fasm.
32-bit and develop packages of libfuse3 and libsdl3, fasm.
# umka_os
@@ -154,5 +155,5 @@ Links & Acknowledgements
[8] qemu-nbd by Anthony Liguori and others
https://www.qemu.org/docs/master/tools/qemu-nbd.html
[9] Simple DirectMedia Layer library aka SDL2
[9] Simple DirectMedia Layer library aka SDL
https://libsdl.org
makefile
+2 -2
View File
@@ -84,7 +84,7 @@ umka_os: umka_os.o umka.o monitor.o shell.o deps/lodepng/lodepng.o vkbd.o \
$(HOST)/vnet/tap.o vnet/file.o vnet/null.o trace.o trace_lbr.o \
$(HOST)/pci.o $(HOST)/thread.o umkaio.o umkart.o \
deps/isocline/src/isocline.o deps/optparse/optparse.o
$(CC) $(LDFLAGS_32) $^ `sdl2-config --libs` -o $@ -T umka.ld
$(CC) $(LDFLAGS_32) $^ `pkg-config sdl3 --libs` -o $@ -T umka.ld
umka_gen_devices_dat: umka_gen_devices_dat.o umka.o $(HOST)/pci.o \
$(HOST)/thread.o umkart.o
@@ -185,7 +185,7 @@ umka_fuse.o: umka_fuse.c umka.h
$(CC) $(CFLAGS_32) `pkg-config fuse3 --cflags` -c $<
umka_os.o: umka_os.c umka.h
$(CC) $(CFLAGS_32) `sdl2-config --cflags` -c $<
$(CC) $(CFLAGS_32) `pkg-config sdl3 --cflags` -c $<
umka_gen_devices_dat.o: umka_gen_devices_dat.c umka.h
$(CC) $(CFLAGS_32) -c $<
shell.c
+1 -1
View File
@@ -2455,7 +2455,7 @@ cmd_scrot(struct shell_ctx *ctx, int argc, char **argv) {
uint32_t *lfb32 = (uint32_t*)kos_lfb_base;
lfb32 = malloc(4*kos_display.width*kos_display.height);
copy_display_to_rgb888(lfb32);
copy_display_to_xrgb8888(lfb32);
uint8_t *from = (uint8_t*)lfb32;
for (size_t y = 0; y < kos_display.height; y++) {
umka_os.c
+114 -64
View File
@@ -7,6 +7,7 @@
Copyright (C) 2018-2025 Ivan Baravy <dunkaist@gmail.com>
*/
#define _GNU_SOURCE
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
@@ -20,7 +21,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include "umka.h"
#include "umkart.h"
#include "shell.h"
@@ -167,38 +168,82 @@ update_display(SDL_Surface *window_surface, SDL_Window *window) {
return;
}
struct {
SDL_Scancode sdl_code;
bool ps2_ext;
uint8_t ps2_code;
} hid_to_ps2set1[] = {
{SDL_SCANCODE_COMMA, false, 0x33},
{SDL_SCANCODE_PERIOD, false, 0x34},
{SDL_SCANCODE_SLASH, false, 0x35},
{SDL_SCANCODE_CAPSLOCK, false, 0x3a},
{SDL_SCANCODE_HOME, true, 0x47},
{SDL_SCANCODE_PAGEUP, true, 0x49},
{SDL_SCANCODE_DELETE, true, 0x53},
{SDL_SCANCODE_END, true, 0x4f},
{SDL_SCANCODE_PAGEDOWN, true, 0x51},
{SDL_SCANCODE_RIGHT, true, 0x4d},
{SDL_SCANCODE_LEFT, true, 0x4b},
{SDL_SCANCODE_DOWN, true, 0x50},
{SDL_SCANCODE_UP, true, 0x48},
{SDL_SCANCODE_A, false, 0x1e},
{SDL_SCANCODE_B, false, 0x30},
{SDL_SCANCODE_C, false, 0x2e},
{SDL_SCANCODE_D, false, 0x20},
{SDL_SCANCODE_E, false, 0x12},
{SDL_SCANCODE_F, false, 0x21},
{SDL_SCANCODE_G, false, 0x22},
{SDL_SCANCODE_H, false, 0x23},
{SDL_SCANCODE_I, false, 0x17},
{SDL_SCANCODE_J, false, 0x24},
{SDL_SCANCODE_K, false, 0x25},
{SDL_SCANCODE_L, false, 0x26},
{SDL_SCANCODE_M, false, 0x32},
{SDL_SCANCODE_N, false, 0x31},
{SDL_SCANCODE_O, false, 0x18},
{SDL_SCANCODE_P, false, 0x19},
{SDL_SCANCODE_Q, false, 0x10},
{SDL_SCANCODE_R, false, 0x13},
{SDL_SCANCODE_S, false, 0x1f},
{SDL_SCANCODE_T, false, 0x14},
{SDL_SCANCODE_U, false, 0x16},
{SDL_SCANCODE_V, false, 0x2f},
{SDL_SCANCODE_W, false, 0x11},
{SDL_SCANCODE_X, false, 0x2d},
{SDL_SCANCODE_Y, false, 0x15},
{SDL_SCANCODE_Z, false, 0x2c},
{SDL_SCANCODE_1, false, 0x02},
{SDL_SCANCODE_2, false, 0x03},
{SDL_SCANCODE_3, false, 0x04},
{SDL_SCANCODE_4, false, 0x05},
{SDL_SCANCODE_5, false, 0x06},
{SDL_SCANCODE_6, false, 0x07},
{SDL_SCANCODE_7, false, 0x08},
{SDL_SCANCODE_8, false, 0x09},
{SDL_SCANCODE_9, false, 0x0a},
{SDL_SCANCODE_0, false, 0x0b},
{SDL_SCANCODE_RETURN, false, 0x1c},
{SDL_SCANCODE_ESCAPE, false, 0x01},
{SDL_SCANCODE_BACKSPACE, false, 0x0e},
{SDL_SCANCODE_TAB, false, 0x0f},
{SDL_SCANCODE_SPACE, false, 0x39},
};
static void
convert_scancode_hid_to_ps2(int hid, int is_release, uint8_t *ps2) {
switch (hid) {
case SDL_SCANCODE_RIGHT:
*ps2 = 0xe0;
*++ps2 = 0x4d;
break;
case SDL_SCANCODE_LEFT:
*ps2 = 0xe0;
*++ps2 = 0x4b;
break;
case SDL_SCANCODE_DOWN:
*ps2 = 0xe0;
*++ps2 = 0x50;
break;
case SDL_SCANCODE_UP:
*ps2 = 0xe0;
*++ps2 = 0x48;
break;
case SDL_SCANCODE_TAB:
*ps2 = 0x0f;
break;
case SDL_SCANCODE_SPACE:
*ps2 = 0x39;
break;
default:
fprintf(stderr, "[sdl] ignore hid scancode: %i 0x%x\n", hid, hid);
break;
}
if (is_release) {
*ps2 |= 0x80;
convert_scancode_hid_to_ps2(SDL_Scancode sdl_code, int is_release, uint8_t *ps2) {
for (size_t i = 0; i < sizeof(hid_to_ps2set1) / sizeof(*hid_to_ps2set1); i++) {
if (sdl_code == hid_to_ps2set1[i].sdl_code) {
if (hid_to_ps2set1[i].ps2_ext) {
*ps2++ = 0xe0;
}
*ps2 = hid_to_ps2set1[i].ps2_code;
if (is_release) {
*ps2 |= 0x80;
}
return;
}
}
// fprintf(stderr, "[sdl] unknown hid scancode: %i 0x%x\n", hid, hid);
}
static uint32_t
@@ -220,14 +265,15 @@ static void
grab_sdl_window(SDL_Window *window, bool grab) {
SDL_SetWindowMouseGrab(window, grab);
SDL_SetWindowKeyboardGrab(window, grab);
SDL_SetRelativeMouseMode(grab);
SDL_SetWindowRelativeMouseMode(window, grab);
}
static void *
umka_display(void *arg) {
(void)arg;
if(SDL_Init(SDL_INIT_VIDEO) < 0)
if(!SDL_Init(SDL_INIT_VIDEO))
{
fprintf(stderr, "Failed to initialize the SDL2 library\n");
fprintf(stderr, "Failed to initialize SDL library\n");
return NULL;
}
@@ -235,8 +281,6 @@ umka_display(void *arg) {
sprintf(title, "umka %ux%u %ubpp, press Ctrl-Alt-g to (un)grab input",
kos_display.width, kos_display.height, kos_display.bits_per_pixel);
SDL_Window *window = SDL_CreateWindow(title,
SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED,
kos_display.width,
kos_display.height,
0);
@@ -255,14 +299,11 @@ umka_display(void *arg) {
return NULL;
}
switch (window_surface->format->format) {
case SDL_PIXELFORMAT_RGB888:
copy_display = copy_display_to_rgb888;
break;
default:
if (window_surface->format == SDL_PIXELFORMAT_XRGB8888) {
copy_display = copy_display_to_xrgb8888;
} else {
printf("unknown SDL_PIXELFORMAT_* value: 0x%8.8x\n",
window_surface->format->format);
break;
window_surface->format);
}
bool input_grabbed = false;
@@ -272,20 +313,22 @@ umka_display(void *arg) {
update_display(window_surface, window);
if (SDL_WaitEventTimeout(&event, 1000 /* ms */)) {
switch (event.type) {
case SDL_QUIT:
case SDL_EVENT_QUIT:
break;
case SDL_WINDOWEVENT:
case SDL_EVENT_WINDOW_SHOWN:
case SDL_EVENT_WINDOW_HIDDEN:
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_EVENT_MOUSE_BUTTON_DOWN:
if (!input_grabbed) {
int x, y;
SDL_GetMouseState(&x, &y);
float fx, fy;
SDL_GetMouseState(&fx, &fy);
int x = (int)fx, y = (int)fy;
monitor_cmd_sys_set_mouse_pos_screen(os->monitor, x, y);
input_grabbed = true;
grab_sdl_window(window, true);
}
[[fallthrough]];
case SDL_MOUSEBUTTONUP: {
case SDL_EVENT_MOUSE_BUTTON_UP: {
if (!input_grabbed) {
break;
}
@@ -294,7 +337,7 @@ umka_display(void *arg) {
monitor_cmd_mouse_move(os->monitor, btn_state, 0, 0, 0, 0);
break;
}
case SDL_MOUSEMOTION: {
case SDL_EVENT_MOUSE_MOTION: {
if (!input_grabbed) {
break;
}
@@ -305,7 +348,7 @@ umka_display(void *arg) {
event.wheel.y, event.wheel.x);
break;
}
case SDL_MOUSEWHEEL: {
case SDL_EVENT_MOUSE_WHEEL: {
if (!input_grabbed) {
break;
}
@@ -315,10 +358,10 @@ umka_display(void *arg) {
event.wheel.y, event.wheel.x);
break;
}
case SDL_KEYDOWN: {
if ((event.key.keysym.scancode == SDL_SCANCODE_G)
&& (event.key.keysym.mod & KMOD_CTRL)
&& (event.key.keysym.mod & KMOD_ALT)) {
case SDL_EVENT_KEY_DOWN: {
if ((event.key.scancode == SDL_SCANCODE_G)
&& (event.key.mod & SDL_KMOD_CTRL)
&& (event.key.mod & SDL_KMOD_ALT)) {
input_grabbed = !input_grabbed;
grab_sdl_window(window, input_grabbed);
}
@@ -329,26 +372,31 @@ umka_display(void *arg) {
*/
uint8_t scancodes[16];
memset(scancodes, 0, 16);
convert_scancode_hid_to_ps2(event.key.keysym.scancode, false, scancodes);
convert_scancode_hid_to_ps2(event.key.scancode, false, scancodes);
monitor_cmd_send_scancodes(os->monitor, scancodes);
convert_scancode_hid_to_ps2(event.key.keysym.scancode, true, scancodes);
convert_scancode_hid_to_ps2(event.key.scancode, true, scancodes);
monitor_cmd_send_scancodes(os->monitor, scancodes);
break;
}
case SDL_KEYUP:
case SDL_EVENT_KEY_UP:
if (!input_grabbed) {
break;
}
break;
case SDL_TEXTINPUT:
case SDL_EVENT_TEXT_INPUT:
if (!input_grabbed) {
break;
}
break;
case SDL_EVENT_WINDOW_EXPOSED:
case SDL_EVENT_WINDOW_FOCUS_GAINED:
case SDL_EVENT_WINDOW_FOCUS_LOST:
case SDL_EVENT_WINDOW_MOUSE_ENTER:
case SDL_EVENT_WINDOW_MOUSE_LEAVE:
case SDL_EVENT_CLIPBOARD_UPDATE: // TODO: pass through clipboard
break;
default:
if (!(event.type & SDL_WINDOWEVENT)) { // filter out SDL3 window events
fprintf(stderr, "[sdl] unknown event type: 0x%x\n", event.type);
}
// fprintf(stderr, "[sdl] unknown event type: 0x%x\n", event.type);
update_display(window_surface, window);
}
} else {
@@ -383,7 +431,8 @@ int
main(int argc, char *argv[]) {
(void)argc;
const char *usage = "umka_os [-i <infile>] [-o <outfile>]"
" [-b <boardlog>] [-s <startupfile>] [-c covfile]\n";
" [-s <startupfile>] [-b <boardlog>] [-d(isplay)]"
" [-c covfile]\n";
int coverage = 0;
int show_display = 0;
@@ -570,7 +619,8 @@ main(int argc, char *argv[]) {
thread_start(1, umka_thread_board, UMKA_DEFAULT_THREAD_STACK_SIZE);
load_app_host("../apps/loader", UMKA_LDR_BASE);
// load_app_host("../apps/justawindow", KOS_APP_BASE);
load_app_host("../apps/asciivju", KOS_APP_BASE);
// load_app_host("../apps/asciivju", KOS_APP_BASE);
load_app_host("../apps/charsets", KOS_APP_BASE);
// load_app_host("../apps/eyes", KOS_APP_BASE);
// load_app_host("../apps/board", KOS_APP_BASE);
// load_app_host("../apps/calc", KOS_APP_BASE);
umkart.c
+7 -7
View File
@@ -54,7 +54,7 @@ dump_devices_dat(const char *filename) {
}
static void
copy_display_bpp16_to_rgb888(void *to) {
copy_display_bpp16_to_xrgb8888(void *to) {
for (size_t y = 0; y < kos_display.height; y++) {
for (size_t x = 0; x < kos_display.width; x++) {
uint32_t p = ((uint16_t*)kos_lfb_base)[y*kos_display.width+x];
@@ -65,7 +65,7 @@ copy_display_bpp16_to_rgb888(void *to) {
}
static void
copy_display_bpp24_to_rgb888(void *to) {
copy_display_bpp24_to_xrgb8888(void *to) {
uint8_t *from = kos_lfb_base;
for (size_t y = 0; y < kos_display.height; y++) {
for (size_t x = 0; x < kos_display.width; x++) {
@@ -79,21 +79,21 @@ copy_display_bpp24_to_rgb888(void *to) {
}
static void
copy_display_bpp32_to_rgb888(void *to) {
copy_display_bpp32_to_xrgb8888(void *to) {
memcpy(to, kos_lfb_base, kos_display.width*kos_display.height*4);
}
void
copy_display_to_rgb888(void *to) {
copy_display_to_xrgb8888(void *to) {
switch (kos_display.bits_per_pixel) {
case 16:
copy_display_bpp16_to_rgb888(to);
copy_display_bpp16_to_xrgb8888(to);
break;
case 24:
copy_display_bpp24_to_rgb888(to);
copy_display_bpp24_to_xrgb8888(to);
break;
case 32:
copy_display_bpp32_to_rgb888(to);
copy_display_bpp32_to_xrgb8888(to);
break;
default:
fprintf(stderr, "[!] unsupported bit depth: %d\n",
umkart.h
+1 -1
View File
@@ -19,6 +19,6 @@ void
dump_devices_dat(const char *filename);
void
copy_display_to_rgb888(void *to);
copy_display_to_xrgb8888(void *to);
#endif // UMKART_H_INCLUDED