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

.cargo/config.toml

@@ -1,3 +1,3 @@
 [alias]
-repbuild = "run --manifest-path ./repbuild/Cargo.toml -r --"
+repbuild = "run --manifest-path ./repbuild/Cargo.toml -r -- "
 dev = "run --manifest-path ./dev/Cargo.toml -r --"

Cargo.lock

@@ -228,12 +228,12 @@ dependencies = [
 [[package]]
 name = "hbbytecode"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#bedffa9b32418e9e56ab5ab0590cef3becabcc6a"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#42a713aeaef11ca86d96083915191fbe456c47e5"
 
 [[package]]
 name = "hblang"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#bedffa9b32418e9e56ab5ab0590cef3becabcc6a"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#42a713aeaef11ca86d96083915191fbe456c47e5"
 dependencies = [
  "hashbrown 0.15.1",
  "hbbytecode",
@@ -245,7 +245,7 @@ dependencies = [
 [[package]]
 name = "hbvm"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#bedffa9b32418e9e56ab5ab0590cef3becabcc6a"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#42a713aeaef11ca86d96083915191fbe456c47e5"
 dependencies = [
  "hbbytecode",
 ]

repbuild/src/main.rs

@@ -421,6 +421,7 @@ fn run(release: bool, target: Target, do_accel: bool) -> Result<(), Error> {
                 "-bios", &ovmf_path.change_context(Error::OvmfFetch)?,
                 "-drive", "file=target/disk.img,format=raw",
                 "-device", "vmware-svga",
+                // "-serial", "stdio",
                 "-m", "2G",
                 "-smp", "1",
                 "-parallel", "none",

sysdata/libraries/horizon_api/src/widgets/image.hb

@@ -1,7 +1,5 @@
-.{Surface} := @use("../../../../libraries/render/src/lib.hb")
-
-Image := struct {
-	magic: uint,
-	is_dirty: bool,
-	surface: Surface,
-}
+// Image := struct {
+// 	magic: uint,
+// 	is_dirty: bool,
+// 	surface: Surface,
+// }

sysdata/libraries/intouch/src/events.hb

@@ -12,8 +12,8 @@ KeyEvent := struct {
 }
 
 MouseEvent := struct {
-	x_change: u8,
-	y_change: u8,
+	x_change: i8,
+	y_change: i8,
 	left: u8,
 	middle: u8,
 	right: u8,

sysdata/libraries/intouch/src/lib.hb

@@ -16,7 +16,7 @@ recieve_key_event := fn(): ?KeyEvent {
 	key_event := KeyEvent.(0, 0, 2)
 	// return key_event
 
-	return null
+	// return null
 }
 
 recieve_mouse_event := fn(): ?MouseEvent {
@@ -28,8 +28,8 @@ recieve_mouse_event := fn(): ?MouseEvent {
 	buffer.recv(MouseEvent, buf_id, mem_page)
 	if *mem_page != 0 {
 		log.info("Mouse events\0")
-		dx := *mem_page
-		dy := *mem_page + 1
+		dx := @as(i8, @bitcast(*mem_page))
+		dy := @as(i8, @bitcast(*(mem_page + 1)))
 		mevent := MouseEvent.(dx, dy, 0, 0, 0)
 		return mevent
 	}

sysdata/programs/horizon/src/main.hb

@@ -40,27 +40,19 @@ main := fn(): int {
 	// really we should null check but it is a bit broked
 	font := @unwrap(render.text.font_from_psf2(@bitcast(&psf), false))
 
-	mouse_x := 0
-	mouse_y := 0
+	mouse_x := @as(i16, 0)
+	mouse_y := @as(i16, 0)
 	text_label := new_label("Hi\0")
 	// widgets := "()\0"
 	// ui := sexpr_parser(widgets)
 
-	mouse_event := intouch.recieve_mouse_event()
-
-	if mouse_event == null {
-		log.warn("null\0")
-	} else {
-		log.warn("not null\0")
-	}
-
 	loop {
 		// Clear the screen
 		render.clear(screen, render.black)
 
 		// TODO: Read the window buffer here
 		{
-			ret := buffer.recv([u8; 4096], win_buff, mem_buf)
+			// ret := buffer.recv([u8; 4096], win_buff, mem_buf)
 			// for some reason this null check causes the compiler to spin forever
 			// if ret == null {
 			// 	log.info("No messages\0")
@@ -72,26 +64,6 @@ main := fn(): int {
 		// get input events from drivers via intouch
 		// key_event := intouch.recieve_key_event();
 		// log.info("before mouse event check\0");
-		{
-			// Note: MLokis, this inline halts the compiler forever
-			// mouse_event := @inline(intouch.recieve_mouse_event)
-			// Note: MLokis, this function returns null unless the mouse is moving
-			mouse_event = intouch.recieve_mouse_event()
-			//
-
-			if mouse_event != null {
-				log.warn("Mouse event recieved\0")
-
-				mouse_x += mouse_event.x_change
-				mouse_y += mouse_event.y_change
-				set_label_text(text_label, "Mouse Moved\0")
-			}
-			// render mouse
-			render.put_rect(screen, .(mouse_x, mouse_y), .(20, 20), render.white)
-			// Send events to focused window
-		}
-
-		// TODO: Get windows out of a collection and iter through
 
 		render.put_rect(screen, .(0, 0), .(screen.width - 1, screen.height - 1), render.white)
 		{
@@ -107,6 +79,47 @@ main := fn(): int {
 			pos := Vec2(uint).(1, screen.height - 21)
 			render_label_to_surface(screen, text_label, font, pos)
 		}
+
+		{
+			mouse_event := intouch.recieve_mouse_event()
+			//
+
+			if mouse_event != null {
+				// log.warn("Mouse event recieved\0")
+
+				change_x := @as(i16, mouse_event.x_change)
+				change_x = change_x << 8
+				change_x = change_x >> 8
+
+				mouse_x += change_x
+				if mouse_x < 0 {
+					mouse_x = 0
+				}
+				if mouse_x >= screen.width - 20 {
+					mouse_x = @intcast(screen.width - 21)
+				}
+
+				change_y := @as(i16, mouse_event.y_change)
+				change_y = change_y << 8
+				change_y = change_y >> 8
+
+				if mouse_y < 0 {
+					mouse_y = 0
+				}
+				if mouse_y >= screen.height - 20 {
+					mouse_y = @intcast(screen.height - 21)
+				}
+				mouse_y -= change_y
+
+				set_label_text(text_label, "Mouse Moved\0")
+			}
+			// render mouse
+			render.put_rect(screen, .(mouse_x, mouse_y), .(20, 20), render.white)
+			// Send events to focused window
+		}
+
+		// TODO: Get windows out of a collection and iter through
+
 		// Sync the screen
 		render.sync(screen)
 	}

sysdata/programs/ps2_mouse_driver/src/main.hb

@@ -111,6 +111,7 @@ main := fn(): int {
 		loop if (memory.inb(0x64) & 0x20) == 0x20 break
 
 		status := memory.inb(0x60)
+
 		if status == 0xAA {
 			loop if memory.inb(0x60) == 0 break
 			log.info("Mouse plugged in!\0")
@@ -132,25 +133,23 @@ main := fn(): int {
 
 		button_states ^= changes
 
-		// log.info(string.display_int(status, format_page, 10))
-
 		dx := i9.(false, 0)
 		dy := i9.(false, 0)
 
 		dx.value = memory.inb(0x60)
 		dx.sign = (status & 0x10) > 0
 
-		dy.value = -memory.inb(0x60)
-		dy.sign = (status & 0x20) == 0
+		dy.value = memory.inb(0x60)
+		dy.sign = (status & 0x20) != 0
 
-		if dy.value != 0 & dx.value != 0 {
-			y_change := dy.value
-			x_change := dx.value
-			event := MouseEvent.(x_change, y_change, 0, 0, 0)
-			buffer.write(MouseEvent, &event, mouse_buffer)
+		y_change := @as(i8, @bitcast(dy.value))
+		x_change := @as(i8, @bitcast(dx.value))
 
-			// mouse_moved(.(dx, dy))
-		}
+		event := MouseEvent.(0, 0, 0, 0, 0)
+		event.x_change = x_change
+		event.y_change = y_change
+
+		buffer.write(MouseEvent, &event, mouse_buffer)
 	}
 
 	return 0

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

@@ -1,13 +1,15 @@
-.{memory, log, string} := @use("../../../../libraries/stn/src/lib.hb")
+.{memory, log, string, math} := @use("../../../../libraries/stn/src/lib.hb")
 render := @use("../../../../libraries/render/src/lib.hb")
 
-/* expected result: almost-not-trash notepad app
-   very jank
+/* expected result: pretty decent notepad app
+   slightly jank
    -----------------
    features:
    - basic keys
    - holding support with DAS
    - visible cursor
+   - l+r arrow key support
+   - proper insertion and deletion
    - shift key support
 */
 
@@ -15,12 +17,17 @@ psf := @embed("../../../../consolefonts/tamsyn/10x20r.psf")
 
 is_shift_pressed := false
 is_ctrl_pressed := false
+is_extended := false
 $initial_delay := 50
 $repeat_delay := 7
+$left_arrow := 0x4B
+$right_arrow := 0x4D
+$up_arrow := 0x48
+$down_arrow := 0x50
 
 example := fn(): void {
 	screen := render.init(true)
-	window := render.new_surface(480, 340)
+	window := render.new_surface(600, 300)
 	font := render.text.font_from_psf2(@bitcast(&psf), false)
 
 	if font == null {
@@ -35,12 +42,10 @@ example := fn(): void {
 	bottom := buf + msg_len
 
 	@inline(memory.copy, u8, msg, buf, msg_len)
-	cursor := buf + msg_len;
+	cursor := bottom
 
-	*cursor = 95
-	draw_window(window, font, buf)
-	draw_screen(screen, window);
-	*cursor = 32
+	draw_window(window, font, buf, cursor)
+	draw_screen(screen, window)
 
 	memory.outb(96, 238)
 	memory.outb(96, 238)
@@ -53,24 +58,35 @@ example := fn(): void {
 	loop {
 		input := memory.inb(96)
 		if input != prev_input {
-			if (input & 0x80) != 0 {
-				if (input & 0x7F) == current_key {
-					current_key = 0
-					holding_timer = 0
-				} else if input == 0xAA | input == 0xB6 {
-					is_shift_pressed = false
-				} else if input == 0x9D {
-					is_ctrl_pressed = false
-				}
+			if input == 0xE0 {
+				is_extended = true
 			} else {
-				if input == 0x2A | input == 0x36 {
-					is_shift_pressed = true
-				} else if input == 0x1D {
-					is_ctrl_pressed = true
+				if (input & 0x80) != 0 {
+					if (input & 0x7F) == current_key {
+						current_key = 0
+						holding_timer = 0
+					} else if input == 0xAA | input == 0xB6 {
+						is_shift_pressed = false
+					} else if input == 0x9D {
+						is_ctrl_pressed = false
+					}
+					is_extended = false
 				} else {
-					current_key = input
-					holding_timer = 1
-					cursor = handle_char(map_keys(current_key), cursor, bottom)
+					if is_extended {
+						current_key = input
+						holding_timer = 1
+						cursor = handle_extended_key(input, cursor, bottom, font)
+					} else {
+						if input == 0x2A | input == 0x36 {
+							is_shift_pressed = true
+						} else if input == 0x1D {
+							is_ctrl_pressed = true
+						} else {
+							current_key = input
+							holding_timer = 1
+							cursor = handle_char(map_keys(current_key), cursor, bottom)
+						}
+					}
 				}
 			}
 			prev_input = input
@@ -80,14 +96,16 @@ example := fn(): void {
 			holding_timer += 1
 
 			if holding_timer >= initial_delay {
-				cursor = handle_char(map_keys(current_key), cursor, bottom)
+				if is_extended {
+					cursor = handle_extended_key(current_key, cursor, bottom, font)
+				} else {
+					cursor = handle_char(map_keys(current_key), cursor, bottom)
+				}
 				holding_timer = initial_delay - repeat_delay
 			}
-		};
-		*cursor = 95
-		draw_window(window, font, buf)
-		draw_screen(screen, window);
-		*cursor = 32
+		}
+		draw_window(window, font, buf, cursor)
+		draw_screen(screen, window)
 
 		if holding_timer > 0 & current_key != 0 {
 			if (memory.inb(96) & 0x80) != 0 {
@@ -96,17 +114,87 @@ example := fn(): void {
 			}
 		}
 	}
+}
 
-	return
+handle_extended_key := fn(scancode: u8, cursor: ^u8, bottom: ^u8, font: render.text.Font): ^u8 {
+	if scancode == left_arrow {
+		if cursor > bottom {
+			return cursor - 1
+		}
+	} else if scancode == right_arrow {
+		if *cursor != 0 {
+			return cursor + 1
+		}
+	}
+	return cursor
+}
+
+padding := 3 * @sizeof(render.Color)
+
+draw_window := fn(window: render.Surface, font: render.text.Font, buf: ^u8, cursor: ^u8): void {
+	render.clear(window, render.light_yellow)
+	line := font.height + padding - 1
+	render.put_rect(window, .(0, 0), .(window.width - 1, window.height - 1), render.black)
+
+	loop if line >= window.height break else {
+		render.put_hline(window, line, padding, window.width - padding, render.yellow)
+		line += font.height
+	}
+
+	render.put_text(window, font, .(padding, padding), render.black, buf)
+
+	cursor_offset := cursor - buf
+
+	y_pos := padding
+	x_pos := padding
+	i := 0
+
+	loop if i >= cursor_offset break else {
+		if *(buf + i) == 10 {
+			y_pos += font.height + font.line_gap
+			x_pos = padding
+		} else {
+			if x_pos + font.width >= window.width - padding {
+				y_pos += font.height + font.line_gap
+				x_pos = padding - font.width
+			}
+			x_pos += font.width
+		}
+		i += 1
+	}
+
+	render.put_rect(window, .(x_pos, y_pos), .(1, font.height - 1), render.black)
+}
+
+draw_screen := fn(screen: render.Surface, window: render.Surface): void {
+	render.clear(screen, render.light_blue)
+	render.put_surface(screen, window, .(100, 100), false)
+	render.sync(screen)
 }
 
 handle_char := fn(char: u8, cursor: ^u8, bottom: ^u8): ^u8 {
 	if char == 0 {
 		return cursor
 	}
+
 	if is_ctrl_pressed & char == 48 {
 		cursor = bottom
 	} else if char != 0x8 {
+		end := cursor
+		loop if *end == 0 break else {
+			end += 1
+		}
+
+		if cursor < end {
+			src := end
+			dst := end + 1
+			loop if src < cursor break else {
+				*dst = *src
+				dst -= 1
+				src -= 1
+			}
+		};
+
 		*cursor = char
 		return cursor + 1
 	} else if char == 0xA {
@@ -115,37 +203,36 @@ handle_char := fn(char: u8, cursor: ^u8, bottom: ^u8): ^u8 {
 		*cursor = 92
 		return cursor + 1
 	} else if cursor > bottom {
-		cursor -= 1;
-		*cursor = 32
-		return cursor
+		if cursor == bottom {
+			return cursor
+		}
+
+		end := cursor
+		loop if *end == 0 break else {
+			end += 1
+		}
+
+		if cursor < end {
+			src := cursor
+			dst := cursor - 1
+			loop if src > end break else {
+				*dst = *src
+				dst += 1
+				src += 1
+			}
+			return cursor - 1
+		} else {
+			cursor -= 1;
+			*cursor = 32
+			return cursor
+		}
 	}
 	return cursor
 }
-
 map_keys := fn(scancode: u8): u8 {
 	if is_shift_pressed {
 		return ps2_table[scancode + 0x40]
 	}
 	return ps2_table[scancode]
 }
-
 ps2_table := [u8].(0x0, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x2D, 0x3D, 0x8, 0x9, 0x71, 0x77, 0x65, 0x72, 0x74, 0x79, 0x75, 0x69, 0x6F, 0x70, 0x5B, 0x5D, 0xA, 0x0, 0x61, 0x73, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x3B, 0x27, 0x60, 0x0, 0x5C, 0x7A, 0x78, 0x63, 0x76, 0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2F, 0x0, 0x2A, 0x0, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1B, 0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29, 0x5F, 0x2B, 0x8, 0x9, 0x51, 0x57, 0x45, 0x52, 0x54, 0x59, 0x55, 0x49, 0x4F, 0x50, 0x7B, 0x7D, 0xA, 0x0, 0x41, 0x53, 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x3A, 0x22, 0x7E, 0x0, 0x7C, 0x5A, 0x58, 0x43, 0x56, 0x42, 0x4E, 0x4D, 0x3C, 0x3E, 0x3F, 0x0, 0x0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-$padding := 7
-
-draw_window := fn(window: render.Surface, font: render.text.Font, buf: ^u8): void {
-	render.clear(window, render.light_yellow)
-	line := font.height + font.line_gap + padding - 1
-	render.put_rect(window, .(0, 0), .(window.width - 1, window.height - 1), render.black)
-	loop if line >= window.height break else {
-		render.put_hline(window, line, padding, window.width - padding, render.yellow)
-		line += font.height + font.line_gap
-	}
-
-	render.put_text(window, font, .(padding, padding), render.black, buf)
-}
-
-draw_screen := fn(screen: render.Surface, window: render.Surface): void {
-	render.clear(screen, render.light_blue)
-	render.put_surface(screen, window, .(100, 100), false)
-	render.sync(screen)
-}

sysdata/programs/test_abc/README.md

@@ -1 +0,0 @@
-# test_abc

sysdata/programs/test_abc/meta.toml

@@ -1,11 +0,0 @@
-[package]
-name = "test_abc"
-authors = [""]
-
-[dependants.libraries]
-
-[dependants.binaries]
-hblang.version = "1.0.0"
-
-[build]
-command = "hblang src/main.hb"

sysdata/programs/test_abc/src/main.hb

@@ -1,19 +0,0 @@
-stn := @use("../../../libraries/stn/src/lib.hb");
-.{log} := stn
-
-Structure := struct {}
-
-returner_fn := fn(): ?Structure {
-	structure := Structure.()
-	return structure
-}
-
-main := fn(): int {
-	ret := returner_fn()
-	if ret != null {
-		log.info("not null\0")
-		return 1
-	}
-
-	return 0
-}

sysdata/programs/tests/meta.toml

@@ -1,11 +0,0 @@
-[package]
-name = "tests"
-authors = ["able"]
-
-[dependants.libraries]
-
-[dependants.binaries]
-hblang.version = "1.0.0"
-
-[build]
-command = "hblang src/main.hb"

sysdata/system_config.toml

@@ -20,12 +20,6 @@ resolution = "1600x900x24"
 
 [boot.limine.ableos.modules]
 
-# [boot.limine.ableos.modules.tests]
-# path = "boot:///tests.hbf"
-
-# [boot.limine.ableos.modules.diskio_driver]
-# path = "boot:///diskio_driver.hbf"
-
 # [boot.limine.ableos.modules.render_example]
 # path = "boot:///render_example.hbf"