Merge branch 'develop'

Author: colemancda

Package.resolved

@@ -83,10 +83,13 @@ public final class UIApplication: UIResponder {
     /// after handling the event in your implementation.
     public func sendEvent(_ event: UIEvent) {
 
-        keyWindow?.sendEvent(event)
+        self.windows.forEach { $0.sendEvent(event) }
     }
 
-    public func sendAction(_ selector: String, to target: AnyObject?, from sender: AnyObject?, for event: UIEvent?) {
+    public func sendAction(_ selector: String,
+                           to target: AnyObject?,
+                           from sender: AnyObject?,
+                           for event: UIEvent?) {
 
 
     }

Sources/Cacao/UIApplication.swift

@@ -39,7 +39,7 @@ internal final class UIEventEnvironment {
             guard let event = event(for: sdlEvent)
                 else { handleNonUIEvent(sdlEvent); continue }
 
-            
+            application.sendEvent(event)
         }
 
         // clear queue

Sources/Cacao/UIEventEnvironment.swift

@@ -694,15 +694,6 @@ open class UIView: UIResponder {
             // CoreGraphics drawing
             draw(in: context)
 
-            /// FIXME: temporary workaround for Linux
-            /// We have to convert the surface to PNG, even though we discard it.
-            /// For some reason this changes something internally in Cairo,
-            /// even though the texture and surface pixel buffer doesn't seem to change.
-            #if os(Linux)
-            let pngData = try! surface.writePNG()
-            assert(pngData.isEmpty == false)
-            #endif
-            
             /// flush surface
             surface.flush()
             surface.finish()

Sources/Cacao/UIView.swift

@@ -61,13 +61,29 @@ open class UIWindow: UIView {
 
         let gestureEnvironment = UIApplication.shared.gestureEnvironment
 
-        switch event.type {
+        // handle touches event
+        if let touchesEvent = event as? UITouchesEvent {
 
-        case .touches:
+            gestureEnvironment.updateGestures(for: event, window: self)
+            
+            sendTouches(for: touchesEvent)
+            
+        } else if let pressesEvent = event as? UIPressesEvent {
+            
+            guard isUserInteractionEnabled else { return }
 
             gestureEnvironment.updateGestures(for: event, window: self)
 
-            /*
+            sendButtons(for: pressesEvent)
+        }
+        
+        
+        
+        /*
+        switch event.type {
+            
+        case .touches:
+            
             let touches = event.touches(for: self) ?? []
 
             let gestureRecognizers = touches.reduce([UIGestureRecognizer](), { $0 + ($1.gestureRecognizers ?? []) })
@@ -104,12 +120,12 @@ open class UIWindow: UIView {
                 case .ended: touch.view?.touchesEnded(touches, with: event)
                 case .cancelled: touch.view?.touchesCancelled(touches, with: event)
                 }
-            }*/
+            }
 
         default:
 
             fatalError("\(event.type) events not implemented")
-        }
+        }*/
     }
 
     // MARK: - Subclassed Methods
@@ -140,7 +156,23 @@ open class UIWindow: UIView {
         layoutIfNeeded()
     }
 
-    private func sendTouches(for event: UIEvent) {
+    private func sendTouches(for event: UITouchesEvent) {
+        
+        let touches = event.touches
+        
+        for touch in touches {
+            
+            switch touch.phase {
+            case .began: touch.view?.touchesBegan(touches, with: event)
+            case .moved: touch.view?.touchesMoved(touches, with: event)
+            case .stationary: break
+            case .ended: touch.view?.touchesEnded(touches, with: event)
+            case .cancelled: touch.view?.touchesCancelled(touches, with: event)
+            }
+        }
+    }
+    
+    private func sendButtons(for event: UIPressesEvent) {
 
 
     }

Sources/Cacao/UIWindow.swift

@@ -31,7 +31,7 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
 
         self.window = UIWindow(frame: UIScreen.main.bounds)
 
-        self.window?.rootViewController = TimerViewController()
+        self.window?.rootViewController = SwitchViewController()
 
         self.window?.makeKeyAndVisible()