final cleanup

This commit is contained in:
Christopher Jeffrey 2013-02-24 18:47:37 -06:00
parent d89f9845ab
commit bf60ca69e7

View File

@ -174,19 +174,22 @@ Tput.prototype.parseTerminfo = function(data) {
i += h.strTableSize; i += h.strTableSize;
l = data.length; l = data.length;
if (i < l) { if (i < l) {
info.extended = this.parseExtended(data.slice(i), data, h, i); var extended = this.parseExtended(data.slice(i));
//['bools', 'numbers', 'strings'].forEach(function(key) { ['bools', 'numbers', 'strings'].forEach(function(key) {
Object.keys(info.extended).forEach(function(key) { merge(info[key], extended[key]);
info[key].extended = info.extended[key];
// merge(info[key], info.extended[key]);
}); });
delete info.extended;
} }
} }
return info; return info;
}; };
/**
* Extended Parsing
*/
// Some data to help understand:
// For xterm, non-extended header: // For xterm, non-extended header:
// { dataSize: 3270, // { dataSize: 3270,
// headerSize: 12, // headerSize: 12,
@ -219,22 +222,20 @@ Tput.prototype.parseTerminfo = function(data) {
// stringData: '248 - 612', // stringData: '248 - 612',
// sym: '612 - 928' } // sym: '612 - 928' }
// //
// Real header size: 10 // header size: 10
// Real bools size: 2 // bools size: 2
// Real numbers size: 4 // numbers size: 4
// Real string-offset size: 114 // string-offset size: 114
// Real sym-offset size: 120 // sym-offset size: 120
// Real table size: 364 // string table size: 364
// Real sym size: 316 // sym size: 316
// 364 + 316 === 680 (lastStrTableOffset) // 364 + 316 === 680 (lastStrTableOffset)
// data.length - h.lastStrTableOffset === 248 (sym-offset size) // data.length - h.lastStrTableOffset === 248 (sym-offset size)
Tput.prototype.parseExtended = function(data, _data, _h, _i) { Tput.prototype.parseExtended = function(data) {
var info = {} var info = {}
, l = data.length , l = data.length
, i = 0 , i = 0;
, v
, o;
var h = info.header = { var h = info.header = {
dataSize: data.length, dataSize: data.length,
@ -326,10 +327,6 @@ Tput.prototype.parseExtended = function(data, _data, _h, _i) {
i += high + 1; i += high + 1;
l = data.length; l = data.length;
console.log(data.slice(i - 1 - 10, i - 1 + 10));
console.log(i);
process.exit(0);
var sym = [] var sym = []
, j = 0; , j = 0;
@ -356,9 +353,6 @@ Tput.prototype.parseExtended = function(data, _data, _h, _i) {
info.strings[sym.shift()] = string; info.strings[sym.shift()] = string;
}); });
console.log(info);
process.exit(0);
return info; return info;
}; };