jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #428 - hides the local cursor when using the server-side cursor.

This commit is contained in:
samhed 2015-01-15 16:27:18 +01:00
parent fc00821eba
commit b804b3e458
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/display.js
View File

@ -93,13 +93,14 @@ var Display;
this._cursor_uri = true; this._cursor_uri = true;
} }
Util.Info("Data URI scheme cursor supported"); Util.Info("Data URI scheme cursor supported");
this._target.style.cursor = curSave;
} else { } else {
if (this._cursor_uri === null || this._cursor_uri === undefined) { if (this._cursor_uri === null || this._cursor_uri === undefined) {
this._cursor_uri = false; this._cursor_uri = false;
} }
Util.Warn("Data URI scheme cursor not supported"); Util.Warn("Data URI scheme cursor not supported");
this._target.style.cursor = "none";
} }
this._target.style.cursor = curSave;
} catch (exc) { } catch (exc) {
Util.Error("Data URI scheme cursor test exception: " + exc); Util.Error("Data URI scheme cursor test exception: " + exc);
this._cursor_uri = false; this._cursor_uri = false;
@ -470,6 +471,10 @@ var Display;
this._target.style.cursor = "default"; this._target.style.cursor = "default";
}, },
disableLocalCursor: function () {
this._target.style.cursor = "none";
},
// Overridden getters/setters // Overridden getters/setters
get_context: function () { get_context: function () {
return this._drawCtx; return this._drawCtx;

5
include/rfb.js
View File

@ -411,7 +411,9 @@ var RFB;
if (this._display && this._display.get_context()) { if (this._display && this._display.get_context()) {
this._keyboard.ungrab(); this._keyboard.ungrab();
this._mouse.ungrab(); this._mouse.ungrab();
this._display.defaultCursor(); if (state !== 'connect' && state !== 'loaded') {
this._display.defaultCursor();
}
if (Util.get_logging() !== 'debug' || state === 'loaded') { if (Util.get_logging() !== 'debug' || state === 'loaded') {
// Show noVNC logo on load and when disconnected, unless in // Show noVNC logo on load and when disconnected, unless in
// debug mode // debug mode
@ -1215,6 +1217,7 @@ var RFB;
RFB.prototype.set_local_cursor = function (cursor) { RFB.prototype.set_local_cursor = function (cursor) {
if (!cursor || (cursor in {'0': 1, 'no': 1, 'false': 1})) { if (!cursor || (cursor in {'0': 1, 'no': 1, 'false': 1})) {
this._local_cursor = false; this._local_cursor = false;
this._display.disableLocalCursor(); //Only show server-side cursor
} else { } else {
if (this._display.get_cursor_uri()) { if (this._display.get_cursor_uri()) {
this._local_cursor = true; this._local_cursor = true;