Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2823: debugger loading js source with utf8 is ok.

This commit is contained in:
James Chen 2013-10-07 19:24:21 +08:00
parent b5d02d8cca
commit 7e82ab14a0
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripting/javascript/bindings/ScriptingCore.cpp
View File

@ -2135,11 +2135,9 @@ JSBool JSBDebug_BufferRead(JSContext* cx, unsigned argc, jsval* vp)
return JS_TRUE;
}
static void _clientSocketWriteAndClearString(std::string& s) {
#if JSB_DEBUGGER_OUTPUT_STDOUT
write(STDOUT_FILENO, s.c_str(), s.length());
#endif
write(clientSocket, s.c_str(), s.length());
static void _clientSocketWriteAndClearString(std::string& s)
{
::write(clientSocket, s.c_str(), s.length());
s.clear();
}

28
scripting/javascript/bindings/js/debugger/transport.js
View File

@ -54,6 +54,28 @@ this.DebuggerTransport = function DebuggerTransport(aInput, aOutput)
this.hooks = null;
}
function utf16to8(str) {
var out, i, len, c;
out = "";
len = str.length;
for(i = 0; i < len; i++)
{
c = str.charCodeAt(i); if ((c >= 0x0001) && (c <= 0x007F)) { out += str.charAt(i); } else if (c > 0x07FF)
{
out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
}
else
{
out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
}
}
return out;
}
DebuggerTransport.prototype = {
/**
* Transmit a packet.
@ -67,8 +89,10 @@ DebuggerTransport.prototype = {
// TODO (bug 709088): remove pretty printing when the protocol is done.
let data = JSON.stringify(aPacket, null, 2);
// data = this._converter.ConvertFromUnicode(data);
log("data len: "+data.length);
this._outgoing = data.length + ':' + data;
log("data1 len: "+data.length);
let data_for_len = utf16to8(data);
log("data2 len: "+data_for_len.length);
this._outgoing = data_for_len.length + ':' + data;
log("_outgoing len: "+this._outgoing.length);
this._flushOutgoing();
},

3
scripting/javascript/bindings/js/jsb_debugger.js
View File

@ -4,8 +4,7 @@ require('debugger/transport.js', "debug");
require('debugger/actors/root.js', "debug");
require('debugger/actors/script.js', "debug");
require('debugger/main.js', "debug");
// require('debugger/jsb-tests/testactors.js', "debug");
// require('debugger/jsb-tests/test_dbgglobal.js', "debug");
dbg = {
LONG_STRING_LENGTH: 10000,