get rid of lib/x11 nested subdirectory, lib/x11 -> lib

examples/kbdheatmap/kbdheatmap.js

@@ -1,7 +1,7 @@
 #!/home/laplace/node/node
 
 var Buffer = require('buffer').Buffer;
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 var KeyPress = x11.eventMask.KeyPress;

examples/opengl/glxgears.js

@@ -272,7 +272,7 @@ function init(gl, done)
    });
 }
 
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 //var eventmask = x11.eventMask.PointerMotion|x11.eventMask.PointerMotionHint|x11.eventMask.ButtonPress|x11.eventMask.ButtonRelease|x11.eventMask.StructureNotify|x11.eventMask.Exposure;
 var eventmask = x11.eventMask.PointerMotion;
 //var eventmask = x11.eventMask.PointerMotion|x11.eventMask.ButtonPress|x11.eventMask.ButtonRelease|x11.eventMask.StructureNotify|x11.eventMask.Exposure;

examples/opengl/test1.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var randomarr = [];
 for(var i=0; i < 2000; ++i) {

examples/opengl/tp2.js

@@ -296,7 +296,7 @@ function init(gl, done)
    });
 }
 
-var x11 = require('../../lib/x11');
+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) {

examples/opengl/triangle.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var randomarr = [];
 for(var i=0; i < 20000; ++i) {

examples/paint.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var PointerMotion = x11.eventMask.PointerMotion;
 var ButtonPress = x11.eventMask.ButtonPress;
 var ButtonRelease = x11.eventMask.ButtonRelease;

examples/png/test.js

@@ -1,5 +1,5 @@
 //var logo = require('./node-png').readPng('./node-logo.png');
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 var KeyPress = x11.eventMask.KeyPress;

examples/screenshot.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var wid = process.argv[2];
 console.log(wid);
 

examples/simple/alloccolor.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 

examples/simple/creategc.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var PointerMotion = x11.eventMask.PointerMotion;
 x11.createClient(function(display) {

examples/simple/createwindow.js

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

examples/simple/embed.js

@@ -1,5 +1,5 @@
 var spawn = require('child_process').spawn;
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/simple/events.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 x11.createClient(function(display) {
     var X = display.client;
     var wid = X.AllocID();

examples/simple/getprop.js

@@ -1,6 +1,6 @@
 // ChangeProperty/GetProperty / PropertyChange event example
 
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var PropertyChange = x11.eventMask.PropertyChange;
 
 x11.createClient(function(display) {

examples/simple/gradients.js

@@ -1,6 +1,6 @@
 // this will be eventually moved to lib/node-x11/extensions
 
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 // adding XRender functions manually from
 //     http://cgit.freedesktop.org/xcb/proto/tree/src/render.xml?id=HEAD

examples/simple/hello.js

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

examples/simple/lsatoms.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 x11.createClient(function(display) {
   var maxstd = 0;
   var atomName;

examples/simple/lsatomsp.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 x11.createClient(function(display) {
   var maxstd = 0;
   var atomName;

examples/simple/render.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var PointerMotion = x11.eventMask.PointerMotion;
 
 var xclient = x11.createClient(function(display) {

examples/simple/resizewindow.js

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

examples/simple/xembed.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 x11.createClient(function(display) {
     var X = display.client;
     var wid = X.AllocID();

examples/smoketest/applewm.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/atoms.js

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

examples/smoketest/benchmarks/atom_benchmark_buffered.js

@@ -6,7 +6,7 @@
 // 0.4.9pre: 23300 +/-200 
 
 
-var x11 = require('../../../lib/x11');
+var x11 = require('../../../lib');
 
 var xclient = x11.createClient();
 var counter = 0;

examples/smoketest/benchmarks/atom_benchmark_parallel.js

@@ -9,7 +9,7 @@
 // 0.4.9pre:  16700 +/-300
 
 
-var x11 = require('../../../lib/x11');
+var x11 = require('../../../lib');
 
 var xclient = x11.createClient();
 var reqcounter = 0;

examples/smoketest/benchmarks/query_pointer_benchmark_parallel.js

@@ -13,7 +13,7 @@
 // x11perf -sync -pointer  :
 // x11perf -pointer        :
 
-var x11 = require('../../../lib/x11');
+var x11 = require('../../../lib');
 var X = x11.createClient();
 
 var total = 50000;

examples/smoketest/benchmarks/query_pointer_benchmark_sync.js

@@ -13,7 +13,7 @@
 // x11perf -sync -pointer  :
 // x11perf -pointer        :
 
-var x11 = require('../../../lib/x11');
+var x11 = require('../../../lib');
 var X = x11.createClient();
 
 var total = 50000;

examples/smoketest/bmp.js

@@ -4,7 +4,7 @@
 var fs = require('fs');
 var Pixmap = require('./pixmap').Pixmap;
 var Buffer = require('buffer').Buffer;
-require('../../lib/x11/unpackbuffer').addUnpack(Buffer);
+require('../../lib/unpackbuffer').addUnpack(Buffer);
 
 var reversed = new Buffer(256);
 for (var i=0; i < 256; ++i)

examples/smoketest/changeprop.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var PointerMotion = x11.eventMask.PointerMotion;
 x11.createClient(function(display) {

examples/smoketest/compositetest.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/copyarea.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var Window = require('./wndwrap');
 
 x11.createClient(function(display) {

examples/smoketest/damagetest.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/fixestest.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/getkeyboardmapping.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var ks = x11.keySyms;
 var ks2Name = {};

examples/smoketest/listext.js

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

examples/smoketest/listfonts.js

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

examples/smoketest/listproperties.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/map_unmap.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var xclient = x11.createClient();
 var PointerMotion = x11.eventMask.PointerMotion;

examples/smoketest/polyfillarc.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;

examples/smoketest/polyfillrect.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;

examples/smoketest/polyline.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;

examples/smoketest/polypoint.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;

examples/smoketest/polytext8.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;

examples/smoketest/putimage.js

@@ -1,5 +1,5 @@
 var Buffer = require('buffer').Buffer;
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var fs = require('fs');
 var logo1bit = fs.readFileSync('./nodejs-black.bmp');
 var pixmap = require('./bmp').decodeBuffer(logo1bit);

examples/smoketest/putimage1.js

@@ -1,5 +1,5 @@
 var Buffer = require('buffer').Buffer;
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;

examples/smoketest/query_ext.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var X = x11.createClient();
 var numExt = 0;
 X.on('connect', function(display) {

examples/smoketest/query_pointer.js

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

examples/smoketest/querytree.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var wid = process.argv[2];
 console.log(wid);
 var wids = [];

examples/smoketest/selections.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/sendevent.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;

examples/smoketest/shapetest.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/sstest.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/subwindows.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var Window = require('./wndwrap');
 
 x11.createClient(function(display) {

examples/smoketest/testwnd.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var Window = require('./wndwrap');
 
 var width = 700;

examples/smoketest/transpwindow.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var visual;

examples/smoketest/warppointer.js

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

examples/smoketest/wndwrap.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;
 var ButtonPress = x11.eventMask.ButtonPress;

examples/smoketest/xcmisc.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 x11.createClient(function(display) {
     var X = display.client;

examples/smoketest/xeyes.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;

examples/smoketest/xtesttest.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 var xclient = x11.createClient(function(display) {
     var X = display.client;

examples/tetris.js

@@ -16,7 +16,7 @@ var figs = [
     //  000
     [  0, 0,  1, 0,  0, 1, -1, 0 ],
     //    0
-    //  000   
+    //  000
     [ 0, 0, -1, 0, -2, 0, 0, 1 ],
     [ 0, 0, -1, 0, -2, 0, 0, -1 ]
 ];
@@ -34,9 +34,9 @@ function clearCup()
         cup[i] = 0;
 }
 
-var anglecoeff = [1, 0,  0, 1, 
-                  0, -1, 1, 0, 
-                  -1, 0, 0, -1, 
+var anglecoeff = [1, 0,  0, 1,
+                  0, -1, 1, 0,
+                  -1, 0, 0, -1,
                   0, 1, -1, 0];
 //       0: x = 1x + 0y, y =  0x + 1y
 //       1: x = 0x - 1y, y =  1x + 0y
@@ -106,7 +106,7 @@ function deleteLines()
     }
 }
 
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var Exposure = x11.eventMask.Exposure;
 var KeyPress = x11.eventMask.KeyPress;
 var sqsize = 15;
@@ -246,7 +246,7 @@ function drop()
 }
 
 
-x11.createClient(function(display) {
+x11.createClient(function(err, display) {
     var ks = x11.keySyms;
     var ks2Name = {};
     for (var key in ks)
@@ -266,7 +266,7 @@ x11.createClient(function(display) {
 
     var root = display.screen[0].root;
     var white = display.screen[0].white_pixel;
-    var black = display.screen[0].black_pixel; 
+    var black = display.screen[0].black_pixel;
     wid = X.AllocID();
     X.CreateWindow(wid, root, 0, 0, cupsize[0]*sqsize, cupsize[1]*sqsize, 0, 0, 0, 0, { backgroundPixel: white, eventMask: KeyPress|Exposure });
     cidBlack = X.AllocID();
@@ -283,11 +283,11 @@ x11.createClient(function(display) {
          case 6:
               break;
          case 12: // expose
-              draw(); break;              
+              draw(); break;
          case 2:
               var key = kk2Name[ev.keycode][0];
               console.log(key);
-              switch(key) {            
+              switch(key) {
                   case 'XK_Up': rotateUp(); break;
                   case 'XK_Down': rotateDown(); break;
                   case 'XK_Left': moveLeft(); break;

examples/vncviewer/vncgui.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var rfb = require('./rfbclient');
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 
 // TODO: use optimist for args parsing
 var host = process.argv[2];

examples/windowmanager/wm.js

@@ -1,4 +1,4 @@
-var x11 = require('../../lib/x11');
+var x11 = require('../../lib');
 var EventEmitter = require('events').EventEmitter;
 
 var X, root, white;

package.json

@@ -13,7 +13,7 @@
 , "licenses" : [ { "type" : "MIT" } ]
 , "repository" : { "type" : "git", "url" : "http://github.com/sidorares/node-x11.git" }
 
-, "main" : "./lib/x11"
+, "main" : "./lib"
 , "engines" : { "node" : "*" }
 , "devDependencies": {
     "mocha": "*",

test/connect.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 var util = require('util');

test/connection-utils.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 

test/core-CreateWindow.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 

test/core-ForceScreenSaver.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 

test/core-KillKlient.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 

test/core-properties.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 

test/dpms.js

@@ -1,4 +1,4 @@
-var x11 = require('../lib/x11');
+var x11 = require('../lib');
 var should = require('should');
 var assert = require('assert');
 var util = require('util');