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

Keep Public and Private Method Name the Same&Fix a Code Error 

According to DirectXMan12's comment.

Signed-off-by: Hongliang Wang <hlwang@linux.vnet.ibm.com>
This commit is contained in:
Hongliang Wang 2014-05-27 10:57:44 +08:00
parent 7a17435cd8
commit d32deb3154
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rfb.js
View File

@ -919,7 +919,7 @@ init_msg = function() {
/* Connection name/title */ /* Connection name/title */
name_length = ws.rQshift32(); name_length = ws.rQshift32();
fb_name = Util.decodeUTF8(ws.rQshiftUStr(name_length)); fb_name = Util.decodeUTF8(ws.rQshiftUTFStr(name_length));
conf.onDesktopName(that, fb_name); conf.onDesktopName(that, fb_name);
if (conf.true_color && fb_name === "Intel(r) AMT KVM") if (conf.true_color && fb_name === "Intel(r) AMT KVM")

48
include/websock.js
View File

@ -153,7 +153,7 @@ function rQshiftUTFStr(len) {
var fou = rQ[++i]; var fou = rQ[++i];
var z = ((code & 0x7) << 2) | ((sec & 0x30) >> 4); var z = ((code & 0x7) << 2) | ((sec & 0x30) >> 4);
var y = ((sec & 0xf) << 4) | ((thi & 0x3c) >> 2); var y = ((sec & 0xf) << 4) | ((thi & 0x3c) >> 2);
var x = ((thi & 0x3) << 6) | (fou & 0x 3f); var x = ((thi & 0x3) << 6) | (fou & 0x3f);
code = (z << 16) | (y << 8) | x; code = (z << 16) | (y << 8) | x;
arr.push(code); arr.push(code);
} }
@ -427,33 +427,33 @@ function constructor() {
api.maxBufferedAmount = 200; api.maxBufferedAmount = 200;
// Direct access to send and receive queues // Direct access to send and receive queues
api.get_sQ = get_sQ; api.get_sQ = get_sQ;
api.get_rQ = get_rQ; api.get_rQ = get_rQ;
api.get_rQi = get_rQi; api.get_rQi = get_rQi;
api.set_rQi = set_rQi; api.set_rQi = set_rQi;
// Routines to read from the receive queue // Routines to read from the receive queue
api.rQlen = rQlen; api.rQlen = rQlen;
api.rQpeek8 = rQpeek8; api.rQpeek8 = rQpeek8;
api.rQshift8 = rQshift8; api.rQshift8 = rQshift8;
api.rQunshift8 = rQunshift8; api.rQunshift8 = rQunshift8;
api.rQshift16 = rQshift16; api.rQshift16 = rQshift16;
api.rQshift32 = rQshift32; api.rQshift32 = rQshift32;
api.rQshiftStr = rQshiftStr; api.rQshiftStr = rQshiftStr;
api.rQshiftUStr = rQshiftUTFStr; api.rQshiftUTFStr = rQshiftUTFStr;
api.rQshiftBytes = rQshiftBytes; api.rQshiftBytes = rQshiftBytes;
api.rQslice = rQslice; api.rQslice = rQslice;
api.rQwait = rQwait; api.rQwait = rQwait;
api.flush = flush; api.flush = flush;
api.send = send; api.send = send;
api.send_string = send_string; api.send_string = send_string;
api.on = on; api.on = on;
api.init = init; api.init = init;
api.open = open; api.open = open;
api.close = close; api.close = close;
api.testMode = testMode; api.testMode = testMode;
return api; return api;
} }