This commit is contained in:
Andrey Sidorov 2014-03-31 14:06:11 +11:00
parent 33005e8f76
commit 01c607cd3e

View file

@ -118,7 +118,6 @@ exports.requireExt = function(display, callback)
ext.CreatePicture = function(pid, drawable, pictformat, values) ext.CreatePicture = function(pid, drawable, pictformat, values)
{ {
console.log([pid, drawable, pictformat, values]);
X.seq_num++; X.seq_num++;
var mask = 0; var mask = 0;
var reqLen = 5; // + (values + pad)/4 var reqLen = 5; // + (values + pad)/4
@ -132,7 +131,6 @@ exports.requireExt = function(display, callback)
{ {
var name = valueList[i][0]; var name = valueList[i][0];
var val = values[name]; var val = values[name];
console.log([name, val]);
if (val) { if (val) {
mask |= (1 << i); mask |= (1 << i);
params.push(val); params.push(val);
@ -149,7 +147,6 @@ exports.requireExt = function(display, callback)
params[2] = reqLen; params[2] = reqLen;
params[6] = mask; params[6] = mask;
} }
console.log(['CreatePicture', format, params]);
X.pack_stream.pack(format, params); X.pack_stream.pack(format, params);
X.pack_stream.flush(); X.pack_stream.flush();
} }
@ -178,17 +175,16 @@ exports.requireExt = function(display, callback)
} }
*/ */
params[2] = reqLen; params[2] = reqLen;
//console.log([format, params]);
X.pack_stream.pack(format, params); X.pack_stream.pack(format, params);
X.pack_stream.flush(); X.pack_stream.flush();
} };
ext.CreateSolidFill = function(pid, r, g, b, a) ext.CreateSolidFill = function(pid, r, g, b, a)
{ {
X.seq_num++; X.seq_num++;
X.pack_stream.pack('CCSLSSSS', [ext.majorOpcode, 33, 4, pid, floatToFix(r), floatToFix(g), floatToFix(b), floatToFix(a)]); X.pack_stream.pack('CCSLSSSS', [ext.majorOpcode, 33, 4, pid, floatToFix(r), floatToFix(g), floatToFix(b), floatToFix(a)]);
X.pack_stream.flush(); X.pack_stream.flush();
} };
ext.RadialGradient = function(pid, p1, p2, r1, r2, stops) ext.RadialGradient = function(pid, p1, p2, r1, r2, stops)
{ {
@ -220,10 +216,9 @@ exports.requireExt = function(display, callback)
for (var j=0; j < 4; ++j) for (var j=0; j < 4; ++j)
params.push(stops[i][1][j]); params.push(stops[i][1][j]);
} }
//console.log([format, params]);
X.pack_stream.pack(format, params); X.pack_stream.pack(format, params);
X.pack_stream.flush(); X.pack_stream.flush();
} };
ext.LinearGradient = function(pid, p1, p2, stops) ext.LinearGradient = function(pid, p1, p2, stops)
{ {
@ -253,7 +248,6 @@ exports.requireExt = function(display, callback)
for (var j=0; j < 4; ++j) for (var j=0; j < 4; ++j)
params.push(stops[i][1][j]); params.push(stops[i][1][j]);
} }
//console.log([format, params]);
X.pack_stream.pack(format, params); X.pack_stream.pack(format, params);
X.pack_stream.flush(); X.pack_stream.flush();
} }
@ -506,7 +500,6 @@ exports.requireExt = function(display, callback)
// 11 - colormap or none // 11 - colormap or none
ext.QueryPictFormat(function(err, formats) { ext.QueryPictFormat(function(err, formats) {
console.log(formats);
for (var i=0; i < formats.formats.length; ++i) { for (var i=0; i < formats.formats.length; ++i) {
var f = formats.formats[i]; var f = formats.formats[i];
if (f[2] == 1 && f[10] == 1) if (f[2] == 1 && f[10] == 1)