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

Don't shift off subencoding in hextile.

This commit is contained in:
Joel Martin 2010-05-20 17:13:59 -05:00
parent 8fe2c2f915
commit 7f4f41b0c7
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/canvas.js
View File

@ -183,7 +183,7 @@ setTile: function(img, x, y, w, h, color) {
putTile: function(img) { putTile: function(img) {
if (Canvas.prefer_js) { if (Canvas.prefer_js) {
Canvas.rgbxImage(img.x, img.y, img.width, img.height, img.data); Canvas.rgbxImage(img.x, img.y, img.width, img.height, img.data, 0);
//Canvas.ctx.putImageData(img, img.x, img.y); //Canvas.ctx.putImageData(img, img.x, img.y);
} else { } else {
// No-op, under gecko already done by setTile // No-op, under gecko already done by setTile
@ -191,18 +191,18 @@ putTile: function(img) {
}, },
rgbxImage: function(x, y, width, height, arr) { rgbxImage: function(x, y, width, height, arr, offset) {
var img, i, data; var img, i, j, data;
//console.log("rfbxImage: img: " + img + " x: " + x + " y: " + y + " width: " + width + " height: " + height);
/* Old firefox and Opera don't support createImageData */ /* Old firefox and Opera don't support createImageData */
img = Canvas.ctx.getImageData(0, 0, width, height); img = Canvas.ctx.getImageData(0, 0, width, height);
//console.log("rfbxImage: img: " + img + " x: " + x + " y: " + y + " width: " + width + " height: " + height);
//img.data = arr.slice();
data = img.data; data = img.data;
for (i=0; i < (width * height); i++) { for (i=0; i < (width * height * 4); i=i+4) {
data[i*4 + 0] = arr[i*4 + 0]; j=i+offset;
data[i*4 + 1] = arr[i*4 + 1]; data[i + 0] = arr[j + 0];
data[i*4 + 2] = arr[i*4 + 2]; data[i + 1] = arr[j + 1];
data[i*4 + 3] = 255; // Set Alpha data[i + 2] = arr[j + 2];
data[i + 3] = 255; // Set Alpha
} }
Canvas.ctx.putImageData(img, x, y); Canvas.ctx.putImageData(img, x, y);

13
vnc.js
View File

@ -459,7 +459,7 @@ display_raw: function () {
cur_y = FBU.y + (FBU.height - FBU.lines); cur_y = FBU.y + (FBU.height - FBU.lines);
cur_height = Math.min(FBU.lines, cur_height = Math.min(FBU.lines,
Math.floor(RQ.length/(FBU.width * RFB.fb_Bpp))); Math.floor(RQ.length/(FBU.width * RFB.fb_Bpp)));
Canvas.rgbxImage(FBU.x, cur_y, FBU.width, cur_height, RQ); Canvas.rgbxImage(FBU.x, cur_y, FBU.width, cur_height, RQ, 0);
RQ.shiftBytes(FBU.width * cur_height * RFB.fb_Bpp); RQ.shiftBytes(FBU.width * cur_height * RFB.fb_Bpp);
FBU.lines -= cur_height; FBU.lines -= cur_height;
@ -601,19 +601,18 @@ display_hextile: function() {
} }
/* We know the encoding and have a whole tile */ /* We know the encoding and have a whole tile */
FBU.subencoding = RQ.shift8(); FBU.subencoding = RQ[0];
FBU.bytes--; idx = 1;
if (FBU.subencoding === 0) { if (FBU.subencoding === 0) {
if (FBU.lastsubencoding & 0x01) { if (FBU.lastsubencoding & 0x01) {
/* Weird: ignore blanks after RAW */ /* Weird: ignore blanks after RAW */
console.log(" Ignoring blank after RAW"); console.log(" Ignoring blank after RAW");
continue; } else {
Canvas.fillRect(x, y, w, h, FBU.background);
} }
Canvas.fillRect(x, y, w, h, FBU.background);
} else if (FBU.subencoding & 0x01) { // Raw } else if (FBU.subencoding & 0x01) { // Raw
Canvas.rgbxImage(x, y, w, h, RQ); Canvas.rgbxImage(x, y, w, h, RQ, idx);
} else { } else {
idx = 0;
if (FBU.subencoding & 0x02) { // Background if (FBU.subencoding & 0x02) { // Background
FBU.background = RQ.slice(idx, idx + RFB.fb_Bpp); FBU.background = RQ.slice(idx, idx + RFB.fb_Bpp);
idx += RFB.fb_Bpp; idx += RFB.fb_Bpp;