From 8e5a60b2841fd1ed9e9e4e618ec7fc9650c85da7 Mon Sep 17 00:00:00 2001
From: Will Scullin <scullin@scullinsteel.com>
Date: Sat, 27 Jul 2019 15:57:40 -0700
Subject: [PATCH] Fix high bit miscalculation, mouse offset calcuation.

---
 js/canvas.js | 4 +++-
 js/main2.js  | 2 +-
 js/main2e.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/canvas.js b/js/canvas.js
index 8f3fe2b..d1d4806 100644
--- a/js/canvas.js
+++ b/js/canvas.js
@@ -780,7 +780,9 @@ export function HiresPage(page, context)
                         _refreshing = false;
                     }
                 } else {
-                    val = _buffer[0][base] & 0x7f;
+                    val = _buffer[0][base];
+                    hbs = val & 0x80;
+                    val &= 0x7f;
                     dx = col * 14 - 2;
                     b0 = col > 0 ? _buffer[0][base - 1] : 0;
                     b2 = col < 39 ? _buffer[0][base + 1] : 0;
diff --git a/js/main2.js b/js/main2.js
index 5e447d3..d656892 100644
--- a/js/main2.js
+++ b/js/main2.js
@@ -838,7 +838,7 @@ function _mousemove(evt) {
     }
 
     var s = document.querySelector('#screen');
-    var offset = { top: s.clientTop, left: s.clientLeft };
+    var offset = s.getBoundingClientRect();
     var x = (evt.pageX - offset.left) / s.clientWidth,
         y = (evt.pageY - offset.top) / s.clientHeight,
         z = x;
diff --git a/js/main2e.js b/js/main2e.js
index 90f8764..d1071d5 100644
--- a/js/main2e.js
+++ b/js/main2e.js
@@ -822,7 +822,7 @@ function _mousemove(evt) {
     }
 
     var s = document.querySelector('#screen');
-    var offset = { top: s.clientTop, left: s.clientLeft };
+    var offset = s.getBoundingClientRect();
     var x = (evt.pageX - offset.left) / s.clientWidth,
         y = (evt.pageY - offset.top) / s.clientHeight,
         z = x;