mirror of
https://github.com/danbulant/node-x11
synced 2026-05-22 13:59:11 +00:00
CreateGlyphSet / AddGlyphs
This commit is contained in:
Andrey Sidorov
parent
b24f718d7d
commit
ff0a950994
1 changed files with 61 additions and 21 deletions
|
|
@ -9,14 +9,6 @@ var x11 = require('..');
|
|||
exports.requireExt = function(display, callback)
|
||||
{
|
||||
|
||||
function captureStack()
|
||||
{
|
||||
var err = new Error;
|
||||
//err.name = reqName;
|
||||
Error.captureStackTrace(err, arguments.callee);
|
||||
display.client.seq2stack[display.client.seq_num] = err.stack;
|
||||
}
|
||||
|
||||
var X = display.client;
|
||||
X.QueryExtension('RENDER', function(err, ext) {
|
||||
|
||||
|
|
@ -28,7 +20,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.QueryVersion = function(clientMaj, clientMin, callback)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
X.pack_stream.pack('CCSLL', [ext.majorOpcode, 0, 3, clientMaj, clientMin]);
|
||||
X.replies[X.seq_num] = [
|
||||
function(buf, opt) {
|
||||
|
|
@ -43,7 +34,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.QueryPictFormat = function(callback)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
X.pack_stream.pack('CCS', [ext.majorOpcode, 1, 1]);
|
||||
X.replies[X.seq_num] = [
|
||||
function (buf, opt) {
|
||||
|
|
@ -74,7 +64,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.QueryFilters = function(callback)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
X.pack_stream.pack('CCSL', [ext.majorOpcode, 29, 2, display.screen[0].root]);
|
||||
X.replies[X.seq_num] = [
|
||||
function(buf, opt) {
|
||||
|
|
@ -132,7 +121,6 @@ exports.requireExt = function(display, callback)
|
|||
{
|
||||
console.log([pid, drawable, pictformat, values]);
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
var mask = 0;
|
||||
var reqLen = 5; // + (values + pad)/4
|
||||
var format = 'CCSLLLL';
|
||||
|
|
@ -177,7 +165,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.SetPictureFilter = function(pid, name, filterParams)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
var reqLen = 2; //header + params + 1xStopfix+2xColors
|
||||
var format = 'CCSLa';
|
||||
var params = [ext.majorOpcode, 30, reqLen, pid];
|
||||
|
|
@ -201,7 +188,6 @@ exports.requireExt = function(display, callback)
|
|||
{
|
||||
// TODO: merge with linear gradient
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
var reqLen = 9+stops.length*3; //header + params + 1xStopfix+2xColors
|
||||
var format = 'CCSLLLLLLLL';
|
||||
var params = [ext.majorOpcode, 35, reqLen, pid];
|
||||
|
|
@ -236,7 +222,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.LinearGradient = function(pid, p1, p2, stops)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
var reqLen = 7+stops.length*3; //header + params + 1xStopfix+2xColors
|
||||
var format = 'CCSLLLLLL';
|
||||
var params = [ext.majorOpcode, 34, reqLen, pid];
|
||||
|
|
@ -270,7 +255,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.ConicalGradient = function(pid, center, angle, stops)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
var reqLen = 6+stops.length*3; //header + params + 1xStopfix+2xColors
|
||||
var format = 'CCSLLLLL';
|
||||
var params = [ext.majorOpcode, 36, reqLen, pid];
|
||||
|
|
@ -302,7 +286,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.FillRectangles = function(op, pid, color, rects)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
var reqLen = 5+rects.length/2;
|
||||
var format = 'CCSCxxxLSSSS';
|
||||
var params = [ext.majorOpcode, 26, reqLen, op, pid];
|
||||
|
|
@ -323,7 +306,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.Composite = function(op, src, mask, dst, srcX, srcY, maskX, maskY, dstX, dstY, width, height)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
X.pack_stream.pack(
|
||||
'CCSCxxxLLLssssssSS',
|
||||
[ext.majorOpcode, 8, 9, op, src, mask, dst, srcX, srcY, maskX, maskY, dstX, dstY, width, height]
|
||||
|
|
@ -334,7 +316,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.Trapezoids = function(op, src, srcX, srcY, dst, maskFormat, trapz)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
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+=10)
|
||||
|
|
@ -350,7 +331,6 @@ exports.requireExt = function(display, callback)
|
|||
ext.Triangles = function(op, src, srcX, srcY, dst, maskFormat, tris)
|
||||
{
|
||||
X.seq_num++;
|
||||
captureStack();
|
||||
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)
|
||||
|
|
@ -368,8 +348,66 @@ exports.requireExt = function(display, callback)
|
|||
X.pack_stream.flush();
|
||||
}
|
||||
|
||||
ext.CreateGlyphSet = function(gsid, format) {
|
||||
X.seq_num++;
|
||||
X.pack_stream.pack('CCSLL', [ext.majorOpcode, 17, 3, gsid, format]);
|
||||
X.pack_stream.flush();
|
||||
}
|
||||
|
||||
ext.ReferenceGlyphSet = function(gsid, existing) {
|
||||
X.seq_num++;
|
||||
X.pack_stream.pack('CCSLL', [ext.majorOpcode, 18, 3, gsid, existing]);
|
||||
X.pack_stream.flush();
|
||||
}
|
||||
|
||||
ext.FreeGlyphSet = function(gsid) {
|
||||
X.seq_num++;
|
||||
X.pack_stream.pack('CCSLL', [ext.majorOpcode, 19, 2, gsid]);
|
||||
X.pack_stream.flush();
|
||||
}
|
||||
|
||||
ext.AddGlyphs = function(gsid, glyphs) {
|
||||
X.seq_num++;
|
||||
var numGlyphs = glyphs.length;
|
||||
var imageBytes = 0;
|
||||
for (var i = 0; i < numGlyphs; i++)
|
||||
imageBytes += glyphs[i].image.length;
|
||||
var paddedLength = xutil.padded_length(imageBytes);
|
||||
var len = numGlyphs * 4 + paddedLength / 4 + 3;
|
||||
// TODO: check length, use bigReq
|
||||
X.pack_stream.pack('CCSL', [ext.majorOpcode, 20, len, gsid]);
|
||||
for (i = 0; i < numGlyphs; i++)
|
||||
X.pack_stream.pack('L', glyph[i].id);
|
||||
for (i = 0; i < numGlyphs; i++)
|
||||
X.pack_stream.pack('SSssss', [glyph[i].width, glyph[i].height, glyph[i].x, glyph[i].y, glyph[i].offX, glyph[i].offY]);
|
||||
for (i = 0; i < numGlyphs; i++)
|
||||
X.pack_stream.write_queue.push(glyph[i].image);
|
||||
var padLength = paddedLength - imageBytes;
|
||||
X.pack_stream.write_queue.push(new Buffer(padLength));
|
||||
X.pack_stream.flush();
|
||||
}
|
||||
|
||||
//AddGlyphsFromPicture, opcode=21 (not in spec)
|
||||
|
||||
// TODO: implement xutil-like code https://github.com/alexer/python-xlib-render/blob/master/xutil.py
|
||||
|
||||
// TODO: name format fields
|
||||
// 0 - id
|
||||
// 1 - type ( direct / ? /)
|
||||
// 2 - depth
|
||||
//
|
||||
// 3 - red shift
|
||||
// 4 - red mask
|
||||
// 5 - green shift
|
||||
// 6 - green mask
|
||||
// 7 - blue shift
|
||||
// 8 - blue mask
|
||||
// 9 - alpha shift
|
||||
// 10 - alpha mask
|
||||
|
||||
// 11 - colormap or none
|
||||
|
||||
ext.QueryPictFormat(function(err, formats) {
|
||||
console.log(formats);
|
||||
for (var i=0; i < formats.formats.length; ++i) {
|
||||
var f = formats.formats[i];
|
||||
if (f[2] == 1 && f[10] == 1)
|
||||
|
|
@ -379,6 +417,8 @@ exports.requireExt = function(display, callback)
|
|||
// 1, 32, 16, 255, 8, 255, 0, 255, 24, 255, 0
|
||||
if (f[2] == 32 && f[3] == 16 && f[4] == 255 && f[5] == 8 && f[6] == 255 && f[7] == 0 && f[9] == 24)
|
||||
ext.rgba32 = f[0] ;
|
||||
if (f[2] == 8 && f[10] == 255)
|
||||
ext.a8 = f[0];
|
||||
}
|
||||
callback(ext);
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue