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

Allow local cursor to be changed while connected

This commit is contained in:
Samuel Mannehed 2017-02-19 01:52:47 +01:00
parent 3a535adab0
commit fb49f91b00
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/ui.js
View File

@ -417,6 +417,7 @@ var UI;
UI.addSettingChangeHandler('encrypt');
UI.addSettingChangeHandler('true_color');
UI.addSettingChangeHandler('cursor');
UI.addSettingChangeHandler('cursor', UI.updateLocalCursor);
UI.addSettingChangeHandler('resize');
UI.addSettingChangeHandler('resize', UI.enableDisableViewClip);
UI.addSettingChangeHandler('resize', UI.applyResizeMode);
@ -499,7 +500,7 @@ var UI;
document.getElementById('noVNC_setting_encrypt').disabled = UI.connected;
document.getElementById('noVNC_setting_true_color').disabled = UI.connected;
if (Util.browserSupportsCursorURIs()) {
document.getElementById('noVNC_setting_cursor').disabled = UI.connected;
document.getElementById('noVNC_setting_cursor').disabled = false;
} else {
UI.updateSetting('cursor', !Util.isTouchDevice);
document.getElementById('noVNC_setting_cursor').disabled = true;
@ -1061,10 +1062,10 @@ var UI;
UI.rfb.set_encrypt(UI.getSetting('encrypt'));
UI.rfb.set_true_color(UI.getSetting('true_color'));
UI.rfb.set_local_cursor(UI.getSetting('cursor'));
UI.rfb.set_shared(UI.getSetting('shared'));
UI.rfb.set_repeaterID(UI.getSetting('repeaterID'));
UI.updateLocalCursor();
UI.updateViewOnly();
UI.rfb.connect(host, port, password, path);
@ -1654,6 +1655,10 @@ var UI;
}
},
updateLocalCursor: function() {
UI.rfb.set_local_cursor(UI.getSetting('cursor'));
},
updateViewOnly: function() {
UI.rfb.set_view_only(UI.getSetting('view_only'));
},

6
core/rfb.js
View File

@ -1488,6 +1488,12 @@
this._display.disableLocalCursor();
}
}
// Need to send an updated list of encodings if we are connected
if (this._rfb_connection_state === "connected") {
RFB.messages.clientEncodings(this._sock, this._encodings, cursor,
this._true_color);
}
};
RFB.prototype.set_view_only = function (view_only) {