Removed old lv_conf

Basic LVGL wrapper with an example desktop & windowing system.

.drone.yml

@@ -50,3 +50,17 @@ steps:
       - |
         curl -X PUT https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
         -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
+
+  - name: msg status
+    image: appleboy/drone-discord
+    failure: ignore
+    depends_on:
+      - compile
+    when:
+      status: [success, failure, changed]
+    settings:
+      webhook_id:
+        from_secret: discord_webhook_id
+      webhook_token:
+        from_secret: discord_webhook_secret
+      message: "**Asuro Build**\n\n{{#success build.status}}✅ Build successful!\n\n{{else}}❌ Build failed!\n\n{{/success}}Repository: `{{repo.namespace}}/{{repo.name}}`\nBranch: `{{commit.branch}}`\nCommit: `{{commit.sha}}`\nAuthor: `{{commit.author}} <{{commit.email}}>`\n\nGitea Diff: [Link](<{{commit.link}}>)\nDrone Build: [Link](<{{build.link}}>)\n\nMessage: {{commit.message}}"

.gitignore

@@ -11,3 +11,7 @@
 /*.img
 src/include/asuro.pas
 localenv.json
+/lvgl/
+dockerout.txt
+AGENTS.md
+*.log

.mailmap

@@ -0,0 +1,13 @@
+# Map all Aaron identities to a single preferred identity
+Aaron Hance <[email protected]> aaron <aaron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
+Aaron Hance <[email protected]> aaronhance <[email protected]>
+Aaron Hance <[email protected]> aaron hance <[email protected]>
+Aaron Hance <[email protected]> Aaron <[email protected]>
+
+# Map all Kieron identities to a single preferred identity
+Kieron Morris <[email protected]> kieron <kieron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
+Kieron Morris <[email protected]> Kieron <[email protected]>
+Kieron Morris <[email protected]> t3hn3rd <[email protected]>
+
+# Map goose's multiple identities
+goose <goose@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c> goose <[email protected]>

Dockerfile

@@ -5,11 +5,11 @@ VOLUME ["/code"]
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386
 RUN apt-get update && apt-get install -y \
-	curl dos2unix wget git make nasm binutils:i386 xorriso grub-pc-bin && \
+	curl dos2unix wget git make nasm binutils xorriso grub-pc-bin gcc gcc-multilib && \
 	apt-get clean my room
 
 SHELL ["/bin/bash", "-c"]
-ARG FPC_VERSION=2.6.4
+ARG FPC_VERSION=3.2.2
 RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSION/fpc-$FPC_VERSION.i386-linux.tar/download | tar -xf - && \
 	pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
 	rm -rf fpc-$FPC_VERSION.i386-linux

compile.sh

@@ -7,7 +7,7 @@ echo "Asuro Compilation"
 echo " "
 
 #Compile Stub.asm
-rm lib/*
+rm -f lib/*
 
 runOrFail() {
 	local binary=$1
@@ -23,6 +23,7 @@ runOrFail() {
 declare -a run_steps=(
 	"compile_stub.sh" "Failed to compile stub!"
 	"compile_vergen.sh" "Versions failed to compile"
+	"compile_lvgl.sh" "Failed to compile LVGL!"
 	"compile_sources.sh" "Failed to compile FPC Sources!"
 	"compile_link.sh" "Failed linking!"
 	"compile_isogen.sh" "Failed to create ISO!"

compile_link.sh

@@ -14,4 +14,9 @@ done;
 objstring=lib/stub.o" "$objstring 
 echo "Object Files: "$objstring
 echo " "
-ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring
+
+# Find libgcc for i386 (needed by LVGL compiled with gcc)
+LIBGCC=$(gcc -m32 -print-libgcc-file-name)
+echo "libgcc: ${LIBGCC}"
+
+ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group

compile_lvgl.sh

@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+# compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
+# Clone & compile in /tmp (fast container-local fs).
+# Copy source + objects to /lvgl (host mount) for debugging.
+set -e
+
+LVGL_VERSION="v9.2.2"
+LVGL_REPO="https://github.com/lvgl/lvgl.git"
+LVGL_DIR="/tmp/lvgl"
+OBJ_DIR="/tmp/lvgl_obj"
+CONF_DIR="$(pwd)/lvglh"
+OUT_DIR="$(pwd)/lib"
+
+CC="gcc"
+CFLAGS="-m32 -march=i686 -ffreestanding \
+    -fno-builtin -fno-stack-protector -fno-pic -fno-pie \
+    -O2 -Wall -Wno-unused-function -Wno-unused-variable \
+    -I${CONF_DIR} \
+    -I${LVGL_DIR} \
+    -I${LVGL_DIR}/.. \
+    -DLV_CONF_INCLUDE_SIMPLE"
+
+echo " "
+echo "======================="
+echo " "
+echo "Compiling LVGL..."
+echo " "
+
+# Clone LVGL into /tmp (container-local)
+rm -rf "$LVGL_DIR"
+echo "Downloading LVGL ${LVGL_VERSION}..."
+git clone --depth 1 --branch "${LVGL_VERSION}" "${LVGL_REPO}" "${LVGL_DIR}" 2>&1
+echo "Download complete."
+
+# Gather all LVGL .c source files (core library only, no demos/examples)
+SOURCES=$(find "${LVGL_DIR}/src" -name '*.c' -not -path '*/test/*')
+TOTAL=$(echo "$SOURCES" | wc -l)
+echo "Found ${TOTAL} LVGL source files."
+
+# Compile each .c file to .o (container-local)
+rm -rf "$OBJ_DIR"
+mkdir -p "$OBJ_DIR"
+
+COUNT=0
+ERRORS=0
+for src in $SOURCES; do
+    COUNT=$((COUNT + 1))
+    rel="${src#${LVGL_DIR}/src/}"
+    obj_path="${OBJ_DIR}/${rel%.c}.o"
+    mkdir -p "$(dirname "$obj_path")"
+
+    if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
+        echo "FAILED: $rel"
+        ERRORS=$((ERRORS + 1))
+    fi
+
+    if [ $((COUNT % 50)) -eq 0 ]; then
+        echo "  Compiled ${COUNT}/${TOTAL}..."
+    fi
+done
+
+echo "Compiled ${COUNT} files (${ERRORS} errors)."
+
+if [ "$ERRORS" -ne 0 ]; then
+    echo "LVGL compilation FAILED with ${ERRORS} errors."
+    exit 1
+fi
+
+# Archive into static library
+OBJECTS=$(find "$OBJ_DIR" -name '*.o')
+ar rcs "${OUT_DIR}/liblvgl.a" $OBJECTS
+echo "Created ${OUT_DIR}/liblvgl.a"
+
+# Compile custom LVGL extension files from lvglh/
+LVGLH_SOURCES=$(find "${CONF_DIR}" -name '*.c' 2>/dev/null || true)
+if [ -n "$LVGLH_SOURCES" ]; then
+    echo " "
+    echo "Compiling custom LVGL files from lvglh/..."
+    LVGLH_OBJ_DIR="/tmp/lvglh_obj"
+    rm -rf "$LVGLH_OBJ_DIR"
+    mkdir -p "$LVGLH_OBJ_DIR"
+    HCOUNT=0
+    HERRORS=0
+    for src in $LVGLH_SOURCES; do
+        HCOUNT=$((HCOUNT + 1))
+        rel="${src#${CONF_DIR}/}"
+        obj_path="${LVGLH_OBJ_DIR}/${rel%.c}.o"
+        mkdir -p "$(dirname "$obj_path")"
+        echo "  [lvglh] $rel"
+        if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
+            echo "  FAILED: $rel"
+            HERRORS=$((HERRORS + 1))
+        fi
+    done
+    echo "Compiled ${HCOUNT} custom files (${HERRORS} errors)."
+    if [ "$HERRORS" -ne 0 ]; then
+        echo "Custom LVGL compilation FAILED."
+        exit 1
+    fi
+    # Append custom objects into the existing archive
+    HOBJECTS=$(find "$LVGLH_OBJ_DIR" -name '*.o')
+    ar rcs "${OUT_DIR}/liblvgl.a" $HOBJECTS
+    echo "Updated ${OUT_DIR}/liblvgl.a with custom objects."
+else
+    echo "No custom LVGL files in lvglh/."
+fi
+
+# Copy source + objects to /lvgl host mount for debugging
+echo "Copying LVGL source and objects to host mount..."
+rm -rf /lvgl/* /lvgl/.[!.]* /lvgl/..?* 2>/dev/null || true
+cp -a "$LVGL_DIR/src" /lvgl/src
+cp -a "$OBJ_DIR" /lvgl/obj
+echo "Done."
+
+echo " "
+echo "LVGL compilation complete."
+echo " "

compile_sources.sh

@@ -4,4 +4,4 @@ echo "======================="
 echo " "
 echo "Compiling FPC Sources..."
 echo " "
-fpc -Aelf -gw -g -gl -n -vlewn -O3 -Op3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* src/kernel.pas
+fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* src/kernel.pas

docker-compose.yml

@@ -3,3 +3,4 @@ services:
     build: .
     volumes:
       - .:/code
+      - ./lvgl:/lvgl

linker.script

@@ -34,4 +34,14 @@ SECTIONS
   }
   end = .; _end = .; __end = .;
   kernel_end = .;
+
+  /DISCARD/ : {
+    *(.init_array*)
+    *(.fini_array*)
+    *(.ctors)
+    *(.dtors)
+    *(.eh_frame*)
+    *(.gcc_except_table*)
+    *(.note.GNU-stack)
+  }
 }

src/driver/hid/mouse.pas

@@ -51,6 +51,11 @@ type
 
 procedure init();
 procedure DrawCursor;
+function getMouseX: sint32;
+function getMouseY: sint32;
+function getMouseLMB: boolean;
+function getMouseRMB: boolean;
+function getMouseScroll: sint32;  { returns accumulated scroll delta since last call }
 
 implementation
 
@@ -59,7 +64,7 @@ var
     FirstDraw : boolean = true;
     BackPixels : Array[0..1] of Array[0..7] of uint64;
     Cycle : uint32 = 0;
-    Mouse_Byte : Array[0..2] of uint8;
+    Mouse_Byte : Array[0..3] of uint8;
     Packet : uint32;
     Registered : Boolean = false;
     NeedsRedraw : Boolean = false;
@@ -67,6 +72,35 @@ var
     LMouseDownPos : TMousePos;
     LMouseDown : Boolean;
     RMouseDown : Boolean;
+    HasScrollWheel : Boolean = false;
+    ScrollAccum : sint32 = 0;
+    PacketSize : uint32 = 3;
+
+function getMouseX: sint32;
+begin
+    getMouseX := Current.x;
+end;
+
+function getMouseY: sint32;
+begin
+    getMouseY := Current.y;
+end;
+
+function getMouseLMB: boolean;
+begin
+    getMouseLMB := LMouseDown;
+end;
+
+function getMouseRMB: boolean;
+begin
+    getMouseRMB := RMouseDown;
+end;
+
+function getMouseScroll: sint32;
+begin
+    getMouseScroll := ScrollAccum;
+    ScrollAccum := 0;
+end;
 
 procedure DrawCursor;
 var
@@ -151,7 +185,7 @@ begin
             Mouse_Byte[Cycle]:= b;
             Inc(Cycle);
         end;
-        if Cycle = 3 then begin
+        if Cycle = PacketSize then begin
             //Process
             f:= Mouse_Byte[0];
             Packet.x_sign:= (f AND %00010000) = %00010000;
@@ -173,6 +207,10 @@ begin
                 if Current.x > (Console.getConsoleProperties^.Width-8) then Current.x:= (Console.getConsoleProperties^.Width-8);
                 if Current.y > (Console.getConsoleProperties^.Height-8) then Current.y:= (Console.getConsoleProperties^.Height-8);
             end;
+            { Process scroll wheel (4th byte, signed) }
+            if HasScrollWheel then begin
+                ScrollAccum := ScrollAccum + sint8(Mouse_Byte[3]);
+            end;
             Cycle:= 0;
             if Packet.LMB_Down then begin
                 if not LMouseDown then begin
@@ -218,6 +256,7 @@ end;
 function load(ptr : void) : boolean;
 var
     status : uint8;
+    devid_byte : uint8;
 begin
     push_trace('mouse.load');
     mouse_wait(1);
@@ -232,6 +271,26 @@ begin
     outb($60, status);
     mouse_write($F6);
     mouse_read();
+
+    { Enable IntelliMouse scroll wheel: set sample rate 200, 100, 80 }
+    mouse_write($F3); mouse_read(); mouse_write(200); mouse_read();
+    mouse_write($F3); mouse_read(); mouse_write(100); mouse_read();
+    mouse_write($F3); mouse_read(); mouse_write(80);  mouse_read();
+
+    { Query device ID — ID 3 = IntelliMouse (scroll wheel) }
+    mouse_write($F2);
+    mouse_read(); { ACK }
+    devid_byte := mouse_read(); { Device ID }
+    if devid_byte = 3 then begin
+        HasScrollWheel := true;
+        PacketSize := 4;
+        console.outputln('PS/2 MOUSE', 'Scroll wheel enabled (IntelliMouse).');
+    end else begin
+        HasScrollWheel := false;
+        PacketSize := 3;
+        console.outputln('PS/2 MOUSE', 'Standard mouse (no scroll wheel).');
+    end;
+
     mouse_write($F4);
     mouse_read();
     isrmanager.registerISR(44, @Main);

src/driver/interface/serial.pas

@@ -58,16 +58,19 @@ begin
 end;
 
 function sinb(port : uint16) : uint8;
+var
+     tmp : uint8;
 begin
      asm
           PUSH EAX
           PUSH EDX
           MOV DX, port
           IN AL, DX
-          MOV sinb, AL
+          MOV tmp, AL
           POP EDX
           POP EAX
      end;
+     sinb := tmp;
      io_wait;
 end;
 

src/driver/net/l5/dhcp.pas

@@ -491,22 +491,26 @@ begin
         
         { Create a new header to the use in our DHCP REQUEST packet }
         SendHeader:= createHeader();
-        CopyIPv4(puint8(@Header^.Your_IP[0]), puint8(@SendHeader^.Client_IP[0]));
+        CopyIPv4(@getIPv4Config^.Address[0], puint8(@SendHeader^.Client_IP[0]));
         CopyIPv4(puint8(@Header^.Server_IP[0]), puint8(@SendHeader^.Server_IP[0]));
         processHeader(SendHeader);
 
         { Setup Options }
         SendOptions:= newOptions();
+
         { Create a message type option and assign it the value REQUEST }
         SendMsgType:= ord(TDHCPMessageType.REQUEST);
         NewOption(SendOptions, TDHCPOpCode.DHCP_MESSAGE_TYPE, void(@SendMsgType), 1, false);
+
         { Create a Requested IP option and assign it the value from the OFFER packet header }
-        NewOption(SendOptions, TDHCPOpCode.REQUESTED_IP_ADDRESS, void(@SendHeader^.Client_IP[0]), 4, false);
+        NewOption(SendOptions, TDHCPOpCode.REQUESTED_IP_ADDRESS, void(@Header^.Your_IP[0]), 4, false);
+
         { Create a Server Identifier Option and assign it the value from the OFFER packet options }
         Option:= getOptionByOpcode(Options, TDHCPOpCode.SERVER_IDENTIFIER);
         if Option <> nil then begin
             NewOption(SendOptions, TDHCPOpCode.SERVER_IDENTIFIER, void(@Option^.Value[0]), 4, false);
         end;
+
         { Create a Parameter Request List, Request the following: Netmask, Gateway, DNS Name & DNS Server }
         RequestParams[0]:= Ord(TDHCPOpCode.SUBNET_MASK);
         RequestParams[1]:= Ord(TDHCPOpCode.ROUTER);
@@ -522,9 +526,13 @@ begin
         MAC:= getMAC();
         packetCtx:= PPacketContext(Kalloc(sizeof(TPacketContext)));
         packetCtx^.TTL:= 128;
-        copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
+
+        { Copy over MAC - src: broadcast - dst: DHCP Server }
         copyMAC(MAC, @packetCtx^.MAC.Source[0]);
-        copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0]);
+        copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
+        
+        { Copy over IP - src: NULL - dst: Broadcast }
+        CopyIPv4(@getIPv4Config^.Address[0], @packetCtx^.IP.Source[0]);
         copyIPv4(@BROADCAST_IP[0], @packetCtx^.IP.Destination[0]);
 
         { Setup UDPContext (UDP) & copy in the correct details }
@@ -570,7 +578,7 @@ begin
 
     { Check the frame is for us and then process }
     MAC:= getMAC;
-    if MACEqual(@context^.PacketContext^.MAC.Destination[0], MAC) then begin
+    if MACEqual(@context^.PacketContext^.MAC.Destination[0], MAC) or MACEqual(@context^.PacketContext^.MAC.Destination[0], BROADCAST_MAC) then begin
         Outputln('DHCP','Frame is addressed to us.');
         { Check the message type is client specific }
         If Header^.Message_Type = $02 then begin
@@ -655,7 +663,7 @@ begin
         copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
         MAC:= getMAC;
         copyMAC(MAC, @packetCtx^.MAC.Source[0]);
-        copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0]);
+        CopyIPv4(@getIPv4Config^.Address[0], @packetCtx^.IP.Source[0]);
         copyIPv4(@BROADCAST_IP[0], @packetCtx^.IP.Destination[0]);
 
         { Setup UDPContext (UDP) }

src/driver/video/video.pas

@@ -40,6 +40,8 @@ function frontBufferBpp : uint8;
 function backBufferWidth : uint32;
 function backBufferHeight : uint32;
 function backBufferBpp : uint8;
+function backBufferLocation : uint32;
+function frontBufferLocation : uint32;
 
 Procedure basicFDrawTexture(Buffer : PVideoBuffer; X : uint32; Y : uint32; Texture : PTexture);
 
@@ -315,4 +317,14 @@ begin
     backBufferBpp:= VideoInterface.BackBuffer.BitsPerPixel;
 end;
 
+function backBufferLocation : uint32;
+begin
+    backBufferLocation:= VideoInterface.BackBuffer.Location;
+end;
+
+function frontBufferLocation : uint32;
+begin
+    frontBufferLocation:= VideoInterface.FrontBuffer.Location;
+end;
+
 end.