Send relative coords to the device. Allows multiple screens to be controlled at the same time, like it was before.

lib/roles/device/plugins/touch.js

@@ -13,7 +13,8 @@ module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/router'))
   .dependency(require('../resources/remote'))
-  .define(function(options, adb, router, remote) {
+  .dependency(require('./display'))
+  .define(function(options, adb, router, remote, display) {
     var log = logger.createLogger('device:plugins:touch')
 
     var service = {
@@ -48,12 +49,18 @@ module.exports = syrup.serial()
         })
     }
 
+    function modifyCoords(message) {
+      message.x = Math.floor(message.x * display.width)
+      message.y = Math.floor(message.y * display.height)
+    }
+
     return openService()
       .then(function(monkey) {
         var queue = new SeqQueue()
 
         router
           .on(wire.TouchDownMessage, function(channel, message) {
+            modifyCoords(message)
             queue.push(message.seq, function() {
               monkey.touchDownAsync(message.x, message.y)
                 .catch(function(err) {
@@ -62,6 +69,7 @@ module.exports = syrup.serial()
             })
           })
           .on(wire.TouchMoveMessage, function(channel, message) {
+            modifyCoords(message)
             queue.push(message.seq, function() {
               monkey.touchMoveAsync(message.x, message.y)
                 .catch(function(err) {
@@ -70,6 +78,7 @@ module.exports = syrup.serial()
             })
           })
           .on(wire.TouchUpMessage, function(channel, message) {
+            modifyCoords(message)
             queue.push(message.seq, function() {
               monkey.touchUpAsync(message.x, message.y)
                 .catch(function(err) {
@@ -81,6 +90,7 @@ module.exports = syrup.serial()
             queue = new SeqQueue()
           })
           .on(wire.TapMessage, function(channel, message) {
+            modifyCoords(message)
             monkey.tapAsync(message.x, message.y)
               .catch(function(err) {
                 log.error('tap failed', err.stack)