From ec40268e554796462a71396d0ae752f6d613be03 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Mon, 22 Aug 2011 11:21:55 -0500
Subject: [PATCH 1/5] Working viewport test.

Tested on iOS (iPhone and iPad).

The viewport is correctly clipped to the screen/browser size and
resizing works correctly.

This uses the CSS3 Flexible Box Layout model.
---
 include/mobile.css  | 29 ++++++++++++++
 tests/viewport.html | 93 +++++++++++++++++++++++++++++++++------------
 2 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 include/mobile.css
diff --git a/include/mobile.css b/include/mobile.css
new file mode 100644
index 00000000..8ff7a54e
--- /dev/null
+++ b/include/mobile.css
@@ -0,0 +1,29 @@
+.fullscreen {
+    display: block;
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 100%;
+    height: 100%;
+    z-index: 9999;
+    margin: 0;
+    padding: 0;
+}
+
+.flex-layout {
+    display: box;
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-box;
+    box-orient: vertical;
+    -webkit-box-orient: vertical;
+    -moz-box-orient: vertical;
+    -ms-box-orient: vertical;
+}
+.flex-box {
+    box-flex: 1;
+    -webkit-box-flex: 1;
+    -moz-box-flex: 1;
+    -ms-box-flex: 1;
+}
+
diff --git a/tests/viewport.html b/tests/viewport.html
index 948d1864..b9225f47 100644
--- a/tests/viewport.html
+++ b/tests/viewport.html
@@ -1,21 +1,37 @@
 <!DOCTYPE html>
 <html>
-    <head><title>Viewport Test</title></head>
+    <head><title>Viewport Test</title>
+        <link rel="stylesheet" href="../include/mobile.css">
+        <!--
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+        -->
+        <meta name=viewport content="width=device-width, initial-scale=1.0, user-scalable=no">
+    </head>
     <body>
-        <br><br>
+        <div class="fullscreen flex-layout">
 
-        Canvas:
-            <input id="move-selector" type="button" value="Move"
-                onclick="toggleMove();">
-        <br>
-        <canvas id="canvas" width="640" height="20"
-                style="border-style: dotted; border-width: 1px;">
-            Canvas not supported.
-        </canvas>
+        <div>
+            Canvas:
+                <input id="move-selector" type="button" value="Move"
+                    onclick="toggleMove();">
+            <br>
+        </div>
+        <div id="container" class="flex-box">
+            <canvas id="canvas"
+                    style="border-style: dotted; border-width: 1px;">
+                Canvas not supported.
+            </canvas>
+            <br>
+        </div>
+        <div>
+            <br>
+            Results:<br>
+            <textarea id="messages" style="font-size: 9;" cols=80 rows=8></textarea>
+        </div>
+
+        </div>
 
-        <br>
-        Results:<br>
-        <textarea id="messages" style="font-size: 9;" cols=80 rows=25></textarea>
     </body>
 
     <!--
@@ -30,10 +46,8 @@
     <script>
         var msg_cnt = 0, iterations,
             fb_width = 800,
-            fb_height = 600,
-            viewport = {
-                'x': 0, 'y': 0,
-                'w' : 400, 'h' : 200 },
+            fb_height = 768,
+            viewport = {'x': 0, 'y': 0, 'w' : 0, 'h' : 0 },
             cleanRect = {},
             penDown = false, doMove = false,
             inMove = false, lastPos = {},
@@ -112,17 +126,24 @@
                 deltaX = - v.x;
             }
             if ((vx2 + deltaX) >= fb_width) {
-                deltaX -= ((vx2 + deltaX) - fb_width);
+                deltaX -= ((vx2 + deltaX) - fb_width + 1);
             }
-            v.x += deltaX;
-            vx2 += deltaX;
 
             if ((v.y + deltaY) < 0) {
                 deltaY = - v.y;
             }
             if ((vy2 + deltaY) >= fb_height) {
-                deltaY -= ((vy2 + deltaY) - fb_height);
+                deltaY -= ((vy2 + deltaY) - fb_height + 1);
             }
+
+            if ((deltaX === 0) && (deltaY === 0)) {
+                //message("skipping");
+                return;
+            }
+            message("deltaX: " + deltaX + ", deltaY: " + deltaY);
+
+            v.x += deltaX;
+            vx2 += deltaX;
             v.y += deltaY;
             vy2 += deltaY;
 
@@ -197,6 +218,7 @@
         }
 
         function drawArea(x, y, w, h) {
+            message("draw "+x+","+y+" ("+w+","+h+")");
             var imgData = ctx.createImageData(w, h),
                 data = imgData.data, pixel, realX, realY;
 
@@ -227,6 +249,28 @@
             }
         }
 
+        window.onresize = function() {
+            var v = viewport,
+                cw = $D('container').offsetWidth,
+                ch = $D('container').offsetHeight;
+
+            message("container: " + cw + "," + ch);
+
+            if (cw > fb_width) {
+                cw = fb_width;
+            }
+            if (ch > fb_height) {
+                ch = fb_height;
+            }
+            if ((cw !== v.w) || (ch !== v.h)) {
+                v.w = cw;
+                v.h = ch;
+                message("new viewport: " + v.w + "," + v.h);
+                canvas.resize(v.w, v.h);
+                drawArea(0, 0, v.w, v.h);
+            }
+        };
+
         window.onload = function() {
             canvas = new Display({'target' : $D('canvas')});
             ctx = canvas.get_context();
@@ -234,11 +278,10 @@
                                 'onMouseButton': mouseButton,
                                 'onMouseMove': mouseMove});
 
-            canvas.resize(viewport.w, viewport.h, true);
+            window.onresize();
             mouse.grab();
-            message("Display initialized");
 
-            drawArea(0, 0, viewport.w, viewport.h);
-        }
+            message("Display initialized");
+        };
     </script>
 </html>

From 48f26d799f374cda876cba389799c42ed6e49890 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Wed, 24 Aug 2011 13:26:28 -0500
Subject: [PATCH 2/5] websockify: pull HyBi fixes.

Pull 86af0b614d and 7b496ce5b from websockify.

    Fix HyBi support on 64-bit systems.

    https://github.com/kanaka/noVNC/issues/76

    - cleanup/update TODO.
    - remove explicit check for ctypes module for HyBi.

    Clarify that we support HyBi 07-10.

    HyBi 07 reports version 7 in the handshake.
    HyBi 08-10 report version 8 in the handshake.

    Remove version 9 since that is not yet actually defined.
---
 utils/websocket.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/utils/websocket.py b/utils/websocket.py
index 36f64ef3..8ae64d7f 100644
--- a/utils/websocket.py
+++ b/utils/websocket.py
@@ -8,7 +8,7 @@ Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
 Supports following protocol versions:
     - http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75
     - http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
-    - http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
+    - http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
 
 You can make a cert/key with openssl using:
 openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
@@ -49,8 +49,7 @@ else:
 
 # Degraded functionality if these imports are missing
 for mod, sup in [('numpy', 'HyBi protocol'),
-        ('ctypes', 'HyBi protocol'), ('ssl', 'TLS/SSL/wss'),
-        ('resource', 'daemonizing')]:
+        ('ssl', 'TLS/SSL/wss'), ('resource', 'daemonizing')]:
     try:
         globals()[mod] = __import__(mod)
     except ImportError:
@@ -298,9 +297,9 @@ Sec-WebSocket-Accept: %s\r
             f['mask'] = buf[f['hlen']:f['hlen']+4]
             b = c = ''
             if f['length'] >= 4:
-                mask = numpy.frombuffer(buf, dtype=numpy.dtype('<L4'),
+                mask = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'),
                         offset=f['hlen'], count=1)
-                data = numpy.frombuffer(buf, dtype=numpy.dtype('<L4'),
+                data = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'),
                         offset=f['hlen'] + 4, count=int(f['length'] / 4))
                 #b = numpy.bitwise_xor(data, mask).data
                 b = numpy.bitwise_xor(data, mask).tostring()
@@ -615,7 +614,9 @@ Sec-WebSocket-Accept: %s\r
             if sys.hexversion < 0x2060000 or not numpy:
                 raise self.EClose("Python >= 2.6 and numpy module is required for HyBi-07 or greater")
 
-            if ver in ['7', '8', '9']:
+            # HyBi-07 report version 7
+            # HyBi-08 - HyBi-10 report version 8
+            if ver in ['7', '8']:
                 self.version = "hybi-0" + ver
             else:
                 raise self.EClose('Unsupported protocol version %s' % ver)

From fa74a6e60cb689a9d27005dc3fdb42e23c461336 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Wed, 31 Aug 2011 15:08:03 -0500
Subject: [PATCH 3/5] websocket.py: fix payload length calculation.

Pull from websockify 0da91c7.
---
 utils/websocket.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/websocket.py b/utils/websocket.py
index 8ae64d7f..e3b475b3 100644
--- a/utils/websocket.py
+++ b/utils/websocket.py
@@ -225,7 +225,7 @@ Sec-WebSocket-Accept: %s\r
         payload_len = len(buf)
         if payload_len <= 125:
             header = struct.pack('>BB', b1, payload_len)
-        elif payload_len > 125 and payload_len <= 65536:
+        elif payload_len > 125 and payload_len < 65536:
             header = struct.pack('>BBH', b1, 126, payload_len)
         elif payload_len >= 65536:
             header = struct.pack('>BBQ', b1, 127, payload_len)

From 94568bc08d9220b393232d9c9479ad3b011e8206 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Wed, 31 Aug 2011 15:33:30 -0500
Subject: [PATCH 4/5] utils/websocket.py: silence partial unmask debug.

Pull from websockify ada02f2.
---
 utils/websocket.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/websocket.py b/utils/websocket.py
index e3b475b3..a39be5e2 100644
--- a/utils/websocket.py
+++ b/utils/websocket.py
@@ -305,7 +305,7 @@ Sec-WebSocket-Accept: %s\r
                 b = numpy.bitwise_xor(data, mask).tostring()
 
             if f['length'] % 4:
-                print("Partial unmask")
+                #print("Partial unmask")
                 mask = numpy.frombuffer(buf, dtype=numpy.dtype('B'),
                         offset=f['hlen'], count=(f['length'] % 4))
                 data = numpy.frombuffer(buf, dtype=numpy.dtype('B'),

From 7b10dc8a485079fdc34847140fb0c993265e3a1e Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Wed, 31 Aug 2011 18:06:58 -0500
Subject: [PATCH 5/5] utils/websocket.py: add HyBi 13 support.

Pull from websockify 6e26306.
---
 utils/websocket.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/websocket.py b/utils/websocket.py
index a39be5e2..e906b7e0 100644
--- a/utils/websocket.py
+++ b/utils/websocket.py
@@ -615,9 +615,10 @@ Sec-WebSocket-Accept: %s\r
                 raise self.EClose("Python >= 2.6 and numpy module is required for HyBi-07 or greater")
 
             # HyBi-07 report version 7
-            # HyBi-08 - HyBi-10 report version 8
-            if ver in ['7', '8']:
-                self.version = "hybi-0" + ver
+            # HyBi-08 - HyBi-12 report version 8
+            # HyBi-13 reports version 13
+            if ver in ['7', '8', '13']:
+                self.version = "hybi-%02d" % int(ver)
             else:
                 raise self.EClose('Unsupported protocol version %s' % ver)
 
