Merge branch 'master' of https://git.ablecorp.us/AbleOS/ableos

repbuild/Cargo.toml

@@ -22,6 +22,7 @@ fatfs = "0.3"
 toml = "0.8"
 hblang = { git = "https://git.ablecorp.us/AbleOS/holey-bytes.git", features = [
 	"std",
+	# "opts",
 ], default-features = false }
 log = "0.4"
 raw-cpuid = "11"

repbuild/src/dev.rs

@@ -47,7 +47,6 @@ impl Package {
 
         for (count, (name, table)) in bin_table.into_iter().enumerate() {
             // if count != 0 {
-            println!("{}", name);
             binaries.push(name.clone());
             // }
         }
@@ -75,6 +74,7 @@ impl Package {
                 &path,
                 Options {
                     fmt: true,
+                    // optimize: true,
                     ..Default::default()
                 },
                 &mut bytes,
@@ -83,6 +83,7 @@ impl Package {
             hblang::run_compiler(
                 &path,
                 Options {
+                    // optimize: true,
                     ..Default::default()
                 },
                 &mut bytes,
@@ -99,6 +100,7 @@ impl Package {
                 &path,
                 Options {
                     dump_asm: true,
+                    // optimize: true,
                     ..Default::default()
                 },
                 &mut bytes,

repbuild/src/main.rs

@@ -407,9 +407,9 @@ fn run(release: bool, target: Target, do_accel: bool) -> Result<(), Error> {
                 "-parallel", "none",
                 "-monitor", "none",
                 "-machine", accel,
+                "-cpu", "max",                "-serial", "stdio",
                 "-audiodev", "pa,id=speaker",
                 "-machine", "pcspk-audiodev=speaker",
-                "-cpu", "max",
                 "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04",
             ]);
         }

sysdata/libraries/stn/src/panic.hb

@@ -0,0 +1,8 @@
+panic := fn(message: ?^u8): void {
+	if message != null {
+		log.error(message)
+	}
+	// TODO: replace with die keyword when it gets pushed
+	loop {
+	}
+}

sysdata/programs/horizon/src/main.hb

@@ -15,6 +15,8 @@ Window := struct {
 	y: int,
 }
 
+psf := @embed("../../../consolefonts/tamsyn/10x20r.psf")
+
 main := fn(): int {
 	win_buff := buffer.create("XHorizon\0")
 
@@ -33,6 +35,8 @@ main := fn(): int {
 
 	vel_inner := Vec2(int).(1, 1)
 	pos_inner := Vec2(uint).((window.width - side) / 2, (window.height - side) / 2)
+	str := "Window Title Bar\0"
+	font := render.text.font_from_psf2(@bitcast(&psf))
 
 	loop {
 		// Clear the screen
@@ -43,6 +47,8 @@ main := fn(): int {
 			ret := buffer.recv([u8; 4096], win_buff, mem_buf)
 			if ret == 0 {
 				log.info("No messages\0")
+			} else {
+				log.info("Handle Messages\0")
 			}
 		}
 
@@ -65,6 +71,7 @@ main := fn(): int {
 			{
 				render.put_rect(window, .(0, 0), .(window.width - 1, window.height - 1), render.white)
 				render.put_rect(window, .(0, 0), .(window.width - 1, 20), render.white)
+				render.put_text(window, font, .(window.width / 2, 1), render.white, str)
 			}
 			render.put_filled_rect(window, pos_inner, .(side, side), color)
 

sysdata/programs/horizon_testing_program/src/main.hb

@@ -7,6 +7,8 @@ horizon_api := @use("../../../libraries/horizon_api/src/lib.hb");
 ignim := @use("../../../libraries/ignim/src/lib.hb");
 .{errors} := ignim
 
+psf := @embed("../../../consolefonts/tamsyn/10x20r.psf")
+
 main := fn(): int {
 	x := 0
 	// loop if x > 10000 break else x += 1

sysdata/programs/mouse_driver/README.md

@@ -0,0 +1 @@
+# mouse_driver

sysdata/programs/mouse_driver/meta.toml

@@ -9,3 +9,15 @@ hblang.version = "1.0.0"
 
 [build]
 command = "hblang src/main.hb"
+
+[package]
+name = "mouse_driver"
+authors = [""]
+
+[dependants.libraries]
+
+[dependants.binaries]
+hblang.version = "1.0.0"
+
+[build]
+command = "hblang src/main.hb"

sysdata/programs/mouse_driver/src/main.hb

@@ -1,10 +1,13 @@
 .{memory, buffer, log, string} := @use("../../../libraries/stn/src/lib.hb")
+render := @use("../../../libraries/render/src/lib.hb")
 
 ACK := 250
 
 wait_for := fn(for: u8): void {
+	log.info("Start waiting\0")
 	loop {
 		if (memory.inb(0x64) & 2 >> for) == for {
+			log.info("End waiting\0")
 			return
 		}
 	}
@@ -16,17 +19,19 @@ send_info := fn(info: u8): void {
 }
 
 send_command := fn(command: u8): void {
-	@inline(send_info, 0xD4)
+	send_info(0xD4)
-	@inline(wait_for, 1)
+	wait_for(1)
 	memory.outb(0x60, command)
 }
 
 get_response := fn(): u8 {
-	@inline(wait_for, 1)
+	wait_for(1)
 	return memory.inb(0x60)
 }
 
 main := fn(): int {
+	// screen := render.init(true)
+
 	format_page := memory.alloc(u8, 1024)
 
 	wait_for(0)
@@ -34,20 +39,40 @@ main := fn(): int {
 	log.info("Aux mouse device enabled.\0")
 
 	send_command(0xF6)
-	_ := get_response()
+	a := get_response()
 
 	send_command(0xF4)
-	_ = get_response()
+	b := get_response()
+
+	x := -0
+	y := -0
 
 	loop {
-		loop if (memory.inb(0x64) & 0x20) == 0x20 break
+		// render.clear(screen, render.black)
+
+		loop {
+			if (memory.inb(0x64) & 0x20) == 0x20 {
+				log.info("Yeah\0")
+
+				break
+			} else {
+			}
+		}
+
 		status := memory.inb(0x60)
-		//log.info("NEGATIVE Y MOVEMENT\0\0")
 		log.info(string.display_int(status, format_page, 10))
 		d_x := memory.inb(0x60)
 		log.info(string.display_int(d_x, format_page, 10))
+		x = x + d_x
 		d_y := memory.inb(0x60)
+		y = y + d_y
 		log.info(string.display_int(d_y, format_page, 10))
+		// render.put_rect(screen, .(x, y), .(x + 10, y + 10), render.white)
+
+		log.info("XY\0")
+
+		log.info(string.display_int(x, format_page, 10))
+		log.info(string.display_int(y, format_page, 10))
 	}
 
 	return 0

sysdata/programs/render_example/src/examples/text.hb

@@ -10,14 +10,13 @@ example := fn(): void {
 	screen := render.init(true)
 	font := render.text.font_from_psf2(@bitcast(&psf))
 	t := 0
-	str := "Hello, World!
+	str := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWX\0"
-This is a test
+
-of multiline rendering\0"
 	loop {
 		render.clear(screen, render.black)
 		render.put_text(screen, font, .(t, t % screen.height), render.red, str)
 		render.sync(screen)
-		t += 1
+		// t += 1
 	}
 	return
 }

sysdata/programs/render_example/src/main.hb

@@ -1,3 +1 @@
-.{example} := @use("./examples/cube.hb")
+.{example: main} := @use("./examples/text.hb")
-
-main := example

sysdata/system_config.toml

@@ -26,8 +26,8 @@ resolution = "1600x900x24"
 # [boot.limine.ableos.modules.diskio_driver]
 # path = "boot:///diskio_driver.hbf"
 
-[boot.limine.ableos.modules.render_example]
+# [boot.limine.ableos.modules.render_example]
-path = "boot:///render_example.hbf"
+# path = "boot:///render_example.hbf"
 
 # [boot.limine.ableos.modules.serial_driver]
 # path = "boot:///serial_driver.hbf"