leyoda/softbuffer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from willnode/libredox-popos

Browse source 
orbital: Use libredox for file syscall
This commit is contained in:
Jeremy Soller 2026-07-18 16:43:11 -06:00 • committed by GitHub
commit 81883e7b94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -70,7 +70,7 @@ features = [
]
[target.'cfg(target_os = "redox")'.dependencies]
redox_syscall = "0.5"
libredox = "0.1.18"
[build-dependencies]
cfg_aliases = "0.2.0"

31
src/orbital.rs
View file

@ -11,22 +11,24 @@ struct OrbitalMap {
}
impl OrbitalMap {
unsafe fn new(fd: usize, size_unaligned: usize) -> syscall::Result<Self> {
unsafe fn new(fd: usize, size_unaligned: usize) -> std::io::Result<Self> {
// from redox_syscall
const PAGE_SIZE: usize = 4096;
// Page align size
let pages = (size_unaligned + syscall::PAGE_SIZE - 1) / syscall::PAGE_SIZE;
let size = pages * syscall::PAGE_SIZE;
let pages = (size_unaligned + PAGE_SIZE - 1) / PAGE_SIZE;
let size = pages * PAGE_SIZE;
// Map window buffer
let address = unsafe {
syscall::fmap(
libredox::call::mmap(libredox::call::MmapArgs {
addr: core::ptr::null_mut(),
length: size,
prot: libredox::flag::PROT_READ | libredox::flag::PROT_WRITE,
flags: libredox::flag::MAP_SHARED,
fd,
&syscall::Map {
offset: 0,
size,
flags: syscall::PROT_READ | syscall::PROT_WRITE | syscall::MAP_SHARED,
address: 0,
},
)?
})?
.addr()
};
Ok(Self {
@ -49,7 +51,8 @@ impl Drop for OrbitalMap {
fn drop(&mut self) {
unsafe {
// Unmap window buffer on drop
syscall::funmap(self.address, self.size).expect("failed to unmap orbital window");
libredox::call::munmap(self.address as _, self.size)
.expect("failed to unmap orbital window");
}
}
}
@ -108,7 +111,7 @@ impl<D: HasDisplayHandle, W: HasWindowHandle> OrbitalImpl<D, W> {
let mut window_height = 0;
let mut buf: [u8; 4096] = [0; 4096];
let count = syscall::fpath(self.window_fd(), &mut buf).unwrap();
let count = libredox::call::fpath(self.window_fd(), &mut buf).unwrap();
let path = str::from_utf8(&buf[..count]).unwrap();
// orbital:/x/y/w/h/t
let mut parts = path.split('/').skip(3);
@ -223,14 +226,14 @@ impl<'a, D: HasDisplayHandle, W: HasWindowHandle> BufferImpl<'a, D, W> {
// Tell orbital to show the latest window data
if damage.is_empty() {
syscall::fsync(self.imp.window_fd()).expect("failed to sync orbital window");
libredox::call::fsync(self.imp.window_fd()).expect("failed to sync orbital window");
} else {
use std::fmt::Write;
let mut damage_buf = "Y".to_string();
for m in damage {
let _ = write!(damage_buf, ",{},{},{},{}", m.x, m.y, m.width, m.height);
}
syscall::write(self.imp.window_fd(), damage_buf.as_bytes())
libredox::call::write(self.imp.window_fd(), damage_buf.as_bytes())
.expect("failed to sync orbital window");
}