Merge remote-tracking branch 'origin/vbox_resize'

2017-03-27 18:32:18 -06:00
parent 59b5790024 7957308f01
commit f872fee4e6
1 changed files with 5 additions and 0 deletions
@@ -182,18 +182,23 @@ impl Screen for TextScreen {
        {
            let display = &mut self.display;
            let changed = &mut self.changed;
+            let input = &mut self.input;
            self.console.write(buf, |event| {
                match event {
                    ransid::Event::Char { x, y, c, color, bold, .. } => {
                        display.char(x * 8, y * 16, c, color.data, bold, false);
                        changed.insert(y);
                    },
+                    ransid::Event::Input { data } => {
+                        input.extend(data);
+                    },
                    ransid::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);
                        }
                    },
+                    ransid::Event::ScreenBuffer { .. } => (),
                    ransid::Event::Scroll { rows, color } => {
                        display.scroll(rows * 16, color.data);
                        for y in 0..display.height/16 {