From 8c6769009941b2ca0684f90403eed38d85b5af97 Mon Sep 17 00:00:00 2001
From: husky <nikocs@voremicrocomputers.com>
Date: Fri, 12 Sep 2025 18:25:48 -0700
Subject: [PATCH 1/3] font

---
 Cargo.toml                        |   2 +-
 build.rs                          |   1 +
 src/arch/virt/mod.rs              |   4 +---
 src/arch/virt/trap.rs             |   2 +-
 src/dev/framebuffer/charset1.data | Bin 0 -> 1932 bytes
 src/dev/framebuffer/charset1.png  | Bin 0 -> 1678 bytes
 src/dev/framebuffer/mod.rs        |  14 +++++++-------
 src/dev/framebuffer/vapfont.data  | Bin 3584 -> 0 bytes
 src/dev/framebuffer/vapfont.png   | Bin 2316 -> 0 bytes
 turntable/Cargo.toml              |   1 +
 10 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 src/dev/framebuffer/charset1.data
 create mode 100644 src/dev/framebuffer/charset1.png
 delete mode 100644 src/dev/framebuffer/vapfont.data
 delete mode 100644 src/dev/framebuffer/vapfont.png

diff --git a/Cargo.toml b/Cargo.toml
index 5987ecc..6eb2953 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 opt-level = "z"
 debug-assertions = false
 overflow-checks = false
-strip = true
+strip = false
 lto = true
 codegen-units = 1
 
diff --git a/build.rs b/build.rs
index a48f0e5..83302a6 100644
--- a/build.rs
+++ b/build.rs
@@ -1,6 +1,7 @@
 fn main() {
     let arch = std::env::var("LBOS_ARCH").unwrap_or("virt".to_string());
     println!("cargo:rerun-if-env-changed=LBOS_ARCH");
+    println!("cargo:rerun-if-env-changed=LBOS_FONT");
     println!("cargo:rustc-cfg=feature=\"arch_{}\"", arch);
 
     println!("cargo:rerun-if-changed=src/arch/{}/asm", arch);
diff --git a/src/arch/virt/mod.rs b/src/arch/virt/mod.rs
index 2c694d1..30f6422 100644
--- a/src/arch/virt/mod.rs
+++ b/src/arch/virt/mod.rs
@@ -17,7 +17,7 @@ global_asm!(include_str!("asm/trap.s"));
 extern "C" fn eh_personality() {}
 
 #[panic_handler]
-//#[cfg(feature = "debug_messages")]
+#[cfg(feature = "debug_messages")]
 fn panic(info: &core::panic::PanicInfo) -> ! {
     use core::fmt::Write;
     let mut uart = UART::new(0x1000_0000);
@@ -38,7 +38,6 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
         }
     }
 }
-/*
 #[panic_handler]
 #[cfg(not(feature = "debug_messages"))]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
@@ -52,7 +51,6 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
         }
     }
 }
-*/
 pub fn virt_rough_panic(errcode: [char; 3]) -> ! {
     let uart = UART::new(0x1000_0000);
     for c in b"PANIC".iter() {
diff --git a/src/arch/virt/trap.rs b/src/arch/virt/trap.rs
index 2a0483e..b5fdd3a 100644
--- a/src/arch/virt/trap.rs
+++ b/src/arch/virt/trap.rs
@@ -1,7 +1,7 @@
 use crate::arch::virt::{plic, serial_port};
 use crate::rough_panic;
 use crate::syscalls::usize2sc;
-use crate::trafficcontrol::{TC, context_switch, handle_syscall, MAX_TASKS};
+use crate::trafficcontrol::{TC, context_switch, handle_syscall, MAX_TASKS, TrafficControl, Task};
 use core::arch::asm;
 use crate::spinlock::Spinlock;
 
diff --git a/src/dev/framebuffer/charset1.data b/src/dev/framebuffer/charset1.data
new file mode 100644
index 0000000000000000000000000000000000000000..d90ed7653161f8a000abb5fd215af5b514136018
GIT binary patch
literal 1932
zcmb7^KWH3B6vp4Xxy;?6mG&-5!mK6dF6Nv+#*kIqNSws3qb7zF2_&E@9Jn<`Zh`_S
zX1t1g0TT`f#1(?LGAdG-R7$E*4lEZYs0blNitCah#TF@+AVj{|y^~}x!5;2*XMgkd
zd;8wJH$=}Ik_S~CFLqN&T{*E}?XXF2><=Vs*5egm5k|ugmdwBtM0Sh?;l*ee3%*al
z!^?$Ej;qE>vN`@fveeYDEfF<n-J@R|w(AoN=aF4g;&P4;3lT5Z{&{U-IG>ArDDe(!
zk7^L%^!jy$Cr)lST#A*mZcxlNCF&v~EaImoaXsf<QtVSIIIHlHBuF{e&ZP~^pu*X-
zIP!Vmk%c!&fw6&B6(&Ur>%bmog64Ew(`t%SMIkUm6lbh~nbIj*oMVXW0f+e8^Exh(
znk98!cLV+V8C)iHg;k)tp+y`v7YTG+B^4Q93p{aIqmeQL!F#}ge&|u0f1u>FsZ&9z
zPu8aqk<P<`j~5s|XHujyNg550eDOz9f4MZ&w?@I1l-vtUPhH)_^)<bwj9#$eqtB<f
z7xJcJ9db`1GpsKG|5ji;75JRP>d`jx1nVaEL--*z&$?}S>p{afk$}@H`%Yxe;gWpN
zG<S3D{(|XAfvf|Q{Hy_NoXZK`Y*{G@BFcTBb{}Z!fw>FJ$DLv73xs3ya7IhRqg$gF
zNC-?jHjQW$@jubQ&c>fNR}OX}i|xj4EAvn#-kYn{aJ8+HYG|={LE@=ZrB=&QjPV=R
zdh}|669QIdH{iZN1&wjUw!o76=p&iqWNnTXfv0&_(kL%Oh(ux|xa~PiX-#((SwXYV
z7C*r;aD@&VD5BV5d?5djV<bDr*0M%8%k=lke&%ypqQlO9hH%h8|2r6~b!XuwXaUri
z>lXZ6VXx;CS|q_EHyv9)F02C*BFtM9)(~+RO$#hh>hXy+n=y7SsLAWTIfNff@OZ9p
zk!M|muJX-bhPwH2fn|YMffEEZKrc_M&*!*Fw(f8^_ml{7=bM2n0sHPyA|It<GT)3E
z$&N49I~u}g2aYvDfK)yMz0>*p=@iGv$v8889$YH&?5=0t^eRsxN}DE&D2q&g<=|!~
zL3euMJ$Dujar8X)L|-NCfP0NotaR7o{<LVLdn<Het$5KheH4~QhcjagZN-BbB!qWo
zsipKx<<5#tJqnj8t?0i{L7gOaDRAR;+9)ROD)eM-Q4CKF>@yCh`yWwV7d*~y9(7SB
z-+k+~@GNMV;&AxQ7btRv^(*({w~p(Z$CqeSYkz#LRp1|gy;tA*w|?jN9U8rK@zZOq
zkh-+rbNH+6`ex~Elh!V7yL#->@QI%FNO-{S4);O}r%psHZ})Tm<x*?aoxYKEnAO)W
xmwm3j-v-WF)N93s%lJaMZZe0jrY-)Y9v9(6`x)}Ea&R2kQS<f%-^o8~{0G6WbOita

literal 0
HcmV?d00001

diff --git a/src/dev/framebuffer/charset1.png b/src/dev/framebuffer/charset1.png
new file mode 100644
index 0000000000000000000000000000000000000000..92bb03acea25f2a6b16b2e58a4a61aadcf7d8d63
GIT binary patch
literal 1678
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
Y2SE|t#DPgib^rhX07*qoM6N<$f~?O8%>V!Z

literal 0
HcmV?d00001

diff --git a/src/dev/framebuffer/mod.rs b/src/dev/framebuffer/mod.rs
index 1717f24..28d462f 100644
--- a/src/dev/framebuffer/mod.rs
+++ b/src/dev/framebuffer/mod.rs
@@ -5,9 +5,10 @@ use core::sync::atomic::Ordering;
 
 pub mod console;
 
-pub const VAPFONT: &[u8] = include_bytes!("./vapfont.data");
-pub const VAPFONT_W: usize = 256;
-pub const VAPFONT_H: usize = 112;
+pub const VAPFONT: &[u8] = include_bytes!(env!("LBOS_FONT"));
+pub const VAPFONT_W: usize = 184;
+pub const VAPFONT_H: usize = 84;
+pub const CHAR_SIZE: usize = 12;
 
 pub struct FBColor {
     pub red: u8,
@@ -43,15 +44,14 @@ pub fn fb_write_char_array(tc: &mut TrafficControl, mut x: usize, y: usize, char
         return;
     }
     let fbstride = FRAMEBUFFER_BPP.load(Ordering::Relaxed) * FRAMEBUFFER_WIDTH;
-    const CHAR_SIZE: usize = 16;
     for c in chars {
         let c = *c;
         if c == ' ' {
             x += CHAR_SIZE;
         } else if c as u8 > 32 {
-            let c = c as u8 - 32;
-            let cx = (c % 16) as usize * CHAR_SIZE;
-            let cy = (c / 16) as usize * CHAR_SIZE;
+            let c = c as u8 - b'!';
+            let cx = (c % 15) as usize * CHAR_SIZE;
+            let cy = (c / 15) as usize * CHAR_SIZE;
             for row in 0..CHAR_SIZE {
                 for col in 0..CHAR_SIZE {
                     let coff = (VAPFONT_W * (cy + row)) + (cx + col);
diff --git a/src/dev/framebuffer/vapfont.data b/src/dev/framebuffer/vapfont.data
deleted file mode 100644
index 6d2b29209919ff07143a48576f796f57fc65b4bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3584
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

diff --git a/src/dev/framebuffer/vapfont.png b/src/dev/framebuffer/vapfont.png
deleted file mode 100644
index 892116de41136dbed0118bbe8b354fbaa4c831ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2316
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

diff --git a/turntable/Cargo.toml b/turntable/Cargo.toml
index 559c755..b7f25fc 100644
--- a/turntable/Cargo.toml
+++ b/turntable/Cargo.toml
@@ -17,6 +17,7 @@ panic = "abort"
 opt-level = "z"
 debug-assertions = false
 overflow-checks = false
+strip = true
 lto = true
 codegen-units = 1
 

From 13e0c9697c74d41377fabf623753e3f117a53742 Mon Sep 17 00:00:00 2001
From: husky <nikocs@voremicrocomputers.com>
Date: Fri, 12 Sep 2025 18:30:05 -0700
Subject: [PATCH 2/3] update sizes for new font size

---
 src/dev/framebuffer/console.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dev/framebuffer/console.rs b/src/dev/framebuffer/console.rs
index b7903aa..b88ad8e 100644
--- a/src/dev/framebuffer/console.rs
+++ b/src/dev/framebuffer/console.rs
@@ -1,9 +1,9 @@
-use crate::dev::framebuffer::{fb_clear_area, fb_clearscreen, fb_write_char_array};
+use crate::dev::framebuffer::{fb_clear_area, fb_clearscreen, fb_write_char_array, CHAR_SIZE};
 use crate::spinlock::Spinlock;
 use crate::trafficcontrol::TrafficControl;
 
 pub struct FramebufferConsole {
-    pub buffer: [[char; 20]; 15], // our font is 16x16, 320x240 is the standard res, so 20x15
+    pub buffer: [[char; 26]; 20], // our font is 16x16, 320x240 is the standard res, so 20x15
     pub cursor: (usize, usize),   // (x, y)
     pub need_screen_clear: bool,
     pub need_line_clear: bool,
@@ -14,7 +14,7 @@ pub static FBCONSOLE: Spinlock<FramebufferConsole> = Spinlock::new(FramebufferCo
 impl FramebufferConsole {
     pub const fn empty() -> Self {
         Self {
-            buffer: [[' '; 20]; 15],
+            buffer: [[' '; 26]; 20],
             cursor: (0, 0),
             need_screen_clear: true,
             need_line_clear: false,
@@ -27,14 +27,14 @@ impl FramebufferConsole {
             let copy_from = self.buffer[line_num + 1];
             self.buffer[line_num] = copy_from;
         }
-        self.buffer[self.buffer.len() - 1] = [' '; 20];
+        self.buffer[self.buffer.len() - 1] = [' '; 26];
         self.need_screen_clear = true;
     }
 
     // DOES send a framebuffer update!
     pub fn clear_terminal(&mut self, tc: &mut TrafficControl) {
         self.need_screen_clear = true;
-        self.buffer = [[' '; 20]; 15];
+        self.buffer = [[' '; 26]; 20];
         self.cursor = (0, 0);
         self.render(tc, true);
     }
@@ -90,12 +90,12 @@ impl FramebufferConsole {
             self.need_screen_clear = false;
         }
         if self.need_line_clear {
-            fb_clear_area(tc, 0, self.cursor.1 * 16, 320, 16, refresh_whole_screen);
+            fb_clear_area(tc, 0, self.cursor.1 * CHAR_SIZE, 320, CHAR_SIZE, refresh_whole_screen);
             self.need_line_clear = false;
         }
 
         for (y, line) in self.buffer.iter().enumerate() {
-            fb_write_char_array(tc, 0, y * 16, line);
+            fb_write_char_array(tc, 0, y * CHAR_SIZE, line);
         }
     }
 }

From 760d34c3571ea8472a956234d42f27c3b3c1728c Mon Sep 17 00:00:00 2001
From: husky <nikocs@voremicrocomputers.com>
Date: Fri, 12 Sep 2025 19:42:28 -0700
Subject: [PATCH 3/3] fixes for special characters

---
 liblbos/src/characters.rs      | 11 +++++++++++
 liblbos/src/lib.rs             |  1 +
 src/dev/framebuffer/console.rs | 17 +++++++++--------
 src/dev/framebuffer/mod.rs     |  4 ++--
 src/trafficcontrol.rs          |  4 +---
 turntable/Cargo.toml           |  1 -
 turntable/src/main.rs          | 10 +++++++---
 7 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 liblbos/src/characters.rs

diff --git a/liblbos/src/characters.rs b/liblbos/src/characters.rs
new file mode 100644
index 0000000..8b2097c
--- /dev/null
+++ b/liblbos/src/characters.rs
@@ -0,0 +1,11 @@
+pub const C_LIFEBLOOD_CAT: char = (b'~' + 1) as char;
+pub const C_SMILE: char = (b'~' + 2) as char;
+pub const C_FEARFUL: char = (b'~' + 3) as char;
+pub const C_SUNGLASSES: char = (b'~' + 4) as char;
+pub const C_COLONTHREE: char = (b'~' + 5) as char;
+pub const C_FOLDER: char = (b'~' + 6) as char;
+pub const C_FILE: char = (b'~' + 7) as char;
+pub const C_BLOOD: char = (b'~' + 8) as char;
+pub const C_WINK: char = (b'~' + 9) as char;
+pub const C_CONFUSED: char = (b'~' + 10) as char;
+pub const C_COLOND: char = (b'~' + 11) as char;
\ No newline at end of file
diff --git a/liblbos/src/lib.rs b/liblbos/src/lib.rs
index 13c5a0d..8f1b05c 100644
--- a/liblbos/src/lib.rs
+++ b/liblbos/src/lib.rs
@@ -3,6 +3,7 @@
 pub mod fs;
 pub mod ktask;
 pub mod syscalls;
+pub mod characters;
 mod arch;
 
 #[repr(C)]
diff --git a/src/dev/framebuffer/console.rs b/src/dev/framebuffer/console.rs
index b88ad8e..4cca85f 100644
--- a/src/dev/framebuffer/console.rs
+++ b/src/dev/framebuffer/console.rs
@@ -3,7 +3,7 @@ use crate::spinlock::Spinlock;
 use crate::trafficcontrol::TrafficControl;
 
 pub struct FramebufferConsole {
-    pub buffer: [[char; 26]; 20], // our font is 16x16, 320x240 is the standard res, so 20x15
+    pub buffer: [[u8; 26]; 20], // our font is 16x16, 320x240 is the standard res, so 20x15
     pub cursor: (usize, usize),   // (x, y)
     pub need_screen_clear: bool,
     pub need_line_clear: bool,
@@ -14,7 +14,7 @@ pub static FBCONSOLE: Spinlock<FramebufferConsole> = Spinlock::new(FramebufferCo
 impl FramebufferConsole {
     pub const fn empty() -> Self {
         Self {
-            buffer: [[' '; 26]; 20],
+            buffer: [[b' '; 26]; 20],
             cursor: (0, 0),
             need_screen_clear: true,
             need_line_clear: false,
@@ -27,23 +27,24 @@ impl FramebufferConsole {
             let copy_from = self.buffer[line_num + 1];
             self.buffer[line_num] = copy_from;
         }
-        self.buffer[self.buffer.len() - 1] = [' '; 26];
+        self.buffer[self.buffer.len() - 1] = [b' '; 26];
         self.need_screen_clear = true;
     }
 
     // DOES send a framebuffer update!
     pub fn clear_terminal(&mut self, tc: &mut TrafficControl) {
         self.need_screen_clear = true;
-        self.buffer = [[' '; 26]; 20];
+        self.buffer = [[b' '; 26]; 20];
         self.cursor = (0, 0);
         self.render(tc, true);
     }
 
     // DOES send a framebuffer update!
-    pub fn printstr(&mut self, tc: &mut TrafficControl, str: &str) {
-        for c in str.chars() {
+    pub fn printstr(&mut self, tc: &mut TrafficControl, str: &[u8]) {
+        for c in str {
+            let c = *c;
             let mut was_special_char = false;
-            if c == '\n' || c == '\r' {
+            if c == b'\n' || c == b'\r' {
                 was_special_char = true;
                 self.cursor.0 = 0;
                 self.cursor.1 += 1;
@@ -53,7 +54,7 @@ impl FramebufferConsole {
                 self.cursor.1 = self.buffer.len() - 1;
                 self.scroll_terminal();
             }
-            if c == '\x08' {
+            if c == b'\x08' {
                 was_special_char = true;
                 // we don't clear the character, that's up to the terminal
                 self.need_line_clear = true;
diff --git a/src/dev/framebuffer/mod.rs b/src/dev/framebuffer/mod.rs
index 28d462f..8600cab 100644
--- a/src/dev/framebuffer/mod.rs
+++ b/src/dev/framebuffer/mod.rs
@@ -35,7 +35,7 @@ impl FBColor {
     }
 }
 
-pub fn fb_write_char_array(tc: &mut TrafficControl, mut x: usize, y: usize, chars: &[char]) {
+pub fn fb_write_char_array(tc: &mut TrafficControl, mut x: usize, y: usize, chars: &[u8]) {
     let ogx = x;
     let ogy = y;
     const BYTES: [u8; 3] = FB_FG_COLOR.to_bytes();
@@ -46,7 +46,7 @@ pub fn fb_write_char_array(tc: &mut TrafficControl, mut x: usize, y: usize, char
     let fbstride = FRAMEBUFFER_BPP.load(Ordering::Relaxed) * FRAMEBUFFER_WIDTH;
     for c in chars {
         let c = *c;
-        if c == ' ' {
+        if c == b' ' {
             x += CHAR_SIZE;
         } else if c as u8 > 32 {
             let c = c as u8 - b'!';
diff --git a/src/trafficcontrol.rs b/src/trafficcontrol.rs
index 4f63715..05cd4fe 100644
--- a/src/trafficcontrol.rs
+++ b/src/trafficcontrol.rs
@@ -186,9 +186,7 @@ pub fn handle_syscall(
                 if tc.use_fb_console {
                     let mut fbcons = crate::dev::framebuffer::console::FBCONSOLE.lock();
                     fbcons.printstr(&mut tc, unsafe {
-                        core::str::from_utf8_unchecked(unsafe {
-                            core::slice::from_raw_parts(addr as *const u8, count)
-                        })
+                        core::slice::from_raw_parts(addr as *const u8, count)
                     });
                 }
                 0
diff --git a/turntable/Cargo.toml b/turntable/Cargo.toml
index b7f25fc..559c755 100644
--- a/turntable/Cargo.toml
+++ b/turntable/Cargo.toml
@@ -17,7 +17,6 @@ panic = "abort"
 opt-level = "z"
 debug-assertions = false
 overflow-checks = false
-strip = true
 lto = true
 codegen-units = 1
 
diff --git a/turntable/src/main.rs b/turntable/src/main.rs
index 1d7277c..af1f3e6 100644
--- a/turntable/src/main.rs
+++ b/turntable/src/main.rs
@@ -2,6 +2,7 @@
 #![no_main]
 
 use core::sync::atomic::{AtomicBool, AtomicPtr, AtomicUsize, Ordering};
+use liblbos::characters;
 use crate::terminal::{print, println};
 use liblbos::fs::{DirectoryReader, FileSystem};
 
@@ -112,13 +113,16 @@ fn lsdir(env: &Environment<'_>) {
             break;
         }
         print("- ");
+        let name = &record.name[..record.name.iter().position(|&x| x == 0).unwrap_or(11)];
         liblbos::syscalls::write_terminal(
-            &record.name[..record.name.iter().position(|&x| x == 0).unwrap_or(11)],
+            name
         );
         if record.record_type == liblbos::fs::RecordType::Directory as u8 {
-            print("(dir)");
+            liblbos::syscalls::write_terminal(&[b' ', characters::C_FOLDER as u8]);
+        } else if &name[name.len() - 3..] == b"DDI" {
+            liblbos::syscalls::write_terminal(&[b' ', characters::C_BLOOD as u8]);
         } else {
-            print("(file)");
+            liblbos::syscalls::write_terminal(&[b' ', characters::C_FILE as u8]);
         }
     }
     print("\n");