From 1827910927833b53cb183032a10d5a3c454b7852 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 22 Sep 2015 09:22:46 -0700
Subject: [PATCH] Support multi-touch events on Android

Depends on tomaka/android-rs-glue#64.
---
 Cargo.toml             |  2 +-
 src/api/android/mod.rs | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 41bf0848..cb3df6b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ khronos_api = "0.0.7"
 clock_ticks = "0.0.5"
 
 [target.arm-linux-androideabi.dependencies.android_glue]
-version = "0"
+version = "0.1"
 
 [target.x86_64-apple-ios.dependencies]
 objc = "0.1"
diff --git a/src/api/android/mod.rs b/src/api/android/mod.rs
index 0f770c27..1f18008b 100644
--- a/src/api/android/mod.rs
+++ b/src/api/android/mod.rs
@@ -8,8 +8,7 @@ use std::sync::mpsc::{Receiver, channel};
 use {CreationError, Event, MouseCursor};
 use CreationError::OsError;
 use events::ElementState::{Pressed, Released};
-use events::Event::{MouseInput, MouseMoved};
-use events::MouseButton;
+use events::{Touch, TouchPhase};
 
 use std::collections::VecDeque;
 
@@ -68,15 +67,19 @@ impl<'a> Iterator for PollEventsIterator<'a> {
 
     fn next(&mut self) -> Option<Event> {
         match self.window.event_rx.try_recv() {
-            Ok(event) => {
-                match event {
-                    android_glue::Event::EventDown => Some(MouseInput(Pressed, MouseButton::Left)),
-                    android_glue::Event::EventUp => Some(MouseInput(Released, MouseButton::Left)),
-                    android_glue::Event::EventMove(x, y) => Some(MouseMoved((x as i32, y as i32))),
-                    _ => None,
-                }
+            Ok(android_glue::Event::EventMotion(motion)) => {
+                Some(Event::Touch(Touch {
+                    phase: match motion.action {
+                        android_glue::MotionAction::Down => TouchPhase::Started,
+                        android_glue::MotionAction::Move => TouchPhase::Moved,
+                        android_glue::MotionAction::Up => TouchPhase::Ended,
+                        android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
+                    },
+                    location: (motion.x as f64, motion.y as f64),
+                    id: motion.pointer_id as u64,
+                }))
             }
-            Err(_) => {
+            _ => {
                 None
             }
         }