[add] more support for mouse inputs.

Author: vmarcella

crates/lambda-rs/examples/triangle.rs

@@ -4,7 +4,7 @@ use lambda::{
   events::{
     ComponentEvent,
     Events,
-    KeyEvent,
+    Key,
     WindowEvent,
   },
   render::{
@@ -73,19 +73,19 @@ impl Component for DemoComponent {
         }
       },
       Events::Keyboard { event, issued_at } => match event {
-        KeyEvent::KeyPressed {
+        Key::Pressed {
           scan_code,
           virtual_key,
         } => {
           println!("Key pressed: {:?}", virtual_key);
         }
-        KeyEvent::KeyReleased {
+        Key::Released {
           scan_code,
           virtual_key,
         } => {
           println!("Key released: {:?}", virtual_key);
         }
-        KeyEvent::ModifierPressed {
+        Key::ModifierPressed {
           modifier,
           virtual_key,
         } => {

crates/lambda-rs/examples/triangles.rs

@@ -3,7 +3,7 @@ use lambda::{
   core::runtime::start_runtime,
   events::{
     Events,
-    KeyEvent,
+    Key,
     VirtualKey,
     WindowEvent,
   },
@@ -159,7 +159,7 @@ impl Component for TrianglesComponent {
       },
       Events::Component { event, issued_at } => todo!(),
       Events::Keyboard { event, issued_at } => match event {
-        KeyEvent::KeyPressed {
+        Key::Pressed {
           scan_code,
           virtual_key,
         } => match virtual_key {

crates/lambda-rs/src/events.rs

@@ -26,12 +26,12 @@ pub enum RuntimeEvent {
 pub use lambda_platform::winit::winit_exports::VirtualKeyCode as VirtualKey;
 
 #[derive(Debug, Clone)]
-pub enum KeyEvent {
-  KeyPressed {
+pub enum Key {
+  Pressed {
     scan_code: u32,
     virtual_key: Option<VirtualKey>,
   },
-  KeyReleased {
+  Released {
     scan_code: u32,
     virtual_key: Option<VirtualKey>,
   },
@@ -51,10 +51,34 @@ pub enum Button {
 
 #[derive(Debug, Clone)]
 pub enum Mouse {
-  Moved { x: f64, y: f64, dx: f64, dy: f64 },
-  WheelPressed { x: f64, y: f64, button: u32 },
-  Pressed { x: f64, y: f64, button: Button },
-  Released { x: f64, y: f64, button: Button },
+  Moved {
+    x: f64,
+    y: f64,
+    dx: f64,
+    dy: f64,
+    device_id: u32,
+  },
+  Scrolled {
+    device_id: u32,
+  },
+  Pressed {
+    x: f64,
+    y: f64,
+    button: Button,
+    device_id: u32,
+  },
+  Released {
+    x: f64,
+    y: f64,
+    button: Button,
+    device_id: u32,
+  },
+  LeftWindow {
+    device_id: u32,
+  },
+  EnteredWindow {
+    device_id: u32,
+  },
 }
 
 /// Generic Event Enum which encapsulates all possible events that will be
@@ -74,7 +98,7 @@ pub enum Events {
     issued_at: Instant,
   },
   Keyboard {
-    event: KeyEvent,
+    event: Key,
     issued_at: Instant,
   },
   Mouse {

crates/lambda-rs/src/runtimes/application.rs

@@ -22,7 +22,7 @@ use crate::{
     Button,
     ComponentEvent,
     Events,
-    KeyEvent,
+    Key,
     Mouse,
     RuntimeEvent,
     WindowEvent,
@@ -205,7 +205,7 @@ impl Runtime for ApplicationRuntime {
           } => match (input.state, is_synthetic) {
             (ElementState::Pressed, false) => {
               Some(Events::Keyboard {
-                event: KeyEvent::KeyPressed {
+                event: Key::Pressed {
                   scan_code: input.scancode,
                   virtual_key: input.virtual_keycode,
                 },
@@ -214,7 +214,7 @@ impl Runtime for ApplicationRuntime {
             }
             (ElementState::Released, false) => {
               Some(Events::Keyboard {
-                event: KeyEvent::KeyReleased {
+                event: Key::Released {
                   scan_code: input.scancode,
                   virtual_key: input.virtual_keycode,
                 },
@@ -240,26 +240,40 @@ impl Runtime for ApplicationRuntime {
                 x: position.x,
                 y: position.y,
                 dx: 0.0,
-                dy: 0.0
+                dy: 0.0,
+                device_id: 0
               },
               issued_at: Instant::now(),
             })
           }
-          WinitWindowEvent::CursorEntered { device_id } => {None}
-          WinitWindowEvent::CursorLeft { device_id } => {None}
+          WinitWindowEvent::CursorEntered { device_id } => {
+            Some(Events::Mouse {
+              event: Mouse::EnteredWindow { device_id: 0 },
+              issued_at: Instant::now(),
+            })
+          }
+          WinitWindowEvent::CursorLeft { device_id } => {
+            Some(Events::Mouse { event: Mouse::LeftWindow { device_id: 0 }, issued_at: Instant::now() })
+          }
           WinitWindowEvent::MouseWheel {
             device_id,
             delta,
             phase,
             modifiers,
-          } => { None }
+          } => {
+            Some(Events::Mouse{
+              event: Mouse::Scrolled { device_id: 0 },
+              issued_at: Instant::now(),
+            })
+           }
           WinitWindowEvent::MouseInput {
             device_id,
             state,
             button,
             modifiers,
           } => {
 
+            // Map winit button to our button type
             let button = match button {
               MouseButton::Left => Button::Left,
               MouseButton::Right => Button::Right,
@@ -272,11 +286,13 @@ impl Runtime for ApplicationRuntime {
                 button,
                 x: 0.0,
                 y: 0.0,
+                device_id: 0,
               },
               ElementState::Released => Mouse::Released {
                 button,
                 x: 0.0,
-                y: 0.0
+                y: 0.0,
+                device_id: 0
               },
             };