diff --git a/lib/ext/render.js b/lib/ext/render.js index 30dc6f8..ff3b9e0 100644 --- a/lib/ext/render.js +++ b/lib/ext/render.js @@ -32,7 +32,6 @@ exports.requireExt = function(display, callback) ext.QueryPictFormat = function(callback) { - X.seq_num++; X.pack_stream.pack('CCS', [ext.majorOpcode, 1, 1]); X.replies[X.seq_num] = [ function (buf, opt) { @@ -42,7 +41,7 @@ exports.requireExt = function(display, callback) var num_screens = res1[1]; var num_depths = res1[2]; var num_visuals = res1[3]; - var num_subpixel = res1[4]; + var num_subpixel = res1[4]; // formats list: var offset = 24; res.formats = []; @@ -58,11 +57,11 @@ exports.requireExt = function(display, callback) callback ]; X.pack_stream.flush(); + X.seq_num++; } ext.QueryFilters = function(callback) { - X.seq_num++; X.pack_stream.pack('CCSL', [ext.majorOpcode, 29, 2, display.screen[0].root]); X.replies[X.seq_num] = [ function(buf, opt) { @@ -90,6 +89,7 @@ exports.requireExt = function(display, callback) callback ]; X.pack_stream.flush(); + X.seq_num++; } var valueList = [ @@ -118,7 +118,6 @@ exports.requireExt = function(display, callback) ext.CreatePicture = function(pid, drawable, pictformat, values) { - X.seq_num++; var mask = 0; var reqLen = 5; // + (values + pad)/4 var format = 'CCSLLLL'; @@ -149,23 +148,30 @@ exports.requireExt = function(display, callback) } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; } ext.FreePicture = function(pid) { - X.seq_num++; X.pack_stream.pack('CCSL', [ext.majorOpcode, 7, 2, pid]); X.pack_stream.flush(); + X.seq_num++; }; function floatToFix(f) { - return parseInt(f*65535); + return parseInt(f*65536); + } + + function colorToFix(f) + { + if (f < 0) f = 0; + if (f > 1) f = 1; + return parseInt(f*65535); } ext.SetPictureTransform = function(pid, matrix) { - X.seq_num++; var format = 'CCSL'; - if (typeof matrix.length !== 9) + if (matrix.length !== 9) throw 'Render.SetPictureTransform: incorrect transform matrix. Must be array of 9 numbers'; var params = [ext.majorOpcode, 28, 11, pid]; for (var i=0; i < 9; ++i) { @@ -176,6 +182,7 @@ exports.requireExt = function(display, callback) } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; }; // see example of blur filter here: https://github.com/richoH/rxvt-unicode/blob/master/src/background.C @@ -188,10 +195,9 @@ exports.requireExt = function(display, callback) if (!Array.isArray(filterParams)) filterParams = [filterParams]; - X.seq_num++; var reqLen = 2; var format = 'CCSLSxxp'; - var params = [ext.majorOpcode, 30, reqLen, pid, name.length, name + '\0']; + var params = [ext.majorOpcode, 30, reqLen, pid, name.length, name]; reqLen += xutil.padded_length(name.length+3)/4 + filterParams.length; if (name == 'nearest' || name == 'bilinear' || name == 'fast' || name == 'good' || name == 'best') { @@ -199,7 +205,7 @@ exports.requireExt = function(display, callback) throw 'Render.SetPictureFilter: "' + name + '" - unexpected parameters for filters'; } } else if (name == 'convolution') { - if (filterParams.length < 2 || filterParams[0]*filterParams[1] !== filterParams.length + 2) { + if (filterParams.length < 2 || ((filterParams[0]*filterParams[1] + 2) !== filterParams.length) ) { throw 'Render.SetPictureFilter: "convolution" - incorrect matrix dimensions. Must be flat array [ w, h, elem1, elem2, ... ]'; } for (var i=0; i < filterParams.length; ++i) { @@ -218,19 +224,18 @@ exports.requireExt = function(display, callback) params[2] = reqLen; X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; }; ext.CreateSolidFill = function(pid, r, g, b, a) { - 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, colorToFix(r), colorToFix(g), colorToFix(b), colorToFix(a)]); X.pack_stream.flush(); + X.seq_num++; }; ext.RadialGradient = function(pid, p1, p2, r1, r2, stops) { - // TODO: merge with linear gradient - X.seq_num++; var reqLen = 9+stops.length*3; //header + params + 1xStopfix+2xColors var format = 'CCSLLLLLLLL'; var params = [ext.majorOpcode, 35, reqLen, pid]; @@ -255,15 +260,15 @@ exports.requireExt = function(display, callback) { format += 'SSSS'; for (var j=0; j < 4; ++j) - params.push(stops[i][1][j]); + params.push(colorToFix(stops[i][1][j])); } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; }; ext.LinearGradient = function(pid, p1, p2, stops) { - X.seq_num++; var reqLen = 7+stops.length*3; //header + params + 1xStopfix+2xColors var format = 'CCSLLLLLL'; var params = [ext.majorOpcode, 34, reqLen, pid]; @@ -287,15 +292,15 @@ exports.requireExt = function(display, callback) { format += 'SSSS'; for (var j=0; j < 4; ++j) - params.push(stops[i][1][j]); + params.push(colorToFix(stops[i][1][j])); } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; } ext.ConicalGradient = function(pid, center, angle, stops) { - X.seq_num++; var reqLen = 6+stops.length*3; //header + params + 1xStopfix+2xColors var format = 'CCSLLLLL'; var params = [ext.majorOpcode, 36, reqLen, pid]; @@ -318,20 +323,20 @@ exports.requireExt = function(display, callback) { format += 'SSSS'; for (var j=0; j < 4; ++j) - params.push(stops[i][1][j]); + params.push(colorToFix(stops[i][1][j])); } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; } ext.FillRectangles = function(op, pid, color, rects) { - X.seq_num++; var reqLen = 5+rects.length/2; var format = 'CCSCxxxLSSSS'; var params = [ext.majorOpcode, 26, reqLen, op, pid]; for (var j=0; j < 4; ++j) - params.push(floatToFix(color[j])); + params.push(colorToFix(color[j])); for (var i=0; i < rects.length; i+=4) { format += 'ssSS'; @@ -342,22 +347,22 @@ exports.requireExt = function(display, callback) } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; } ext.Composite = function(op, src, mask, dst, srcX, srcY, maskX, maskY, dstX, dstY, width, height) { - X.seq_num++; X.pack_stream.pack( 'CCSCxxxLLLssssssSS', [ext.majorOpcode, 8, 9, op, src, mask, dst, srcX, srcY, maskX, maskY, dstX, dstY, width, height] ) .flush(); + X.seq_num++; } // note that Trapezoids is considered deprecated by Render extension ext.Trapezoids = function(op, src, srcX, srcY, dst, maskFormat, trapz) { - X.seq_num++; var format = 'CCSCxxxLLLss'; var params = [ext.majorOpcode, 10, 6+trapz.length, op, src, dst, maskFormat, srcX, srcY]; for (var i=0; i < trapz.length; i++) @@ -368,10 +373,10 @@ exports.requireExt = function(display, callback) } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; }; ext.AddTraps = function(pic, offX, offY, trapList) { - X.seq_num++; var format = 'CCSLss'; var params = [ext.majorOpcode, 32, 3+trapList.length, pic, offX, offY]; for (var i=0; i < trapList.length; i++) @@ -381,11 +386,11 @@ exports.requireExt = function(display, callback) } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; }; ext.Triangles = function(op, src, srcX, srcY, dst, maskFormat, tris) { - X.seq_num++; var format = 'CCSCxxxLLLss'; var params = [ext.majorOpcode, 11, 6+tris.length, op, src, dst, maskFormat, srcX, srcY]; for (var i=0; i < tris.length; i+=6) @@ -401,28 +406,28 @@ exports.requireExt = function(display, callback) } X.pack_stream.pack(format, params); X.pack_stream.flush(); + X.seq_num++; } ext.CreateGlyphSet = function(gsid, format) { - X.seq_num++; X.pack_stream.pack('CCSLL', [ext.majorOpcode, 17, 3, gsid, format]); X.pack_stream.flush(); + X.seq_num++; } ext.ReferenceGlyphSet = function(gsid, existing) { - X.seq_num++; X.pack_stream.pack('CCSLL', [ext.majorOpcode, 18, 3, gsid, existing]); X.pack_stream.flush(); + X.seq_num++; } ext.FreeGlyphSet = function(gsid) { - X.seq_num++; X.pack_stream.pack('CCSL', [ext.majorOpcode, 19, 2, gsid]); X.pack_stream.flush(); + X.seq_num++; } ext.AddGlyphs = function(gsid, glyphs) { - X.seq_num++; var numGlyphs = glyphs.length; var imageBytes = 0; var glyphPaddedLength; @@ -466,6 +471,7 @@ exports.requireExt = function(display, callback) X.pack_stream.write_queue.push(glyphs[i].image); } X.pack_stream.flush(); + X.seq_num++; } //AddGlyphsFromPicture, opcode=21 (not in spec) @@ -513,7 +519,6 @@ exports.requireExt = function(display, callback) var opcode = compositeGlyphsOpcodeFromBits[glyphBits]; var charFormat = formatFromBits[glyphBits]; var charLength = glyphBits / 8; - X.seq_num++; var length = 7; var glyphs_length_split = []; for (var i=0; i < glyphs.length; ++i) { @@ -549,6 +554,7 @@ exports.requireExt = function(display, callback) } } X.pack_stream.flush(); + X.seq_num++; }; ext.CompositeGlyphs8 = function(op, src, dst, maskFormat, gsid, srcX, srcY, glyphs)