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

Extensions, tests and exemples are now cps-style

Browse source
This commit is contained in:
champii 2014-09-23 16:09:18 +02:00
parent 4feba92047
commit 6d6c8d3b9f
38 changed files with 180 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/kbdheatmap/kbdheatmap.js
View file

@ -26,9 +26,9 @@ var kk2name = {};
x11.createClient(function(err, display)
{
var X = display.client;
X.require('big-requests', function(BigReq)
X.require('big-requests', function(err, BigReq)
{
X.require('render', function(Render) {
X.require('render', function(err, Render) {
X.Render = Render;
BigReq.Enable(function(err, maxLen)
{

2
examples/opengl/glxgears.js
View file

@ -294,7 +294,7 @@ x11.createClient(function(error, display) {
var root = display.screen[0].root;
var width = 500;
var height = 500;
X.require('glx', function(GLX) {
X.require('glx', function(err, GLX) {
var depth = 24;
findBestVisual(display, function(err, visual) {

2
examples/opengl/test1.js
View file

@ -13,7 +13,7 @@ var listId = 1;
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('glx', function(GLX) {
X.require('glx', function(err, GLX) {
var visual = 0;
var visuals = display.screen[0].depths[24];
for (visual in visuals) {

2
examples/opengl/tp2.js
View file

@ -304,7 +304,7 @@ x11.createClient(function(err, display) {
var root = display.screen[0].root;
var width = 1000;
var height = 1000;
X.require('glx', function(GLX) {
X.require('glx', function(err, GLX) {
var visual = 0xa1;
var win = X.AllocID();
X.CreateWindow(win, root, 0, 0, width, height, 0, 0, 0, 0, { eventMask: eventmask });

2
examples/opengl/triangle.js
View file

@ -8,7 +8,7 @@ for(var i=0; i < 20000; ++i) {
var xclient = x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('glx', function(GLX) {
X.require('glx', function(err, GLX) {
var screen = 0;
var isDirect = 0;
var ctx = X.AllocID();

2
examples/paint.js
View file

@ -10,7 +10,7 @@ var gradNo = 0;
var xclient = x11.createClient(function(err, display) {
X = display.client;
var root = display.screen[0].root;
X.require('render', function(rendExt) {
X.require('render', function(err, rendExt) {
Render = rendExt;
var wid = X.AllocID();

2
examples/png/test.js
View file

@ -7,7 +7,7 @@ var Exposure = x11.eventMask.Exposure;
x11.createClient(function(err, display)
{
var X = display.client;
X.require('render', function(Render) {
X.require('render', function(err, Render) {
var root = display.screen[0].root;
main(root, X, Render);
});

2
examples/simple/gradients.js
View file

@ -9,7 +9,7 @@ var x11 = require('../../lib');
x11.createClient(
function(err, display) {
var X = display.client;
X.require('render', function(Render) {
X.require('render', function(err, Render) {
var root = display.screen[0].root;
var win = X.AllocID();

2
examples/simple/render.js
View file

@ -4,7 +4,7 @@ var PointerMotion = x11.eventMask.PointerMotion;
var xclient = x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
display.client.require('render', function(Render) {
display.client.require('render', function(err, Render) {
var wid = X.AllocID();
var white = display.screen[0].white_pixel;
varblack = display.screen[0].black_pixel;

2
examples/simple/text/render-glyph.js
View file

@ -39,7 +39,7 @@ function padWidth(buf, width) {
var xclient = x11.createClient({ debug: true }, function(err, display) {
var X = display.client;
var root = display.screen[0].root;
display.client.require('render', function(Render) {
display.client.require('render', function(err, Render) {
var wid = X.AllocID();
var white = display.screen[0].white_pixel;
varblack = display.screen[0].black_pixel;

2
examples/smoketest/applewm.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('apple-wm', function(AppleWM) {
X.require('apple-wm', function(err, AppleWM) {
//AppleWM.SetFrontProcess();
//AppleWM.CanQuit(true);
AppleWM.SelectInput(AppleWM.NotifyMask.All)

4
examples/smoketest/compositetest.js
View file

@ -3,8 +3,8 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('composite', function(Composite) {
X.require('damage', function(Damage) {
X.require('composite', function(err, Composite) {
X.require('damage', function(err, Damage) {
var wid = parseInt(process.argv[2]);
//Composite.GetOverlayWindow(wid, function(err, overlayid) {
// console.log("OVERLAY:", err, overlayid);

2
examples/smoketest/damagetest.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('damage', function(Damage) {
X.require('damage', function(err, Damage) {
console.log(Damage);
var id = parseInt(process.argv[2]);
var damage = X.AllocID();

2
examples/smoketest/fixestest.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('fixes', function(Fixes) {
X.require('fixes', function(err, Fixes) {
console.log(Fixes);
var win = X.AllocID();
X.CreateWindow(win, root, 0, 0, 100, 100);

2
examples/smoketest/putimage1.js
View file

@ -23,7 +23,7 @@ x11.createClient(function(err, display) {
if (err) throw err;
var X = display.client;
X.require('render', function(Render) {
X.require('render', function(err, Render) {
var root = display.screen[0].root;
var white = display.screen[0].white_pixel;

2
examples/smoketest/randr.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('randr', function(Randr) {
X.require('randr', function(err, Randr) {
//console.log(Randr);
//Randr.QueryVersion(1, 4, console.log);
Randr.SelectInput(root, Randr.NotifyMask.ScreenChange);

2
examples/smoketest/shapetest.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('shape', function(Shape) {
X.require('shape', function(err, Shape) {
var win = X.AllocID();
X.CreateWindow(win, root, 0, 0, 200, 200);
var gc = X.AllocID();

2
examples/smoketest/sstest.js
View file

@ -7,7 +7,7 @@ x11.createClient(function(err, display) {
X.SetScreenSaver(20, 10, 2, 2);
X.require('screen-saver', function(SS) {
X.require('screen-saver', function(err, SS) {
SS.SelectInput(root, SS.eventMask.Notify|SS.eventMask.Cycle);
//console.log(SS);
//setTimeout(function() {

2
examples/smoketest/transpwindow.js
View file

@ -31,7 +31,7 @@ x11.createClient(function(err, display) {
X.MapWindow(wid);
var gc = X.AllocID();
X.require('render', function(Render) {
X.require('render', function(err, Render) {
var pict = X.AllocID();
Render.CreatePicture(pict, wid, Render.rgba32);

2
examples/smoketest/xcmisc.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
X.require('xc-misc', function(Misc) {
X.require('xc-misc', function(err, Misc) {
var xid = X.AllocID();
console.log("first ID from connection: " + xid);
debugger;

2
examples/smoketest/xtesttest.js
View file

@ -3,7 +3,7 @@ var x11 = require('../../lib');
var xclient = x11.createClient(function(err, display) {
var X = display.client;
var root = display.screen[0].root;
display.client.require('xtest', function(Test) {
display.client.require('xtest', function(err, Test) {
console.log(Test);
setInterval(function() {
Test.FakeInput(Test.KeyPress, 65, 0, root, 0, 0); // space

2
examples/vncviewer/vncgui.js
View file

@ -31,7 +31,7 @@ var KeyRelease = x11.eventMask.KeyRelease;
x11.createClient(function(err, display) {
var X = display.client;
X.require('big-requests', function(BigReq) {
X.require('big-requests', function(err, BigReq) {
BigReq.Enable(function(err, maxLen) {
var keycode2keysym = [];
var min = display.min_keycode;

2
examples/windowmanager/wm.js
View file

@ -80,7 +80,7 @@ function ManageWindow(wid)
x11.createClient(function(err, display) {
X = display.client;
X.require('render', function(Render) {
X.require('render', function(err, Render) {
X.Render = Render;
root = display.screen[0].root;

4
lib/ext/apple-wm.js
View file

@ -209,13 +209,13 @@ exports.requireExt = function(display, callback)
X.pack_stream.flush();
}
callback(ext);
callback(null, ext);
/*
ext.QueryVersion(function(err, vers) {
ext.major = vers[0];
ext.minor = vers[1];
ext.patch = vers[2];
callback(ext);
callback(null, ext);
});
*/

2
lib/ext/big-requests.js
View file

@ -21,6 +21,6 @@ exports.requireExt = function(display, callback)
];
X.pack_stream.flush();
}
callback(ext);
callback(null, ext);
});
}

2
lib/ext/damage.js
View file

@ -61,6 +61,8 @@ exports.requireExt = function(display, callback)
}
ext.QueryVersion(1, 1, function(err, vers) {
if (err)
return callback(err);
ext.major = vers[0];
ext.minor = vers[1];
callback(null, ext);

2
lib/ext/dpms.js
View file

@ -94,7 +94,7 @@ exports.requireExt = function(display, callback)
X.pack_stream.flush();
};
callback(ext);
callback(null, ext);
});
};

4
lib/ext/fixes.js
View file

@ -120,9 +120,11 @@ exports.requireExt = function(display, callback)
}
ext.QueryVersion(5, 0, function(err, vers) {
if (err)
return callback(err);
ext.major = vers[0];
ext.minor = vers[1];
callback(ext);
callback(null, ext);
});
ext.events = {

2
lib/ext/glx.js
View file

@ -319,7 +319,7 @@ exports.requireExt = function(display, callback)
};
});
callback(ext);
callback(null, ext);
});
}

2
lib/ext/randr.js
View file

@ -263,6 +263,6 @@ exports.requireExt = function(display, callback)
return event;
};
callback(ext);
callback(null, ext);
});
}

4
lib/ext/render.js
View file

@ -530,6 +530,8 @@ exports.requireExt = function(display, callback)
// 11 - colormap or none
ext.QueryPictFormat(function(err, formats) {
if (err)
return callback(err);
for (var i=0; i < formats.formats.length; ++i) {
var f = formats.formats[i];
if (f[2] == 1 && f[10] == 1)
@ -542,7 +544,7 @@ exports.requireExt = function(display, callback)
if (f[2] == 8 && f[10] == 255)
ext.a8 = f[0];
}
callback(ext);
callback(null, ext);
});
[

5
lib/ext/screen-saver.js
View file

@ -73,10 +73,11 @@ exports.requireExt = function(display, callback)
}
ext.QueryVersion(1, 1, function(err, vers) {
if (err)
return callback(err);
ext.major = vers[0];
ext.minor = vers[1];
callback(ext);
callback(null, ext);
});
ext.events = {

4
lib/ext/shape.js
View file

@ -78,13 +78,13 @@ exports.requireExt = function(display, callback)
X.pack_stream.flush();
}
callback(ext);
callback(null, ext);
/*
ext.QueryVersion(function(err, version) {
ext.major = version[0];
ext.minor = version[1];
callback(ext);
callback(null, ext);
});
*/
});

4
lib/ext/xc-misc.js
View file

@ -60,9 +60,11 @@ exports.requireExt = function(display, callback)
}
ext.QueryVersion(1, 1, function(err, vers) {
if (err)
return callback(err);
ext.major = vers[0];
ext.minor = vers[1];
callback(ext);
callback(null, ext);
});
});
}

4
lib/xcore.js
View file

@ -592,7 +592,9 @@ module.exports.createClient = function(options, initCb)
client.on('connect', function(display) {
// opt-in BigReq
if (!options.disableBigRequests) {
client.require('big-requests', function(BigReq) {
client.require('big-requests', function(err, BigReq) {
if (err)
return initCb(err)
BigReq.Enable(function(err, maxLen) {
display.max_request_length = maxLen;
cbCalled = true;

4
test/dpms.js
View file

@ -12,8 +12,8 @@ describe('DPMS extension', function() {
if (!err) {
display = dpy;
X = display.client;
X.require('dpms', function(ext) {
if (util.isError(ext)) {
X.require('dpms', function(err, ext) {
if (err) {
done(ext);
} else {
dpms = ext;

4
test/randr.js
View file

@ -11,8 +11,8 @@ describe('RANDR extension', function() {
self.X = dpy.client;
self.screen = dpy.screen[0];
self.root = self.screen.root;
self.X.require('randr', function(ext) {
util.isError(ext).should.equal(false);
self.X.require('randr', function(err, ext) {
err.should.equal(null);
self.randr = ext;
/* We HAVE to QueryVersion before using it. Otherwise it does not work as expected */
self.randr.QueryVersion(1, 2, done);

4
test/xtest.js
View file

@ -12,8 +12,8 @@ describe('XTEST extension', function() {
if (!err) {
display = dpy;
X = display.client;
X.require('xtest', function(ext) {
if (util.isError(ext)) {
X.require('xtest', function(err, ext) {
if (err) {
done(ext);
} else {
xtest = ext;