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

Merge branch 'master' of git@github.com:kanaka/noVNC

This commit is contained in:
Joel Martin 2011-05-09 18:09:59 -05:00
parent f31eeaa8ab 1a2371fcd2
commit 2fb665ec94
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/canvas.js
View File

@ -38,7 +38,7 @@ cdef('target', 'dom', null, 'Canvas element for VNC viewport');
cdef('focusContainer', 'dom', document, 'DOM element that traps keyboard input'); cdef('focusContainer', 'dom', document, 'DOM element that traps keyboard input');
cdef('true_color', 'bool', true, 'Request true color pixel data'); cdef('true_color', 'bool', true, 'Request true color pixel data');
cdef('colourMap', 'raw', [], 'Colour map array (not true color)'); cdef('colourMap', 'raw', [], 'Colour map array (not true color)');
cdef('scale', 'float', 1, 'VNC viewport scale factor'); cdef('scale', 'float', 1.0, 'Viewport scale factor 0.1 - 1.0');
cdef('render_mode', 'str', '', 'Canvas rendering mode (read-only)'); cdef('render_mode', 'str', '', 'Canvas rendering mode (read-only)');
@ -70,6 +70,9 @@ that.set_colourMap = function(val, idx) {
that.set_render_mode = function () { throw("render_mode is read-only"); }; that.set_render_mode = function () { throw("render_mode is read-only"); };
that.set_scale = function(scale) { that.rescale(scale); };
// Add some other getters/setters // Add some other getters/setters
that.get_width = function() { that.get_width = function() {
return c_width; return c_width;
@ -232,6 +235,12 @@ that.rescale = function(factor) {
return; return;
} }
if (factor > 1.0) {
factor = 1.0;
} else if (factor < 0.1) {
factor = 0.1;
}
if (conf.scale === factor) { if (conf.scale === factor) {
//Util.Debug("Canvas already scaled to '" + factor + "'"); //Util.Debug("Canvas already scaled to '" + factor + "'");
return; return;

1
include/input.js
View File

@ -460,6 +460,7 @@ function cdef(v, type, defval, desc) {
// Capability settings, default can be overridden // Capability settings, default can be overridden
cdef('target', 'dom', document, 'DOM element that grabs mouse input'); cdef('target', 'dom', document, 'DOM element that grabs mouse input');
cdef('focused', 'bool', true, 'Capture and send mouse clicks/movement'); cdef('focused', 'bool', true, 'Capture and send mouse clicks/movement');
cdef('scale', 'float', 1.0, 'Viewport scale factor 0.0 - 1.0');
cdef('mouseButton', 'func', null, 'Handler for mouse button click/release'); cdef('mouseButton', 'func', null, 'Handler for mouse button click/release');
cdef('mouseMove', 'func', null, 'Handler for mouse movement'); cdef('mouseMove', 'func', null, 'Handler for mouse movement');