...

ui/events.sx

@@ -2,19 +2,6 @@
 #import "modules/sdl3.sx";
 #import "ui/types.sx";
 
-EventType :: enum {
-    none;
-    mouse_down;
-    mouse_up;
-    mouse_moved;
-    mouse_wheel;
-    key_down;
-    key_up;
-    text_input;
-    window_resize;
-    quit;
-}
-
 MouseButton :: enum {
     none;
     left;
@@ -22,85 +9,89 @@ MouseButton :: enum {
     right;
 }
 
-Event :: struct {
-    type: EventType;
-    position: Point;
-    delta: Point;
-    button: MouseButton;
-    key: u32;
-    text: string;
-    timestamp: u64;
+MouseButtonData :: struct { position: Point; button: MouseButton; }
+MouseMotionData :: struct { position: Point; delta: Point; }
+MouseWheelData  :: struct { position: Point; delta: Point; }
+KeyData         :: struct { key: u32; }
+ResizeData      :: struct { size: Size; }
 
-    make :: (type: EventType) -> Event {
-        e : Event = ---;
-        memset(@e, 0, size_of(Event));
-        e.type = type;
-        e;
+Event :: enum {
+    none;
+    quit;
+    mouse_down: MouseButtonData;
+    mouse_up: MouseButtonData;
+    mouse_moved: MouseMotionData;
+    mouse_wheel: MouseWheelData;
+    key_down: KeyData;
+    key_up: KeyData;
+    text_input: string;
+    window_resize: ResizeData;
+}
+
+event_position :: (e: *Event) -> ?Point {
+    if e.* == {
+        case .mouse_down: (d) { return d.position; }
+        case .mouse_up: (d) { return d.position; }
+        case .mouse_moved: (d) { return d.position; }
+        case .mouse_wheel: (d) { return d.position; }
     }
+    null;
 }
 
 // Translate SDL_Event → our Event type
 translate_sdl_event :: (sdl: *SDL_Event) -> Event {
     if sdl.* == {
         case .quit: {
-            return Event.make(.quit);
+            return .quit;
         }
         case .key_down: (data) {
-            e := Event.make(.key_down);
-            e.key = xx data.key;
-            e.timestamp = data.timestamp;
-            return e;
+            return .key_down(KeyData.{ key = xx data.key });
         }
         case .key_up: (data) {
-            e := Event.make(.key_up);
-            e.key = xx data.key;
-            e.timestamp = data.timestamp;
-            return e;
+            return .key_up(KeyData.{ key = xx data.key });
         }
         case .mouse_motion: (data) {
-            e := Event.make(.mouse_moved);
-            e.position = Point.{ x = data.x, y = data.y };
-            e.delta = Point.{ x = data.xrel, y = data.yrel };
-            e.timestamp = data.timestamp;
-            return e;
+            return .mouse_moved(MouseMotionData.{
+                position = Point.{ x = data.x, y = data.y },
+                delta = Point.{ x = data.xrel, y = data.yrel }
+            });
         }
         case .mouse_button_down: (data) {
-            e := Event.make(.mouse_down);
-            e.position = Point.{ x = data.x, y = data.y };
-            e.button = if data.button == {
+            print("  mouse_down raw: x={} y={} btn={}\n", data.x, data.y, data.button);
+            btn :MouseButton = if data.button == {
                 case 1: .left;
                 case 2: .middle;
                 case 3: .right;
                 else: .none;
             };
-            e.timestamp = data.timestamp;
-            return e;
+            return .mouse_down(MouseButtonData.{
+                position = Point.{ x = data.x, y = data.y },
+                button = btn
+            });
         }
         case .mouse_button_up: (data) {
-            e := Event.make(.mouse_up);
-            e.position = Point.{ x = data.x, y = data.y };
-            e.button = if data.button == {
+            btn :MouseButton = if data.button == {
                 case 1: .left;
                 case 2: .middle;
                 case 3: .right;
                 else: .none;
             };
-            e.timestamp = data.timestamp;
-            return e;
+            return .mouse_up(MouseButtonData.{
+                position = Point.{ x = data.x, y = data.y },
+                button = btn
+            });
         }
         case .mouse_wheel: (data) {
-            e := Event.make(.mouse_wheel);
-            e.delta = Point.{ x = data.x, y = data.y };
-            e.position = Point.{ x = data.mouse_x, y = data.mouse_y };
-            e.timestamp = data.timestamp;
-            return e;
+            return .mouse_wheel(MouseWheelData.{
+                position = Point.{ x = data.mouse_x, y = data.mouse_y },
+                delta = Point.{ x = data.x, y = data.y }
+            });
         }
         case .window_resized: (data) {
-            e := Event.make(.window_resize);
-            e.position = Point.{ x = xx data.data1, y = xx data.data2 };
-            e.timestamp = data.timestamp;
-            return e;
+            return .window_resize(ResizeData.{
+                size = Size.{ width = xx data.data1, height = xx data.data2 }
+            });
         }
     }
-    Event.make(.none);
+    .none;
 }