Commit f872fee4 authored by Jeremy Soller's avatar Jeremy Soller

Merge remote-tracking branch 'origin/vbox_resize'

parents 59b57900 7957308f
...@@ -182,18 +182,23 @@ impl Screen for TextScreen { ...@@ -182,18 +182,23 @@ impl Screen for TextScreen {
{ {
let display = &mut self.display; let display = &mut self.display;
let changed = &mut self.changed; let changed = &mut self.changed;
let input = &mut self.input;
self.console.write(buf, |event| { self.console.write(buf, |event| {
match event { match event {
ransid::Event::Char { x, y, c, color, bold, .. } => { ransid::Event::Char { x, y, c, color, bold, .. } => {
display.char(x * 8, y * 16, c, color.data, bold, false); display.char(x * 8, y * 16, c, color.data, bold, false);
changed.insert(y); changed.insert(y);
}, },
ransid::Event::Input { data } => {
input.extend(data);
},
ransid::Event::Rect { x, y, w, h, color } => { ransid::Event::Rect { x, y, w, h, color } => {
display.rect(x * 8, y * 16, w * 8, h * 16, color.data); display.rect(x * 8, y * 16, w * 8, h * 16, color.data);
for y2 in y..y + h { for y2 in y..y + h {
changed.insert(y2); changed.insert(y2);
} }
}, },
ransid::Event::ScreenBuffer { .. } => (),
ransid::Event::Scroll { rows, color } => { ransid::Event::Scroll { rows, color } => {
display.scroll(rows * 16, color.data); display.scroll(rows * 16, color.data);
for y in 0..display.height/16 { for y in 0..display.height/16 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment