Jeremy Soller
GitHub
parent
0d1afaa016
commit
b49211f24e
1 changed files with 459 additions and 239 deletions
|
|
@ -4,200 +4,22 @@
|
|||
#![feature(question_mark)]
|
||||
|
||||
extern crate alloc;
|
||||
extern crate ransid;
|
||||
extern crate syscall;
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::collections::{BTreeSet, VecDeque};
|
||||
use std::fs::File;
|
||||
use std::io::{Read, Write};
|
||||
use std::{slice, thread};
|
||||
use ransid::{Console, Event};
|
||||
use syscall::{physmap, physunmap, Packet, Result, Scheme, EVENT_READ, MAP_WRITE, MAP_WRITE_COMBINE};
|
||||
use std::thread;
|
||||
use syscall::{physmap, physunmap, Packet, Scheme, MAP_WRITE, MAP_WRITE_COMBINE};
|
||||
|
||||
use display::Display;
|
||||
use mode_info::VBEModeInfo;
|
||||
use primitive::fast_set64;
|
||||
use scheme::DisplayScheme;
|
||||
|
||||
pub mod display;
|
||||
pub mod mode_info;
|
||||
pub mod primitive;
|
||||
|
||||
struct DisplayScheme {
|
||||
console: RefCell<Console>,
|
||||
display: RefCell<Display>,
|
||||
changed: RefCell<BTreeSet<usize>>,
|
||||
input: RefCell<VecDeque<u8>>,
|
||||
end_of_input: RefCell<bool>,
|
||||
cooked: RefCell<VecDeque<u8>>,
|
||||
requested: RefCell<usize>
|
||||
}
|
||||
|
||||
impl DisplayScheme {
|
||||
fn event(&self, event: Event) {
|
||||
let mut display = self.display.borrow_mut();
|
||||
let mut changed = self.changed.borrow_mut();
|
||||
|
||||
match event {
|
||||
Event::Char { x, y, c, color, bold, .. } => {
|
||||
display.char(x * 8, y * 16, c, color.data, bold, false);
|
||||
changed.insert(y);
|
||||
},
|
||||
Event::Rect { x, y, w, h, color } => {
|
||||
display.rect(x * 8, y * 16, w * 8, h * 16, color.data);
|
||||
for y2 in y..y + h {
|
||||
changed.insert(y2);
|
||||
}
|
||||
},
|
||||
Event::Scroll { rows, color } => {
|
||||
display.scroll(rows * 16, color.data);
|
||||
for y in 0..display.height/16 {
|
||||
changed.insert(y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn sync(&self) {
|
||||
let mut display = self.display.borrow_mut();
|
||||
let mut changed = self.changed.borrow_mut();
|
||||
|
||||
let width = display.width;
|
||||
for change in changed.iter() {
|
||||
display.sync(0, change * 16, width, 16);
|
||||
}
|
||||
changed.clear();
|
||||
}
|
||||
}
|
||||
|
||||
impl Scheme for DisplayScheme {
|
||||
fn open(&self, path: &[u8], _flags: usize, _uid: u32, _gid: u32) -> Result<usize> {
|
||||
if path == b"input" {
|
||||
Ok(1)
|
||||
} else {
|
||||
Ok(0)
|
||||
}
|
||||
}
|
||||
|
||||
fn dup(&self, id: usize) -> Result<usize> {
|
||||
Ok(id)
|
||||
}
|
||||
|
||||
fn fevent(&self, _id: usize, flags: usize) -> Result<usize> {
|
||||
*self.requested.borrow_mut() = flags;
|
||||
println!("fevent {:X}", flags);
|
||||
Ok(0)
|
||||
}
|
||||
|
||||
fn fpath(&self, id: usize, buf: &mut [u8]) -> Result<usize> {
|
||||
let path_str = if id == 1 {
|
||||
format!("display:input")
|
||||
} else {
|
||||
let console = self.console.borrow();
|
||||
format!("display:{}/{}", console.w, console.h)
|
||||
};
|
||||
|
||||
let path = path_str.as_bytes();
|
||||
|
||||
let mut i = 0;
|
||||
while i < buf.len() && i < path.len() {
|
||||
buf[i] = path[i];
|
||||
i += 1;
|
||||
}
|
||||
|
||||
Ok(i)
|
||||
}
|
||||
|
||||
fn fsync(&self, id: usize) -> Result<usize> {
|
||||
if id == 1 {
|
||||
|
||||
} else {
|
||||
self.sync();
|
||||
}
|
||||
|
||||
Ok(0)
|
||||
}
|
||||
|
||||
fn read(&self, _id: usize, buf: &mut [u8]) -> Result<usize> {
|
||||
let mut i = 0;
|
||||
let mut input = self.input.borrow_mut();
|
||||
while i < buf.len() && ! input.is_empty() {
|
||||
buf[i] = input.pop_front().unwrap();
|
||||
i += 1;
|
||||
}
|
||||
if i == 0 {
|
||||
*self.end_of_input.borrow_mut() = false;
|
||||
}
|
||||
Ok(i)
|
||||
}
|
||||
|
||||
fn write(&self, id: usize, buf: &[u8]) -> Result<usize> {
|
||||
if id == 1 {
|
||||
if self.console.borrow().raw_mode {
|
||||
for &b in buf.iter() {
|
||||
self.input.borrow_mut().push_back(b);
|
||||
}
|
||||
} else {
|
||||
for &b in buf.iter() {
|
||||
match b {
|
||||
b'\x03' => {
|
||||
*self.end_of_input.borrow_mut() = true;
|
||||
self.write(0, b"^C\n")?;
|
||||
},
|
||||
b'\x08' | b'\x7F' => {
|
||||
if let Some(_c) = self.cooked.borrow_mut().pop_back() {
|
||||
self.write(0, b"\x08")?;
|
||||
}
|
||||
},
|
||||
b'\n' | b'\r' => {
|
||||
self.cooked.borrow_mut().push_back(b);
|
||||
while let Some(c) = self.cooked.borrow_mut().pop_front() {
|
||||
self.input.borrow_mut().push_back(c);
|
||||
}
|
||||
self.write(0, b"\n")?;
|
||||
},
|
||||
_ => {
|
||||
self.cooked.borrow_mut().push_back(b);
|
||||
self.write(0, &[b])?;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(buf.len())
|
||||
} else {
|
||||
let mut console = self.console.borrow_mut();
|
||||
if console.cursor && console.x < console.w && console.y < console.h {
|
||||
self.event(Event::Rect {
|
||||
x: console.x,
|
||||
y: console.y,
|
||||
w: 1,
|
||||
h: 1,
|
||||
color: console.background
|
||||
});
|
||||
}
|
||||
console.write(buf, |event| {
|
||||
self.event(event);
|
||||
});
|
||||
if console.cursor && console.x < console.w && console.y < console.h {
|
||||
self.event(Event::Rect {
|
||||
x: console.x,
|
||||
y: console.y,
|
||||
w: 1,
|
||||
h: 1,
|
||||
color: console.foreground
|
||||
});
|
||||
}
|
||||
if ! console.raw_mode {
|
||||
self.sync();
|
||||
}
|
||||
Ok(buf.len())
|
||||
}
|
||||
}
|
||||
|
||||
fn close(&self, _id: usize) -> Result<usize> {
|
||||
Ok(0)
|
||||
}
|
||||
}
|
||||
pub mod scheme;
|
||||
pub mod screen;
|
||||
|
||||
fn main() {
|
||||
let width;
|
||||
|
|
@ -220,58 +42,42 @@ fn main() {
|
|||
|
||||
let size = width * height;
|
||||
|
||||
let onscreen = unsafe { physmap(physbaseptr as usize, size * 4, MAP_WRITE | MAP_WRITE_COMBINE).expect("vesad: failed to map VBE LFB") };
|
||||
let onscreen = unsafe { physmap(physbaseptr, size * 4, MAP_WRITE | MAP_WRITE_COMBINE).expect("vesad: failed to map VBE LFB") };
|
||||
unsafe { fast_set64(onscreen as *mut u64, 0, size/2) };
|
||||
|
||||
let offscreen = unsafe { alloc::heap::allocate(size * 4, 4096) };
|
||||
unsafe { fast_set64(offscreen as *mut u64, 0, size/2) };
|
||||
let scheme = DisplayScheme::new(width, height, onscreen);
|
||||
|
||||
let scheme = DisplayScheme {
|
||||
console: RefCell::new(Console::new(width/8, height/16)),
|
||||
display: RefCell::new(Display::new(width, height,
|
||||
unsafe { slice::from_raw_parts_mut(onscreen as *mut u32, size) },
|
||||
unsafe { slice::from_raw_parts_mut(offscreen as *mut u32, size) }
|
||||
)),
|
||||
changed: RefCell::new(BTreeSet::new()),
|
||||
input: RefCell::new(VecDeque::new()),
|
||||
end_of_input: RefCell::new(false),
|
||||
cooked: RefCell::new(VecDeque::new()),
|
||||
requested: RefCell::new(0)
|
||||
};
|
||||
|
||||
let mut blocked = VecDeque::new();
|
||||
let mut blocked = Vec::new();
|
||||
loop {
|
||||
let mut packet = Packet::default();
|
||||
socket.read(&mut packet).expect("vesad: failed to read display scheme");
|
||||
//println!("vesad: {:?}", packet);
|
||||
|
||||
// If it is a read packet, and there is no data, block it. Otherwise, handle packet
|
||||
let mut block = false;
|
||||
if packet.a == syscall::number::SYS_READ && packet.d > 0 && scheme.input.borrow().is_empty() {
|
||||
if ! *scheme.end_of_input.borrow() {
|
||||
block = true;
|
||||
}
|
||||
}
|
||||
|
||||
if block {
|
||||
blocked.push_back(packet);
|
||||
if packet.a == syscall::number::SYS_READ && packet.d > 0 && scheme.will_block(packet.b) {
|
||||
blocked.push(packet);
|
||||
} else {
|
||||
scheme.handle(&mut packet);
|
||||
socket.write(&packet).expect("vesad: failed to write display scheme");
|
||||
}
|
||||
|
||||
// If there are blocked readers, and data is available, handle them
|
||||
while ! scheme.input.borrow().is_empty() || *scheme.end_of_input.borrow() {
|
||||
if let Some(mut packet) = blocked.pop_front() {
|
||||
scheme.handle(&mut packet);
|
||||
socket.write(&packet).expect("vesad: failed to write display scheme");
|
||||
} else {
|
||||
break;
|
||||
{
|
||||
let mut i = 0;
|
||||
while i < blocked.len() {
|
||||
if ! scheme.will_block(blocked[i].b) {
|
||||
let mut packet = blocked.remove(i);
|
||||
scheme.handle(&mut packet);
|
||||
socket.write(&packet).expect("vesad: failed to write display scheme");
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If there are requested events, and data is available, send a notification
|
||||
if (! scheme.input.borrow().is_empty() || *scheme.end_of_input.borrow()) && *scheme.requested.borrow() & EVENT_READ == EVENT_READ {
|
||||
/* TODO
|
||||
if (! scheme.screen.borrow().input.is_empty() || scheme.screen.borrow().end_of_input) && scheme.screen.borrow().requested & EVENT_READ == EVENT_READ {
|
||||
let event_packet = Packet {
|
||||
id: 0,
|
||||
pid: 0,
|
||||
|
|
@ -280,10 +86,11 @@ fn main() {
|
|||
a: syscall::number::SYS_FEVENT,
|
||||
b: 0,
|
||||
c: EVENT_READ,
|
||||
d: scheme.input.borrow().len()
|
||||
d: scheme.screen.borrow().input.len()
|
||||
};
|
||||
socket.write(&event_packet).expect("vesad: failed to write display scheme");
|
||||
}
|
||||
*/
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue