Merge branch 'cursor' of https://github.com/CendioOssman/noVNC

diff --cc core/display.js
index eb7eec27cf63a3fe234bc4760c7292713b032775,44304ae58a38f1d02be5cf32ef80c2862aa63da8..057b12f7838803ca1e04217025ba10fe7f5eef63
--- 1/core/display.js
--- 2/core/display.js
+++ b/core/display.js
@@@ -496,24 -498,12 +496,12 @@@ Display.prototype = 
          this._damage(x, y, img.width, img.height);
      },
  
-     changeCursor: function (pixels, mask, hotx, hoty, w, h) {
-         Display.changeCursor(this._target, pixels, mask, hotx, hoty, w, h);
-     },
- 
-     defaultCursor: function () {
-         this._target.style.cursor = "default";
-     },
- 
-     disableLocalCursor: function () {
-         this._target.style.cursor = "none";
-     },
- 
      autoscale: function (containerWidth, containerHeight) {
 -        var vp = this._viewportLoc;
 -        var targetAspectRatio = containerWidth / containerHeight;
 -        var fbAspectRatio = vp.w / vp.h;
 +        const vp = this._viewportLoc;
 +        const targetAspectRatio = containerWidth / containerHeight;
 +        const fbAspectRatio = vp.w / vp.h;
  
 -        var scaleRatio;
 +        let scaleRatio;
          if (fbAspectRatio >= targetAspectRatio) {
              scaleRatio = containerWidth / vp.w;
          } else {

diff --cc core/rfb.js
Simple merge