safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added autosize to layer

Browse Source
This commit is contained in:
Michael Jumper
2011-02-12 16:14:29 -08:00
parent 0ad9127a68
commit 0590170712
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
guacamole-common-js/src/main/resources/guacamole.js
View File

@@ -459,6 +459,7 @@ function GuacamoleClient(display, tunnelURL) {
// Create buffer if necessary // Create buffer if necessary
if (buffer == null) { if (buffer == null) {
buffer = new Layer(0, 0); buffer = new Layer(0, 0);
buffer.setAutosize(1);
buffers[index] = buffer; buffers[index] = buffer;
} }

41
guacamole-common-js/src/main/resources/layer.js
View File

@@ -38,6 +38,32 @@ function Layer(width, height) {
display.resize = function(newWidth, newHeight) { display.resize = function(newWidth, newHeight) {
if (newWidth != width || newHeight != height) if (newWidth != width || newHeight != height)
resize(newWidth, newHeight); resize(newWidth, newHeight);
};
function fitRect(x, y, w, h) {
// Calculate bounds
var opBoundX = w + x;
var opBoundY = h + y;
// Determine max width
var resizeWidth;
if (opBoundX > width)
resizeWidth = opBoundX;
else
resizeWidth = width;
// Determine max height
var resizeHeight;
if (opBoundY > height)
resizeHeight = opBoundY;
else
resizeHeight = height;
// Resize if necessary
if (resizeWidth != width || resizeHeight != height)
resize(resizeWidth, resizeHeight);
} }
resize(width, height); resize(width, height);
@@ -46,6 +72,11 @@ function Layer(width, height) {
var nextUpdateToDraw = 0; var nextUpdateToDraw = 0;
var currentUpdate = 0; var currentUpdate = 0;
var updates = new Array(); var updates = new Array();
var autosize = 0;
display.setAutosize = function(flag) {
autosize = flag;
};
// Given an update ID, either call the provided update callback, or // Given an update ID, either call the provided update callback, or
// schedule the update for later. // schedule the update for later.
@@ -78,21 +109,22 @@ function Layer(width, height) {
display.isReady = function() { display.isReady = function() {
return currentUpdate == nextUpdateToDraw; return currentUpdate == nextUpdateToDraw;
} };
display.setReadyHandler = function(handler) { display.setReadyHandler = function(handler) {
readyHandler = handler; readyHandler = handler;
} };
display.drawImage = function(x, y, image) { display.drawImage = function(x, y, image) {
var updateId = currentUpdate++; var updateId = currentUpdate++;
setUpdate(updateId, function() { setUpdate(updateId, function() {
if (autosize != 0) fitRect(x, y, image.width, image.height);
displayContext.drawImage(image, x, y); displayContext.drawImage(image, x, y);
}); });
} };
display.draw = function(x, y, url) { display.draw = function(x, y, url) {
@@ -101,6 +133,7 @@ function Layer(width, height) {
var image = new Image(); var image = new Image();
image.onload = function() { image.onload = function() {
setUpdate(updateId, function() { setUpdate(updateId, function() {
if (autosize != 0) fitRect(x, y, image.width, image.height);
displayContext.drawImage(image, x, y); displayContext.drawImage(image, x, y);
}); });
}; };
@@ -112,6 +145,7 @@ function Layer(width, height) {
var updateId = currentUpdate++; var updateId = currentUpdate++;
setUpdate(updateId, function() { setUpdate(updateId, function() {
if (autosize != 0) fitRect(x, y, w, h);
displayContext.drawImage(srcLayer, srcx, srcy, w, h, x, y, w, h); displayContext.drawImage(srcLayer, srcx, srcy, w, h, x, y, w, h);
}); });
@@ -121,6 +155,7 @@ function Layer(width, height) {
var updateId = currentUpdate++; var updateId = currentUpdate++;
setUpdate(updateId, function() { setUpdate(updateId, function() {
if (autosize != 0) fitRect(x, y, w, h);
displayContext.clearRect(x, y, w, h); displayContext.clearRect(x, y, w, h);
}); });