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

Merge c307d966d5 into 98c1275d80

This commit is contained in:
jalfd 2014-02-05 16:44:44 +01:00
parent 98c1275d80 c307d966d5
commit d6431acddd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/display.js
View File

@ -55,7 +55,8 @@ Util.conf_defaults(conf, that, defaults, [
['render_mode', 'ro', 'str', '', 'Canvas rendering mode (read-only)'], ['render_mode', 'ro', 'str', '', 'Canvas rendering mode (read-only)'],
['prefer_js', 'rw', 'str', null, 'Prefer Javascript over canvas methods'], ['prefer_js', 'rw', 'str', null, 'Prefer Javascript over canvas methods'],
['cursor_uri', 'rw', 'raw', null, 'Can we render cursor using data URI'] ['cursor_uri', 'rw', 'raw', null, 'Can we render cursor using data URI'],
['default_cursor', 'wo', 'str', null, 'Default cursor']
]); ]);
// Override some specific getters/setters // Override some specific getters/setters
@ -648,7 +649,7 @@ that.changeCursor = function(pixels, mask, hotx, hoty, w, h) {
}; };
that.defaultCursor = function() { that.defaultCursor = function() {
conf.target.style.cursor = "default"; conf.target.style.cursor = conf.default_cursor;
}; };
return constructor(); // Return the public API interface return constructor(); // Return the public API interface

4
include/rfb.js
View File

@ -142,6 +142,8 @@ Util.conf_defaults(conf, that, defaults, [
['connectTimeout', 'rw', 'int', def_con_timeout, 'Time (s) to wait for connection'], ['connectTimeout', 'rw', 'int', def_con_timeout, 'Time (s) to wait for connection'],
['disconnectTimeout', 'rw', 'int', 3, 'Time (s) to wait for disconnection'], ['disconnectTimeout', 'rw', 'int', 3, 'Time (s) to wait for disconnection'],
['default_cursor', 'wo', 'str', 'default', 'Default cursor'],
// UltraVNC repeater ID to connect to // UltraVNC repeater ID to connect to
['repeaterID', 'rw', 'str', '', 'RepeaterID to connect to'], ['repeaterID', 'rw', 'str', '', 'RepeaterID to connect to'],
@ -213,7 +215,7 @@ function constructor() {
} }
// Initialize display, mouse, keyboard, and websock // Initialize display, mouse, keyboard, and websock
try { try {
display = new Display({'target': conf.target}); display = new Display({'target': conf.target, 'default_cursor': conf.default_cursor});
} catch (exc) { } catch (exc) {
Util.Error("Display exception: " + exc); Util.Error("Display exception: " + exc);
updateState('fatal', "No working Display"); updateState('fatal', "No working Display");