From 87fe1ec4c0b25e89157efb58d25ccdff2801df87 Mon Sep 17 00:00:00 2001
From: Ross Andrews <ross.andrews@gmail.com>
Date: Tue, 3 May 2022 18:10:47 -0500
Subject: [PATCH] WIP

---
 vemu/src/main.rs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/vemu/src/main.rs b/vemu/src/main.rs
index c76ae21..92b588a 100644
--- a/vemu/src/main.rs
+++ b/vemu/src/main.rs
@@ -16,7 +16,7 @@ use vasm::assemble_snippet;
 use vcore::cpu::CPU;
 use vcore::memory::{Memory, PeekPoke};
 use vcore::word::Word;
-use winit::event::ElementState;
+use winit::event::{DeviceEvent, ElementState};
 use winit::window::Window;
 
 fn main() {
@@ -69,10 +69,10 @@ fn window_loop(event_loop: EventLoop<()>, window: Window, mut pixels: Pixels, mu
                 pixels.resize_surface(new_size.width, new_size.height);
             }
 
-            Event::WindowEvent {
-                event: WindowEvent::KeyboardInput { input, .. },
-                window_id,
-            } if window_id == window.id() => {
+            Event::DeviceEvent {
+                event: DeviceEvent::Key(input),
+                device_id: _device_id,
+            } => {
                 if let (Some(vk), state) = (input.virtual_keycode, input.state) {
                     let byte = convert_keycode(vk);
                     let word = Word::from_bytes([
@@ -81,9 +81,15 @@ fn window_loop(event_loop: EventLoop<()>, window: Window, mut pixels: Pixels, mu
                         0,
                     ]);
                     interrupt_events.push_back((5, Some(word)))
+                } else {
+                    println!("scancode: {}", input.scancode);
                 }
             }
-
+            // Event::WindowEvent {
+            //     event: WindowEvent::KeyboardInput { input, .. },
+            //     window_id,
+            // } if window_id == window.id() => {
+            // }
             Event::MainEventsCleared => {
                 let start = Instant::now();
                 draw(pixels.get_frame(), &mut cpu);