Rotate canvas image on client side when necessary. Minicap now always returns the image in upright position for newer devices.

lib/units/device/plugins/screen/stream.js

@@ -389,6 +389,17 @@ module.exports = syrup.serial()
           frameProducer.updateRotation(newRotation)
         })
 
+        frameProducer.on('start', function() {
+          var message = util.format(
+            'start %s'
+          , JSON.stringify(frameProducer.banner)
+          )
+
+          broadcastSet.values().forEach(function(ws) {
+            ws.send(message)
+          })
+        })
+
         frameProducer.on('readable', function next() {
           var frame
           if ((frame = frameProducer.nextFrame())) {

lib/units/device/plugins/screen/util/banner.js

@@ -16,7 +16,11 @@ module.exports.read = function parseBanner(out) {
     , virtualWidth: 0
     , virtualHeight: 0
     , orientation: 0
-    , quirks: 0
+    , quirks: {
+        dumb: false
+      , alwaysUpright: false
+      , tear: false
+      }
     }
 
     tryRead = function() {
@@ -78,7 +82,9 @@ module.exports.read = function parseBanner(out) {
               break
             case 23:
               // quirks
-              banner.quirks = chunk[cursor]
+              banner.quirks.dumb = (chunk[cursor] & 1) === 1
+              banner.quirks.alwaysUpright = (chunk[cursor] & 2) === 2
+              banner.quirks.tear = (chunk[cursor] & 4) === 4
               break
             }
 

res/app/components/stf/screen/screen-directive.js

@@ -73,6 +73,7 @@ module.exports = function DeviceScreenDirective(
         ws.onopen = function openListener() {
           var canvas = element.find('canvas')[0]
             , g = canvas.getContext('2d')
+            , positioner = element.find('div')[0]
 
           function vendorBackingStorePixelRatio(g) {
             return g.webkitBackingStorePixelRatio ||
@@ -206,6 +207,12 @@ module.exports = function DeviceScreenDirective(
             var cachedImageWidth = 0
               , cachedImageHeight = 0
               , cssRotation = 0
+              , alwaysUpright = false
+
+            function applyQuirks(banner) {
+              element[0].classList.toggle(
+                'quirk-always-upright', alwaysUpright = banner.quirks.alwaysUpright)
+            }
 
             function hasImageAreaChanged(img) {
               return cachedScreen.bounds.w !== screen.bounds.w ||
@@ -247,7 +254,7 @@ module.exports = function DeviceScreenDirective(
 
               canvasAspect = canvas.width / canvas.height
 
-              if (isRotated()) {
+              if (isRotated() && !alwaysUpright) {
                 canvasAspect = img.height / img.width
                 element[0].classList.add('rotated')
               }
@@ -256,14 +263,21 @@ module.exports = function DeviceScreenDirective(
                 element[0].classList.remove('rotated')
               }
 
+              if (alwaysUpright) {
+                // If the screen image is always in upright position (but we
+                // still want the rotation animation), we need to cancel out
+                // the rotation by using another rotation.
+                positioner.style[cssTransform] = 'rotate(' + -cssRotation + 'deg)'
+              }
+
               maybeFlipLetterbox()
             }
 
             return function messageListener(message) {
-              if (shouldUpdateScreen()) {
+              screen.rotation = device.display.rotation
-                screen.rotation = device.display.rotation
 
-                if (message.data instanceof Blob) {
+              if (message.data instanceof Blob) {
+                if (shouldUpdateScreen()) {
                   if (scope.displayError) {
                     scope.$apply(function () {
                       scope.displayError = false
@@ -313,15 +327,14 @@ module.exports = function DeviceScreenDirective(
                   var url = URL.createObjectURL(blob)
                   img.src = url
                 }
-                else {
+              }
-                  switch (message.data) {
+              else if (/^start /.test(message.data)) {
-                  case 'secure_on':
+                applyQuirks(JSON.parse(message.data.substr('start '.length)))
-                    scope.$apply(function () {
+              }
-                      scope.displayError = 'secure'
+              else if (message.data === 'secure_on') {
-                    })
+                scope.$apply(function () {
-                    break
+                  scope.displayError = 'secure'
-                  }
+                })
-                }
               }
             }
           })()

res/app/control-panes/device-control/device-control.css

@@ -36,6 +36,7 @@ device-screen .positioner {
   left: 0;
   margin: auto;
   pointer-events: none;
+  transform: rotate(0deg);
 }
 
 device-screen canvas.screen {