From 85fa99f7bd1db8ccd54af7753b53dbd230cfcb6d Mon Sep 17 00:00:00 2001
From: Leonmmcoset <testmod@qq.com>
Date: Sun, 8 Feb 2026 00:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.bat       |   2 ++
 CMLeonOS.csproj |  32 +++++++++++++++++++++++++++++++-
 Kernel.cs       |  34 ++++++++++++++++++++++++++++++----
 font.psf        | Bin 0 -> 4597 bytes
 shell/Shell.cs  |   1 -
 5 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 Build.bat
 create mode 100644 font.psf

diff --git a/Build.bat b/Build.bat
new file mode 100644
index 0000000..6ec1dee
--- /dev/null
+++ b/Build.bat
@@ -0,0 +1,2 @@
+"D:\Microsoft Visual Studio\18\Community\MSBuild\Current\Bin\amd64\MSBuild.exe" "CMLeonOS.csproj" /t:Build /p:Configuration=Fixed_Release /p:Platform=x64
+@REM "C:\Program Files (x86)\VMware\VMware Workstation\vmplayer.exe" "C:\Users\leon\AppData\Roaming\Cosmos User Kit\Build\VMware\Workstation\Cosmos.vmx"
\ No newline at end of file
diff --git a/CMLeonOS.csproj b/CMLeonOS.csproj
index be5e211..3a69ccd 100644
--- a/CMLeonOS.csproj
+++ b/CMLeonOS.csproj
@@ -15,7 +15,7 @@
         <StartCosmosGDB>False</StartCosmosGDB>
         <VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
         <CosmosDebugPort>Serial: COM1</CosmosDebugPort>
-        <Launch>VMware</Launch>
+        <Launch>HyperV</Launch>
         <Profile>VMware</Profile>
         <Description>Use VMware Player or Workstation to deploy and debug.</Description>
         <PxeInterface>192.168.0.8</PxeInterface>
@@ -30,7 +30,37 @@
 		<VBEResolution>800x600x32</VBEResolution>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+      <WarningLevel>8</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <WarningLevel>8</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+      <WarningLevel>8</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <WarningLevel>8</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Fixed_Release|AnyCPU'">
+      <WarningLevel>8</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Fixed_Release|x64'">
+      <WarningLevel>8</WarningLevel>
+    </PropertyGroup>
+
     <ItemGroup>
+      <None Remove="font.psf" />
+      <None Remove="Solarize.12x29.psf" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Include="font.psf" />
         <EmbeddedResource Include="Wallpapers\wallpaper.bmp" />
     </ItemGroup>
 
diff --git a/Kernel.cs b/Kernel.cs
index 105a2c9..43a52d8 100644
--- a/Kernel.cs
+++ b/Kernel.cs
@@ -1,19 +1,23 @@
+using CMLeonOS.Logger;
+using CMLeonOS.Settings;
 using Cosmos.HAL;
+using Cosmos.HAL.BlockDevice;
+using Cosmos.HAL.Drivers.Video;
 using Cosmos.System.FileSystem;
 using Cosmos.System.FileSystem.FAT;
 using Cosmos.System.FileSystem.VFS;
+using Cosmos.System.Graphics;
+using Cosmos.System.Graphics.Fonts;
 using Cosmos.System.Network.Config;
-using Cosmos.System.Network.IPv4.UDP.DHCP;
-using Cosmos.HAL.BlockDevice;
 using Cosmos.System.Network.IPv4;
+using Cosmos.System.Network.IPv4.UDP.DHCP;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection.Metadata.Ecma335;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using Sys = Cosmos.System;
-using CMLeonOS.Logger;
-using CMLeonOS.Settings;
 
 namespace CMLeonOS
 {
@@ -31,9 +35,31 @@ namespace CMLeonOS
         
         public static Cosmos.HAL.NetworkDevice NetworkDevice = null;
         public static string IPAddress = "Unknown";
+
+        [IL2CPU.API.Attribs.ManifestResourceStream(ResourceName = "CMLeonOS.font.psf")]
+        public static readonly byte[] file;
         
         protected override void BeforeRun()
         {
+            // 我认了，我用默认字体
+            // try
+            // {
+            //     PCScreenFont screenFont = PCScreenFont.LoadFont(file);
+            //     VGAScreen.SetFont(screenFont.CreateVGAFont(), screenFont.Height);
+            //     VGAScreen.SetGraphicsMode(VGADriver.ScreenSize.Size720x480, ColorDepth.ColorDepth32);
+            // }
+            // catch (Exception ex)
+            // {
+            // 我不认，我试着转换成Base64
+                // 我认了
+                PCScreenFont defaultFont = PCScreenFont.Default;
+                VGAScreen.SetFont(defaultFont.CreateVGAFont(), defaultFont.Height);
+                // Console.WriteLine($"{defaultFont.Height}");
+                // Console.WriteLine($"{defaultFont.Width}");
+                // VGAScreen.SetGraphicsMode(VGADriver.ScreenSize.Size720x480, ColorDepth.ColorDepth32);
+            //     Console.WriteLine($"Error loading font: {ex.Message}");
+            // }
+
             Console.WriteLine("Kernel load done!");
             Console.WriteLine(@"-------------------------------------------------");
             Console.WriteLine(@"   ____ __  __ _                      ___  ____  ");
diff --git a/font.psf b/font.psf
new file mode 100644
index 0000000000000000000000000000000000000000..0a78e480d7c623ac96da0e29db7dee4bd1cac790
GIT binary patch
literal 4597
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
K4bHGXLH`HAod?qZ

literal 0
HcmV?d00001

diff --git a/shell/Shell.cs b/shell/Shell.cs
index 966f731..cae0044 100644
--- a/shell/Shell.cs
+++ b/shell/Shell.cs
@@ -19,7 +19,6 @@ using Cosmos.Core.Memory;
 using UniLua;
 using Cosmos.HAL;
 using CMLeonOS.Commands;
-
 namespace CMLeonOS
 {
     public class Shell