luajitos

commit 8e328c14d3e88ef6c6b00de00335968af3d32692
parent 794f73384f62b6a0444c0d87640eeedf7701262d
Author: luajitos <bbhbb2094@gmail.com>
Date:   Sun, 30 Nov 2025 00:29:28 +0000

Fixed HTML drawing over window border and fixed QEMU commands

Diffstat:
M
build.sh
 | 
7
++-----
R
iso_includes/home/Documents/page2.html -> iso_includes/home/Documents/Samples/page2.html
 | 
0

R
iso_includes/home/Documents/test.html -> iso_includes/home/Documents/Samples/test.html
 | 
0

D
iso_includes/home/Documents/app.lua
 | 
7
-------
D
iso_includes/home/Documents/test.txt
 | 
1
-
R
iso_includes/home/Pictures/wolf.png -> iso_includes/home/Pictures/Samples/wolf.png
 | 
0

R
iso_includes/home/Pictures/wolf2.png -> iso_includes/home/Pictures/Samples/wolf2.png
 | 
0

R
iso_includes/home/Pictures/wolf3.png -> iso_includes/home/Pictures/Samples/wolf3.png
 | 
0

M
iso_includes/os/init.lua
 | 
11
+++++++++--

9 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/build.sh b/build.sh
@@ -397,9 +397,6 @@ echo "=== Build successful! ==="
 echo "Bootable ISO created: luajitos.iso"
 echo ""
 echo "To test with QEMU, run:"
-echo "  qemu-system-x86_64 -cdrom luajitos.iso -vga std -m 512M"
-echo ""
-echo "Or boot the kernel directly:"
-echo "  qemu-system-x86_64 -kernel build/kernel.bin -vga std -m 512M"
-echo ""
+echo "  qemu-system-x86_64 -cdrom luajitos.iso -m 512 -serial stdio -vga std  -display sdl"
+
 echo "Note: The OS uses 1024x768 resolution. QEMU window will auto-size."
diff --git a/iso_includes/home/Documents/page2.html b/iso_includes/home/Documents/Samples/page2.html
diff --git a/iso_includes/home/Documents/test.html b/iso_includes/home/Documents/Samples/test.html
diff --git a/iso_includes/home/Documents/app.lua b/iso_includes/home/Documents/app.lua
@@ -1,7 +0,0 @@
--- External Lua script loaded via <script src="app.lua">
-console.log("External script (app.lua) loaded!")
-
--- Define a global function that can be called from HTML
-function greet(name)
-    alert("Hello, " .. (name or "World") .. "!")
-end
diff --git a/iso_includes/home/Documents/test.txt b/iso_includes/home/Documents/test.txt
@@ -1 +0,0 @@
-abc 1223
diff --git a/iso_includes/home/Pictures/wolf.png b/iso_includes/home/Pictures/Samples/wolf.png
Binary files differ.
diff --git a/iso_includes/home/Pictures/wolf2.png b/iso_includes/home/Pictures/Samples/wolf2.png
Binary files differ.
diff --git a/iso_includes/home/Pictures/wolf3.png b/iso_includes/home/Pictures/Samples/wolf3.png
Binary files differ.
diff --git a/iso_includes/os/init.lua b/iso_includes/os/init.lua
@@ -344,8 +344,11 @@ local function drawAllWindows()
                     draw_ops[#draw_ops + 1] = {OP_TEXT, x, y, text, r, g, b, scale}
                 end
 
-                -- Draw to buffer at (0,0) since we're rendering to the buffer
-                if not window.isBorderless then
+                -- Helper function to draw window frame (title bar, borders, buttons)
+                -- This will be called AFTER content is drawn so frame appears on top
+                local function drawWindowFrame()
+                    if window.isBorderless then return end
+
                     -- Draw title bar
                     addRect(0, 0, buf_w, TITLE_BAR_HEIGHT, 60, 60, 60)
 
@@ -536,6 +539,10 @@ local function drawAllWindows()
                     end
                 end
 
+                -- Draw window frame (title bar, borders) AFTER content
+                -- so they appear on top and aren't overwritten by app content
+                drawWindowFrame()
+
                 -- Render to buffer
                 if VESAProcessBufferedDrawOps and #draw_ops > 0 then
                     VESAProcessBufferedDrawOps(draw_ops)