createClient callback signature now (err,display)

2026-05-20 12:58:45 +00:00 · 2013-02-19 17:47:22 +11:00 · 2013-02-19 17:47:22 +11:00 · 5d021eab94
commit 5d021eab94
parent 3f064b218e
58 changed files with 58 additions and 58 deletions
--- a/examples/kbdheatmap/kbdheatmap.js
+++ b/examples/kbdheatmap/kbdheatmap.js
@ -23,7 +23,7 @@ for (var k in keysyms)
 var kk2name = {};


-x11.createClient(function(display) 
+x11.createClient(function(err, display) 
 {
    var X = display.client;   
    X.require('big-requests', function(BigReq) 
--- a/examples/opengl/test1.js
+++ b/examples/opengl/test1.js
@ -10,7 +10,7 @@ var height = 500;
 var eventmask = x11.eventMask.PointerMotion;
 var listId = 1;

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.require('glx', function(GLX) {
--- a/examples/opengl/tp2.js
+++ b/examples/opengl/tp2.js
@ -299,7 +299,7 @@ function init(gl, done)
 var x11 = require('../../lib');
 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 root = display.screen[0].root;
    var width = 1000;
--- a/examples/opengl/triangle.js
+++ b/examples/opengl/triangle.js
@ -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]);
 }

-var xclient = x11.createClient(function(display) {
+var xclient = x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.require('glx', function(GLX) {
--- a/examples/paint.js
+++ b/examples/paint.js
@ -7,7 +7,7 @@ var X, Render;
 var pressed = false;
 var gradNo = 0;

-var xclient = x11.createClient(function(display) {
+var xclient = x11.createClient(function(err, display) {
    X = display.client;
    var root = display.screen[0].root;
    X.require('render', function(rendExt) {
--- a/examples/png/test.js
+++ b/examples/png/test.js
@ -12,7 +12,7 @@ var interv = 0;
 var total_frames = 0;
 var last_frames = 0;

-x11.createClient(function(display)
+x11.createClient(function(err, display)
 {

    console.log('111111');
--- a/examples/screenshot.js
+++ b/examples/screenshot.js
@ -2,7 +2,7 @@ var x11 = require('../lib');
 var wid = process.argv[2];
 console.log(wid);

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;

--- a/examples/simple/alloccolor.js
+++ b/examples/simple/alloccolor.js
@ -2,7 +2,7 @@ var x11 = require('../../lib');

 var Exposure = x11.eventMask.Exposure;

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var repaint;
    var X = display.client;
    var root = display.screen[0].root;
--- a/examples/simple/creategc.js
+++ b/examples/simple/creategc.js
@ -1,7 +1,7 @@
 var x11 = require('../../lib');

 var PointerMotion = x11.eventMask.PointerMotion;
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/simple/createwindow.js
+++ b/examples/simple/createwindow.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    console.log(display.screen[0])
    var X = display.client;
    var wid = X.AllocID();
--- a/examples/simple/embed.js
+++ b/examples/simple/embed.js
@ -1,7 +1,7 @@
 var spawn = require('child_process').spawn;
 var x11 = require('../../lib');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    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});
--- a/examples/simple/events.js
+++ b/examples/simple/events.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var wid = X.AllocID();
    X.CreateWindow(wid, display.screen[0].root, 100, 100, 400, 300);
--- a/examples/simple/getprop.js
+++ b/examples/simple/getprop.js
@ -3,7 +3,7 @@
 var x11 = require('../../lib');
 var PropertyChange = x11.eventMask.PropertyChange;

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    var wid = X.AllocID();
--- a/examples/simple/gradients.js
+++ b/examples/simple/gradients.js
@ -7,7 +7,7 @@ var x11 = require('../../lib');
 // and http://www.x.org/releases/X11R7.6/doc/renderproto/renderproto.txt
 // TODO: move to templates
 x11.createClient(
-    function(display) {
+    function(err, display) {
        var X = display.client;
            X.require('render', function(Render) {

--- a/examples/simple/hello.js
+++ b/examples/simple/hello.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
   console.log('succesfully connected to \"' + display.vendor + '\" server');
   display.client.terminate();
 });
--- a/examples/simple/lsatoms.js
+++ b/examples/simple/lsatoms.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
  var maxstd = 0;
  var atomName;
  for (atomName in display.atoms)
--- a/examples/simple/lsatomsp.js
+++ b/examples/simple/lsatomsp.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
  var maxstd = 0;
  var atomName;
  for (atomName in display.client.atoms)
--- a/examples/simple/render.js
+++ b/examples/simple/render.js
@ -1,7 +1,7 @@
 var x11 = require('../../lib');
 var PointerMotion = x11.eventMask.PointerMotion;

-var xclient = x11.createClient(function(display) {
+var xclient = x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    display.client.require('render', function(Render) {
--- a/examples/simple/resizewindow.js
+++ b/examples/simple/resizewindow.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    var wid = X.AllocID();
--- a/examples/simple/xembed.js
+++ b/examples/simple/xembed.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var wid = X.AllocID();
    X.CreateWindow(wid, display.screen[0].root, 100, 100, 400, 300, 0, 0, 0, 0, {eventMask: x11.eventMask.PointerMotion});
--- a/examples/smoketest/applewm.js
+++ b/examples/smoketest/applewm.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.require('apple-wm', function(AppleWM) {
--- a/examples/smoketest/atoms.js
+++ b/examples/smoketest/atoms.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var hello = 'Hello, node.js';
    X.InternAtom(false, hello, function(err, atomId) {
--- a/examples/smoketest/benchmarks/atom_benchmark_buffered.js
+++ b/examples/smoketest/benchmarks/atom_benchmark_buffered.js
@ -13,7 +13,7 @@ var counter = 0;
 var t = +new Date();
 var t0 = t;
 var num = 100000;
-xclient.on('connect', function(display) {
+xclient.on('connect', function(err, display) {
    console.log(display);
    process.exit(0);
    var X = this;
--- a/examples/smoketest/benchmarks/atom_benchmark_parallel.js
+++ b/examples/smoketest/benchmarks/atom_benchmark_parallel.js
@ -56,7 +56,7 @@ function benchmarkAtoms()



-xclient.on('connect', function(display) {
+xclient.on('connect', function(err, display) {
    X = this;
    X.t1 = +new Date();
    benchmarkAtoms();
--- a/examples/smoketest/benchmarks/query_pointer_benchmark_parallel.js
+++ b/examples/smoketest/benchmarks/query_pointer_benchmark_parallel.js
@ -40,7 +40,7 @@ function benchmarkQP()
        process.nextTick(benchmarkQP);
 }

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

-X.on('connect', function(display) {
+X.on('connect', function(err, display) {
    var screen = display.screen[0];
    var wid = X.AllocID();
    X.CreateWindow(wid, screen.root, 10, 10, 400, 300, 1, 1, 0, { backgroundPixel: screen.white_pixel });
--- a/examples/smoketest/changeprop.js
+++ b/examples/smoketest/changeprop.js
@ -1,7 +1,7 @@
 var x11 = require('../../lib');

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

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.require('composite', function(Composite) {
--- a/examples/smoketest/copyarea.js
+++ b/examples/smoketest/copyarea.js
@ -1,7 +1,7 @@
 var x11 = require('../../lib');
 var Window = require('./wndwrap');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {

    var pts = [];
    new Window(display.client, 0, 0, 700, 500)
--- a/examples/smoketest/damagetest.js
+++ b/examples/smoketest/damagetest.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

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

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.require('fixes', function(Fixes) {
--- a/examples/smoketest/getkeyboardmapping.js
+++ b/examples/smoketest/getkeyboardmapping.js
@ -6,7 +6,7 @@ for (var key in ks)
    ks2Name[ ks[key] ] = key;
 var kk2Name = {};

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var min = display.min_keycode;
    var max = display.max_keycode;
--- a/examples/smoketest/listext.js
+++ b/examples/smoketest/listext.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');
 var X = x11.createClient();
-X.on('connect', function(display) {
+X.on('connect', function(err, display) {
    X.ListExtensions(function(err, list) {
        list.forEach(function(ext) {
            console.log(ext);
--- a/examples/smoketest/listfonts.js
+++ b/examples/smoketest/listfonts.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-var X = x11.createClient(function(display) {
+var X = x11.createClient(function(err, display) {
    X.ListFonts('*', 1000, function(err, list) {
        list.forEach(function(ext) {
            console.log(ext);
--- a/examples/smoketest/listproperties.js
+++ b/examples/smoketest/listproperties.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
   
    function quotize(i) { return '\"' + i + '\"'; }
--- a/examples/smoketest/map_unmap.js
+++ b/examples/smoketest/map_unmap.js
@ -4,7 +4,7 @@ var xclient = x11.createClient();
 var PointerMotion = x11.eventMask.PointerMotion;
 var mapped = true;

-xclient.on('connect', function(display) {
+xclient.on('connect', function(err, display) {
    var X = this;
    var root = display.screen[0].root;
    var wid = X.AllocID();
--- a/examples/smoketest/polyfillarc.js
+++ b/examples/smoketest/polyfillarc.js
@ -5,7 +5,7 @@ var PointerMotion = x11.eventMask.PointerMotion;
 var ButtonPress = x11.eventMask.ButtonPress;
 var ButtonRelease = x11.eventMask.ButtonRelease;

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/smoketest/polyfillrect.js
+++ b/examples/smoketest/polyfillrect.js
@ -4,7 +4,7 @@ var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;

-xclient.on('connect', function(display) {
+xclient.on('connect', function(err, display) {
    var X = this;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/smoketest/polyline.js
+++ b/examples/smoketest/polyline.js
@ -6,7 +6,7 @@ var pts = [];

 var prevPoint;

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

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/smoketest/polytext8.js
+++ b/examples/smoketest/polytext8.js
@ -4,7 +4,7 @@ var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;

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

-xclient.on('connect', function(display) {
+xclient.on('connect', function(err, display) {
    var X = this;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/smoketest/putimage1.js
+++ b/examples/smoketest/putimage1.js
@ -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;   
    X.require('big-requests', function(BigReq) {
--- a/examples/smoketest/query_ext.js
+++ b/examples/smoketest/query_ext.js
@ -1,7 +1,7 @@
 var x11 = require('../../lib');
 var X = x11.createClient();
 var numExt = 0;
-X.on('connect', function(display) {
+X.on('connect', function(err, display) {
    X.ListExtensions(function(err, list) {
        console.log(list);
        list.forEach(function(ext) {
--- a/examples/smoketest/query_pointer.js
+++ b/examples/smoketest/query_pointer.js
@ -1,5 +1,5 @@
 var x11 = require('../../lib');
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client; 
    var screen = display.screen[0];
    var wid = X.AllocID();
--- a/examples/smoketest/querytree.js
+++ b/examples/smoketest/querytree.js
@ -2,7 +2,7 @@ var x11 = require('../../lib');
 var wid = process.argv[2];
 console.log(wid);
 var wids = [];
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.QueryTree(wid ? wid : root, function(err, tree) {
--- a/examples/smoketest/selections.js
+++ b/examples/smoketest/selections.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var id = parseInt(process.argv[2]);
    var root = display.screen[0].root;
--- a/examples/smoketest/sendevent.js
+++ b/examples/smoketest/sendevent.js
@ -5,7 +5,7 @@ var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;
 var pts = [];

-xclient.on('connect', function(display) {
+xclient.on('connect', function(err, display) {
    var X = this;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/smoketest/shapetest.js
+++ b/examples/smoketest/shapetest.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

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

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    //X.ForceScreenSaver(0);
--- a/examples/smoketest/subwindows.js
+++ b/examples/smoketest/subwindows.js
@ -1,7 +1,7 @@
 var x11 = require('../../lib');
 var Window = require('./wndwrap');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {

    var pts = [];
    new Window(display.client, 0, 0, 600, 400, display.screen[0].white_pixel)
--- a/examples/smoketest/testwnd.js
+++ b/examples/smoketest/testwnd.js
@ -5,7 +5,7 @@ var width = 700;
 var height = 500;

 var pts = [];
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {

    var mainwnd = new Window(display.client, 0, 0, width, height);
    mainwnd.on('mousemove', function(ev) 
--- a/examples/smoketest/transpwindow.js
+++ b/examples/smoketest/transpwindow.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var visual;
    var rgbaVisuals = Object.keys(display.screen[0].depths[32]);
    for (v in rgbaVisuals)
--- a/examples/smoketest/warppointer.js
+++ b/examples/smoketest/warppointer.js
@ -1,5 +1,5 @@
 var angle = 0;
-var x11 = require('../../lib').createClient(function(display) {
+var x11 = require('../../lib').createClient(function(err, display) {
    setInterval(function() {
        var x = 500 + 100*Math.cos(angle);
        var y = 500 + 100*Math.sin(angle);
--- a/examples/smoketest/xcmisc.js
+++ b/examples/smoketest/xcmisc.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    X.require('xc-misc', function(Misc) {
--- a/examples/smoketest/xeyes.js
+++ b/examples/smoketest/xeyes.js
@ -7,7 +7,7 @@ var ButtonRelease = x11.eventMask.ButtonRelease;

 //function drawEyes(w, h

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    var white = display.screen[0].white_pixel;
--- a/examples/smoketest/xtesttest.js
+++ b/examples/smoketest/xtesttest.js
@ -1,6 +1,6 @@
 var x11 = require('../../lib');

-var xclient = x11.createClient(function(display) {
+var xclient = x11.createClient(function(err, display) {
    var X = display.client;
    var root = display.screen[0].root;
    display.client.require('xtest', function(Test) {
--- a/examples/vncviewer/vncgui.js
+++ b/examples/vncviewer/vncgui.js
@ -29,7 +29,7 @@ var ButtonRelease = x11.eventMask.ButtonRelease;
 var KeyPress = x11.eventMask.KeyPress;
 var KeyRelease = x11.eventMask.KeyRelease;

-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
    var X = display.client;   
    X.require('big-requests', function(BigReq) {
        BigReq.Enable(function(err, maxLen) {