createClient callback signature now (err,display)

This commit is contained in:
Andrey Sidorov 2013-02-19 17:47:22 +11:00
parent 3f064b218e
commit 5d021eab94
58 changed files with 58 additions and 58 deletions

View file

@ -23,7 +23,7 @@ for (var k in keysyms)
var kk2name = {}; var kk2name = {};
x11.createClient(function(display) x11.createClient(function(err, display)
{ {
var X = display.client; var X = display.client;
X.require('big-requests', function(BigReq) X.require('big-requests', function(BigReq)

View file

@ -10,7 +10,7 @@ var height = 500;
var eventmask = x11.eventMask.PointerMotion; var eventmask = x11.eventMask.PointerMotion;
var listId = 1; var listId = 1;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('glx', function(GLX) { X.require('glx', function(GLX) {

View file

@ -299,7 +299,7 @@ function init(gl, done)
var x11 = require('../../lib'); var x11 = require('../../lib');
var eventmask = x11.eventMask.PointerMotion|x11.eventMask.ButtonPress|x11.eventMask.ButtonRelease|x11.eventMask.StructureNotify|x11.eventMask.Exposure; var eventmask = x11.eventMask.PointerMotion|x11.eventMask.ButtonPress|x11.eventMask.ButtonRelease|x11.eventMask.StructureNotify|x11.eventMask.Exposure;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var width = 1000; var width = 1000;

View file

@ -5,7 +5,7 @@ for(var i=0; i < 20000; ++i) {
randomarr.push([Math.random()*30-15, Math.random()*30-15, Math.random()*30-15]); randomarr.push([Math.random()*30-15, Math.random()*30-15, Math.random()*30-15]);
} }
var xclient = x11.createClient(function(display) { var xclient = x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('glx', function(GLX) { X.require('glx', function(GLX) {

View file

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

View file

@ -12,7 +12,7 @@ var interv = 0;
var total_frames = 0; var total_frames = 0;
var last_frames = 0; var last_frames = 0;
x11.createClient(function(display) x11.createClient(function(err, display)
{ {
console.log('111111'); console.log('111111');

View file

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

View file

@ -2,7 +2,7 @@ var x11 = require('../../lib');
var Exposure = x11.eventMask.Exposure; var Exposure = x11.eventMask.Exposure;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var repaint; var repaint;
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;

View file

@ -1,7 +1,7 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
console.log(display.screen[0]) console.log(display.screen[0])
var X = display.client; var X = display.client;
var wid = X.AllocID(); var wid = X.AllocID();

View file

@ -1,7 +1,7 @@
var spawn = require('child_process').spawn; var spawn = require('child_process').spawn;
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var wid = X.AllocID(); var wid = X.AllocID();
X.CreateWindow(wid, display.screen[0].root, 100, 100, 900, 700, 0, 0, 0, 0, {backgroundPixel: display.screen[0].black_pixel}); X.CreateWindow(wid, display.screen[0].root, 100, 100, 900, 700, 0, 0, 0, 0, {backgroundPixel: display.screen[0].black_pixel});

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var wid = X.AllocID(); var wid = X.AllocID();
X.CreateWindow(wid, display.screen[0].root, 100, 100, 400, 300); X.CreateWindow(wid, display.screen[0].root, 100, 100, 400, 300);

View file

@ -3,7 +3,7 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var PropertyChange = x11.eventMask.PropertyChange; var PropertyChange = x11.eventMask.PropertyChange;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var wid = X.AllocID(); var wid = X.AllocID();

View file

@ -7,7 +7,7 @@ var x11 = require('../../lib');
// and http://www.x.org/releases/X11R7.6/doc/renderproto/renderproto.txt // and http://www.x.org/releases/X11R7.6/doc/renderproto/renderproto.txt
// TODO: move to templates // TODO: move to templates
x11.createClient( x11.createClient(
function(display) { function(err, display) {
var X = display.client; var X = display.client;
X.require('render', function(Render) { X.require('render', function(Render) {

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
console.log('succesfully connected to \"' + display.vendor + '\" server'); console.log('succesfully connected to \"' + display.vendor + '\" server');
display.client.terminate(); display.client.terminate();
}); });

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var maxstd = 0; var maxstd = 0;
var atomName; var atomName;
for (atomName in display.atoms) for (atomName in display.atoms)

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var maxstd = 0; var maxstd = 0;
var atomName; var atomName;
for (atomName in display.client.atoms) for (atomName in display.client.atoms)

View file

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

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var wid = X.AllocID(); var wid = X.AllocID();

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var wid = X.AllocID(); var wid = X.AllocID();
X.CreateWindow(wid, display.screen[0].root, 100, 100, 400, 300, 0, 0, 0, 0, {eventMask: x11.eventMask.PointerMotion}); X.CreateWindow(wid, display.screen[0].root, 100, 100, 400, 300, 0, 0, 0, 0, {eventMask: x11.eventMask.PointerMotion});

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('apple-wm', function(AppleWM) { X.require('apple-wm', function(AppleWM) {

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var hello = 'Hello, node.js'; var hello = 'Hello, node.js';
X.InternAtom(false, hello, function(err, atomId) { X.InternAtom(false, hello, function(err, atomId) {

View file

@ -13,7 +13,7 @@ var counter = 0;
var t = +new Date(); var t = +new Date();
var t0 = t; var t0 = t;
var num = 100000; var num = 100000;
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
console.log(display); console.log(display);
process.exit(0); process.exit(0);
var X = this; var X = this;

View file

@ -56,7 +56,7 @@ function benchmarkAtoms()
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
X = this; X = this;
X.t1 = +new Date(); X.t1 = +new Date();
benchmarkAtoms(); benchmarkAtoms();

View file

@ -40,7 +40,7 @@ function benchmarkQP()
process.nextTick(benchmarkQP); process.nextTick(benchmarkQP);
} }
X.on('connect', function(display) { X.on('connect', function(err, display) {
var screen = display.screen[0]; var screen = display.screen[0];
wid = X.AllocID(); wid = X.AllocID();
X.CreateWindow(wid, screen.root, 10, 10, 400, 300, 1, 1, 0, { backgroundPixel: screen.white_pixel }); X.CreateWindow(wid, screen.root, 10, 10, 400, 300, 1, 1, 0, { backgroundPixel: screen.white_pixel });

View file

@ -35,7 +35,7 @@ function benchmarkQP(wid)
}); });
} }
X.on('connect', function(display) { X.on('connect', function(err, display) {
var screen = display.screen[0]; var screen = display.screen[0];
var wid = X.AllocID(); var wid = X.AllocID();
X.CreateWindow(wid, screen.root, 10, 10, 400, 300, 1, 1, 0, { backgroundPixel: screen.white_pixel }); X.CreateWindow(wid, screen.root, 10, 10, 400, 300, 1, 1, 0, { backgroundPixel: screen.white_pixel });

View file

@ -1,7 +1,7 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var wid = X.AllocID(); var wid = X.AllocID();

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('composite', function(Composite) { X.require('composite', function(Composite) {

View file

@ -1,7 +1,7 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var Window = require('./wndwrap'); var Window = require('./wndwrap');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var pts = []; var pts = [];
new Window(display.client, 0, 0, 700, 500) new Window(display.client, 0, 0, 700, 500)

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('damage', function(Damage) { X.require('damage', function(Damage) {

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('fixes', function(Fixes) { X.require('fixes', function(Fixes) {

View file

@ -6,7 +6,7 @@ for (var key in ks)
ks2Name[ ks[key] ] = key; ks2Name[ ks[key] ] = key;
var kk2Name = {}; var kk2Name = {};
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var min = display.min_keycode; var min = display.min_keycode;
var max = display.max_keycode; var max = display.max_keycode;

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var X = x11.createClient(); var X = x11.createClient();
X.on('connect', function(display) { X.on('connect', function(err, display) {
X.ListExtensions(function(err, list) { X.ListExtensions(function(err, list) {
list.forEach(function(ext) { list.forEach(function(ext) {
console.log(ext); console.log(ext);

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var X = x11.createClient(function(display) { var X = x11.createClient(function(err, display) {
X.ListFonts('*', 1000, function(err, list) { X.ListFonts('*', 1000, function(err, list) {
list.forEach(function(ext) { list.forEach(function(ext) {
console.log(ext); console.log(ext);

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
function quotize(i) { return '\"' + i + '\"'; } function quotize(i) { return '\"' + i + '\"'; }

View file

@ -4,7 +4,7 @@ var xclient = x11.createClient();
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
var mapped = true; var mapped = true;
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
var X = this; var X = this;
var root = display.screen[0].root; var root = display.screen[0].root;
var wid = X.AllocID(); var wid = X.AllocID();

View file

@ -5,7 +5,7 @@ var PointerMotion = x11.eventMask.PointerMotion;
var ButtonPress = x11.eventMask.ButtonPress; var ButtonPress = x11.eventMask.ButtonPress;
var ButtonRelease = x11.eventMask.ButtonRelease; var ButtonRelease = x11.eventMask.ButtonRelease;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -4,7 +4,7 @@ var xclient = x11.createClient();
var Exposure = x11.eventMask.Exposure; var Exposure = x11.eventMask.Exposure;
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
var X = this; var X = this;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -6,7 +6,7 @@ var pts = [];
var prevPoint; var prevPoint;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -4,7 +4,7 @@ var Exposure = x11.eventMask.Exposure;
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
var pts = []; var pts = [];
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -4,7 +4,7 @@ var xclient = x11.createClient();
var Exposure = x11.eventMask.Exposure; var Exposure = x11.eventMask.Exposure;
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
var X = this; var X = this;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -14,7 +14,7 @@ for (var i=0; i < bitmap.length; ++i)
bitmap[i] = i % 256; bitmap[i] = i % 256;
} }
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
var X = this; var X = this;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -20,7 +20,7 @@ for (var i=0; i < bitmap.length; ++i)
} }
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
var X = display.client; var X = display.client;
X.require('big-requests', function(BigReq) { X.require('big-requests', function(BigReq) {

View file

@ -1,7 +1,7 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var X = x11.createClient(); var X = x11.createClient();
var numExt = 0; var numExt = 0;
X.on('connect', function(display) { X.on('connect', function(err, display) {
X.ListExtensions(function(err, list) { X.ListExtensions(function(err, list) {
console.log(list); console.log(list);
list.forEach(function(ext) { list.forEach(function(ext) {

View file

@ -1,5 +1,5 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var screen = display.screen[0]; var screen = display.screen[0];
var wid = X.AllocID(); var wid = X.AllocID();

View file

@ -2,7 +2,7 @@ var x11 = require('../../lib');
var wid = process.argv[2]; var wid = process.argv[2];
console.log(wid); console.log(wid);
var wids = []; var wids = [];
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.QueryTree(wid ? wid : root, function(err, tree) { X.QueryTree(wid ? wid : root, function(err, tree) {

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var id = parseInt(process.argv[2]); var id = parseInt(process.argv[2]);
var root = display.screen[0].root; var root = display.screen[0].root;

View file

@ -5,7 +5,7 @@ var Exposure = x11.eventMask.Exposure;
var PointerMotion = x11.eventMask.PointerMotion; var PointerMotion = x11.eventMask.PointerMotion;
var pts = []; var pts = [];
xclient.on('connect', function(display) { xclient.on('connect', function(err, display) {
var X = this; var X = this;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('shape', function(Shape) { X.require('shape', function(Shape) {

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
//X.ForceScreenSaver(0); //X.ForceScreenSaver(0);

View file

@ -1,7 +1,7 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var Window = require('./wndwrap'); var Window = require('./wndwrap');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var pts = []; var pts = [];
new Window(display.client, 0, 0, 600, 400, display.screen[0].white_pixel) new Window(display.client, 0, 0, 600, 400, display.screen[0].white_pixel)

View file

@ -5,7 +5,7 @@ var width = 700;
var height = 500; var height = 500;
var pts = []; var pts = [];
x11.createClient(function(display) { x11.createClient(function(err, display) {
var mainwnd = new Window(display.client, 0, 0, width, height); var mainwnd = new Window(display.client, 0, 0, width, height);
mainwnd.on('mousemove', function(ev) mainwnd.on('mousemove', function(ev)

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var visual; var visual;
var rgbaVisuals = Object.keys(display.screen[0].depths[32]); var rgbaVisuals = Object.keys(display.screen[0].depths[32]);
for (v in rgbaVisuals) for (v in rgbaVisuals)

View file

@ -1,5 +1,5 @@
var angle = 0; var angle = 0;
var x11 = require('../../lib').createClient(function(display) { var x11 = require('../../lib').createClient(function(err, display) {
setInterval(function() { setInterval(function() {
var x = 500 + 100*Math.cos(angle); var x = 500 + 100*Math.cos(angle);
var y = 500 + 100*Math.sin(angle); var y = 500 + 100*Math.sin(angle);

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
X.require('xc-misc', function(Misc) { X.require('xc-misc', function(Misc) {

View file

@ -7,7 +7,7 @@ var ButtonRelease = x11.eventMask.ButtonRelease;
//function drawEyes(w, h //function drawEyes(w, h
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
var white = display.screen[0].white_pixel; var white = display.screen[0].white_pixel;

View file

@ -1,6 +1,6 @@
var x11 = require('../../lib'); var x11 = require('../../lib');
var xclient = x11.createClient(function(display) { var xclient = x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
var root = display.screen[0].root; var root = display.screen[0].root;
display.client.require('xtest', function(Test) { display.client.require('xtest', function(Test) {

View file

@ -29,7 +29,7 @@ var ButtonRelease = x11.eventMask.ButtonRelease;
var KeyPress = x11.eventMask.KeyPress; var KeyPress = x11.eventMask.KeyPress;
var KeyRelease = x11.eventMask.KeyRelease; var KeyRelease = x11.eventMask.KeyRelease;
x11.createClient(function(display) { x11.createClient(function(err, display) {
var X = display.client; var X = display.client;
X.require('big-requests', function(BigReq) { X.require('big-requests', function(BigReq) {
BigReq.Enable(function(err, maxLen) { BigReq.Enable(function(err, maxLen) {