diff options
| author | Samuel Mannehed <samuel@cendio.se> | 2016-09-01 15:39:26 +0200 |
|---|---|---|
| committer | Samuel Mannehed <samuel@cendio.se> | 2016-10-14 01:46:55 +0200 |
| commit | ceb847b0e3acb40c68fbc8c801d271965a42a5d3 (patch) | |
| tree | 5d0d50c2a5c8c719f8bf6f4f2675625994c85bdf | |
| parent | 301dc0e20b669a00b8993ff85e3ff17512b217ef (diff) | |
| download | novnc-ceb847b0e3acb40c68fbc8c801d271965a42a5d3.tar.gz | |
Don't modify mouse or keyboard in view_only mode
The UI previously didn't respect view_only in a number of cases.
| -rw-r--r-- | app/ui.js | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -1096,8 +1096,11 @@ var UI; } else if (resizeMode === 'scale' || resizeMode === 'downscale') { var downscaleOnly = resizeMode === 'downscale'; var scaleRatio = display.autoscale(screen.w, screen.h, downscaleOnly); - UI.rfb.get_mouse().set_scale(scaleRatio); - Util.Debug('Scaling by ' + UI.rfb.get_mouse().get_scale()); + + if (!UI.rfb.get_view_only()) { + UI.rfb.get_mouse().set_scale(scaleRatio); + Util.Debug('Scaling by ' + UI.rfb.get_mouse().get_scale()); + } } } }, @@ -1513,7 +1516,7 @@ var UI; * ------v------*/ setMouseButton: function(num) { - if (UI.rfb) { + if (UI.rfb && !UI.rfb.get_view_only()) { UI.rfb.get_mouse().set_touchButton(num); } @@ -1529,17 +1532,17 @@ var UI; }, displayBlur: function() { - if (!UI.rfb) return; - - UI.rfb.get_keyboard().set_focused(false); - UI.rfb.get_mouse().set_focused(false); + if (UI.rfb && !UI.rfb.get_view_only()) { + UI.rfb.get_keyboard().set_focused(false); + UI.rfb.get_mouse().set_focused(false); + } }, displayFocus: function() { - if (!UI.rfb) return; - - UI.rfb.get_keyboard().set_focused(true); - UI.rfb.get_mouse().set_focused(true); + if (UI.rfb && !UI.rfb.get_view_only()) { + UI.rfb.get_keyboard().set_focused(true); + UI.rfb.get_mouse().set_focused(true); + } }, updateDesktopName: function(rfb, name) { |