dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-06-24 17:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #74 from sidorares/fix_create_window

Browse source 
Fix CreateWindow and CreateGC attributes encoding
This commit is contained in:
Andrey Sidorov 2014-12-10 09:01:57 +11:00
commit c54f073b14
4 changed files with 82 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
lib/corereqs.js
View file

@ -24,15 +24,15 @@ var valueMask = {
}, },
bitGravity : { bitGravity : {
mask: 0x00000010, mask: 0x00000010,
format: 'C' format: 'Cxxx'
}, },
winGravity : { winGravity : {
mask: 0x00000020, mask: 0x00000020,
format: 'C' format: 'Cxxx'
}, },
backingStore : { backingStore : {
mask: 0x00000040, mask: 0x00000040,
format: 'C' format: 'Cxxx'
}, },
backingPlanes : { backingPlanes : {
mask: 0x00000080, mask: 0x00000080,
@ -44,11 +44,11 @@ var valueMask = {
}, },
overrideRedirect : { overrideRedirect : {
mask: 0x00000200, mask: 0x00000200,
format: 'C' format: 'Cxxx'
}, },
saveUnder : { saveUnder : {
mask: 0x00000400, mask: 0x00000400,
format: 'C' format: 'Cxxx'
}, },
eventMask : { eventMask : {
mask: 0x00000800, mask: 0x00000800,
@ -70,7 +70,7 @@ var valueMask = {
CreateGC: { CreateGC: {
'function' : { // TODO: alias? _function? 'function' : { // TODO: alias? _function?
mask: 0x00000001, mask: 0x00000001,
format: 'C' format: 'Cxxx'
}, },
planeMask : { planeMask : {
mask: 0x00000002, mask: 0x00000002,
@ -86,27 +86,27 @@ var valueMask = {
}, },
lineWidth : { lineWidth : {
mask: 0x00000010, mask: 0x00000010,
format: 'S' format: 'Sxx'
}, },
lineStyle : { lineStyle : {
mask: 0x00000020, mask: 0x00000020,
format: 'C' format: 'Cxxx'
}, },
capStyle : { capStyle : {
mask: 0x00000040, mask: 0x00000040,
format: 'C' format: 'Cxxx'
}, },
joinStyle : { joinStyle : {
mask: 0x00000080, mask: 0x00000080,
format: 'C' format: 'Cxxx'
}, },
fillStyle : { fillStyle : {
mask: 0x00000100, mask: 0x00000100,
format: 'C' format: 'Cxxx'
}, },
fillRule : { fillRule : {
mask: 0x00000200, mask: 0x00000200,
format: 'C' format: 'Cxxx'
}, },
tile : { tile : {
mask: 0x00000400, mask: 0x00000400,
@ -118,11 +118,11 @@ var valueMask = {
}, },
tileStippleXOrigin : { tileStippleXOrigin : {
mask: 0x00001000, mask: 0x00001000,
format: 's' format: 'sxx'
}, },
tileStippleYOrigin : { tileStippleYOrigin : {
mask: 0x00002000, mask: 0x00002000,
format: 's' format: 'sxx'
}, },
font : { font : {
mask: 0x00004000, mask: 0x00004000,
@ -130,19 +130,19 @@ var valueMask = {
}, },
subwindowMode : { subwindowMode : {
mask: 0x00008000, mask: 0x00008000,
format: 'C' format: 'Cxxx'
}, },
graphicsExposures : { graphicsExposures : {
mask: 0x00010000, mask: 0x00010000,
format: 'C' format: 'Cxxx'
}, },
clipXOrigin : { clipXOrigin : {
mask: 0x00020000, mask: 0x00020000,
format: 'S' format: 'Sxx'
}, },
clipYOrigin : { clipYOrigin : {
mask: 0x00040000, mask: 0x00040000,
format: 'S' format: 'Sxx'
}, },
clipMask : { clipMask : {
mask: 0x00080000, mask: 0x00080000,
@ -150,15 +150,15 @@ var valueMask = {
}, },
dashOffset : { dashOffset : {
mask: 0x00100000, mask: 0x00100000,
format: 'S' format: 'Sxx'
}, },
dashes : { dashes : {
mask: 0x00200000, mask: 0x00200000,
format: 'C' format: 'Cxxx'
}, },
arcMode : { arcMode : {
mask: 0x00400000, mask: 0x00400000,
format: 'C' format: 'Cxxx'
} }
}, },
ConfigureWindow: { ConfigureWindow: {
@ -221,7 +221,12 @@ function packValueMask(reqname, values)
masksList.push(valueBit); masksList.push(valueBit);
bitmask |= valueBit; bitmask |= valueBit;
} }
masksList.sort();
/* numeric sort */
masksList.sort(function(a, b) {
return a - b;
});
var args = []; var args = [];
for (m in masksList) for (m in masksList)
{ {

2
test/configure-request.js
View file

@ -9,7 +9,6 @@ describe('ConfigureRequest', function() {
self.X = dpy.client; self.X = dpy.client;
self.root = dpy.screen[0].root; self.root = dpy.screen[0].root;
self.wid = self.X.AllocID(); self.wid = self.X.AllocID();
self.wid_helper = self.X.AllocID();
/* self.X acts like a WM */ /* self.X acts like a WM */
self.X.ChangeWindowAttributes(self.root, { eventMask: x11.eventMask.SubstructureRedirect }); self.X.ChangeWindowAttributes(self.root, { eventMask: x11.eventMask.SubstructureRedirect });
self.X.CreateWindow(self.wid, self.root, 0, 0, 1, 1); // 1x1 pixel window self.X.CreateWindow(self.wid, self.root, 0, 0, 1, 1); // 1x1 pixel window
@ -30,7 +29,6 @@ describe('ConfigureRequest', function() {
var client = x11.createClient(function(err, dpy) { var client = x11.createClient(function(err, dpy) {
should.not.exist(err); should.not.exist(err);
self.X.once('event', function(ev) { self.X.once('event', function(ev) {
console.log(ev);
ev.name.should.equal('ConfigureRequest'); ev.name.should.equal('ConfigureRequest');
ev.x.should.equal(0); ev.x.should.equal(0);
ev.y.should.equal(20); ev.y.should.equal(20);

9
test/core-CreateWindow.js
View file

@ -48,4 +48,13 @@ describe('CreateWindow request', function() {
}); });
}); });
it('should work with any kind of attributes too', function(done) {
var wid = X.AllocID();
X.CreateWindow(wid, display.screen[0].root, 0, 0, 1, 1, 0, 0, 0, 0, { overrideRedirect : true }); // 1x1 pixel window
X.QueryTree(display.screen[0].root, function(err, list) {
should.not.exist(err);
list.children.should.containEql(wid);
done();
});
});
}); });

46
test/createGC.js Normal file
View file

@ -0,0 +1,46 @@
var x11 = require('../lib');
var should = require('should');
describe('CreateGC', function() {
before(function(done) {
var self = this;
this.client = x11.createClient(function(err, dpy) {
should.not.exist(err);
self.X = dpy.client;
self.root = dpy.screen[0].root;
self.white = dpy.screen[0].white_pixel;
self.black = dpy.screen[0].black_pixel;
self.wid = self.X.AllocID();
self.X.CreateWindow(self.wid, self.root, 0, 0, 1, 1); // 1x1 pixel window
self.X.MapWindow(self.wid);
self.X.QueryTree(self.root, function(err, list) {
should.not.exist(err);
list.children.indexOf(self.wid).should.not.equal(-1);
done();
});
});
});
it('should create a Graphic Context correctly', function() {
var self = this;
this.client.on('error', function(err) {
should.not.exist(err);
});
this.gc = this.X.AllocID();
this.X.CreateGC(this.gc,
this.wid,
{
foreground: this.black,
background: this.white,
lineStyle : 0
}
);
});
after(function(done) {
this.X.DestroyWindow(this.wid);
this.X.on('end', done);
this.X.terminate();
});
});