From 3f064b218edababa59f2071cf7bb8aa246388571 Mon Sep 17 00:00:00 2001 From: Andrey Sidorov Date: Tue, 19 Feb 2013 16:19:11 +1100 Subject: [PATCH] get rid of lib/x11 nested subdirectory, lib/x11 -> lib --- examples/kbdheatmap/kbdheatmap.js | 2 +- examples/opengl/glxgears.js | 2 +- examples/opengl/test1.js | 2 +- examples/opengl/tp2.js | 2 +- examples/opengl/triangle.js | 2 +- examples/paint.js | 2 +- examples/png/test.js | 2 +- examples/screenshot.js | 2 +- examples/simple/alloccolor.js | 2 +- examples/simple/creategc.js | 2 +- examples/simple/createwindow.js | 2 +- examples/simple/embed.js | 2 +- examples/simple/events.js | 2 +- examples/simple/getprop.js | 2 +- examples/simple/gradients.js | 2 +- examples/simple/hello.js | 2 +- examples/simple/lsatoms.js | 2 +- examples/simple/lsatomsp.js | 2 +- examples/simple/render.js | 2 +- examples/simple/resizewindow.js | 2 +- examples/simple/xembed.js | 2 +- examples/smoketest/applewm.js | 2 +- examples/smoketest/atoms.js | 2 +- .../benchmarks/atom_benchmark_buffered.js | 2 +- .../benchmarks/atom_benchmark_parallel.js | 2 +- .../query_pointer_benchmark_parallel.js | 2 +- .../benchmarks/query_pointer_benchmark_sync.js | 2 +- examples/smoketest/bmp.js | 2 +- examples/smoketest/changeprop.js | 2 +- examples/smoketest/compositetest.js | 2 +- examples/smoketest/copyarea.js | 2 +- examples/smoketest/damagetest.js | 2 +- examples/smoketest/fixestest.js | 2 +- examples/smoketest/getkeyboardmapping.js | 2 +- examples/smoketest/listext.js | 2 +- examples/smoketest/listfonts.js | 2 +- examples/smoketest/listproperties.js | 2 +- examples/smoketest/map_unmap.js | 2 +- examples/smoketest/polyfillarc.js | 2 +- examples/smoketest/polyfillrect.js | 2 +- examples/smoketest/polyline.js | 2 +- examples/smoketest/polypoint.js | 2 +- examples/smoketest/polytext8.js | 2 +- examples/smoketest/putimage.js | 2 +- examples/smoketest/putimage1.js | 2 +- examples/smoketest/query_ext.js | 2 +- examples/smoketest/query_pointer.js | 2 +- examples/smoketest/querytree.js | 2 +- examples/smoketest/selections.js | 2 +- examples/smoketest/sendevent.js | 2 +- examples/smoketest/shapetest.js | 2 +- examples/smoketest/sstest.js | 2 +- examples/smoketest/subwindows.js | 2 +- examples/smoketest/testwnd.js | 2 +- examples/smoketest/transpwindow.js | 2 +- examples/smoketest/warppointer.js | 2 +- examples/smoketest/wndwrap.js | 2 +- examples/smoketest/xcmisc.js | 2 +- examples/smoketest/xeyes.js | 2 +- examples/smoketest/xtesttest.js | 2 +- examples/tetris.js | 18 +++++++++--------- examples/vncviewer/vncgui.js | 2 +- examples/windowmanager/wm.js | 2 +- lib/{x11 => }/auth.js | 0 lib/{x11 => }/corereqs.js | 0 lib/{x11 => }/eventmask.js | 0 lib/{x11 => }/ext/apple-wm.js | 0 lib/{x11 => }/ext/big-requests.js | 0 lib/{x11 => }/ext/composite.js | 0 lib/{x11 => }/ext/damage.js | 0 lib/{x11 => }/ext/dpms.js | 0 lib/{x11 => }/ext/fixes.js | 0 lib/{x11 => }/ext/glx.js | 0 lib/{x11 => }/ext/glxconstants.js | 0 lib/{x11 => }/ext/glxrender.js | 0 lib/{x11 => }/ext/render.js | 0 lib/{x11 => }/ext/screen-saver.js | 0 lib/{x11 => }/ext/shape.js | 0 lib/{x11 => }/ext/xc-misc.js | 0 lib/{x11 => }/ext/xtest.js | 0 lib/{x11 => }/handshake.js | 0 lib/{x11 => }/hexy.js | 0 lib/{x11 => }/index.js | 0 lib/{x11 => }/keysyms.js | 0 lib/{x11 => }/stdatoms.js | 0 lib/{x11 => }/unpackbuffer.js | 0 lib/{x11 => }/unpackstream.js | 0 lib/{x11 => }/xcore.js | 0 lib/{x11 => }/xerrors.js | 0 lib/{x11 => }/xproto2js.pl | 0 lib/{x11 => }/xserver.js | 0 lib/{x11 => }/xutil.js | 0 package.json | 2 +- test/connect.js | 2 +- test/connection-utils.js | 2 +- test/core-CreateWindow.js | 2 +- test/core-ForceScreenSaver.js | 2 +- test/core-KillKlient.js | 2 +- test/core-properties.js | 2 +- test/dpms.js | 2 +- test/errors.js | 2 +- test/sequence-overflow.js | 2 +- test/xtest.js | 2 +- 103 files changed, 82 insertions(+), 82 deletions(-) rename lib/{x11 => }/auth.js (100%) rename lib/{x11 => }/corereqs.js (100%) rename lib/{x11 => }/eventmask.js (100%) rename lib/{x11 => }/ext/apple-wm.js (100%) rename lib/{x11 => }/ext/big-requests.js (100%) rename lib/{x11 => }/ext/composite.js (100%) rename lib/{x11 => }/ext/damage.js (100%) rename lib/{x11 => }/ext/dpms.js (100%) rename lib/{x11 => }/ext/fixes.js (100%) rename lib/{x11 => }/ext/glx.js (100%) rename lib/{x11 => }/ext/glxconstants.js (100%) rename lib/{x11 => }/ext/glxrender.js (100%) rename lib/{x11 => }/ext/render.js (100%) rename lib/{x11 => }/ext/screen-saver.js (100%) rename lib/{x11 => }/ext/shape.js (100%) rename lib/{x11 => }/ext/xc-misc.js (100%) rename lib/{x11 => }/ext/xtest.js (100%) rename lib/{x11 => }/handshake.js (100%) rename lib/{x11 => }/hexy.js (100%) rename lib/{x11 => }/index.js (100%) rename lib/{x11 => }/keysyms.js (100%) rename lib/{x11 => }/stdatoms.js (100%) rename lib/{x11 => }/unpackbuffer.js (100%) rename lib/{x11 => }/unpackstream.js (100%) rename lib/{x11 => }/xcore.js (100%) rename lib/{x11 => }/xerrors.js (100%) rename lib/{x11 => }/xproto2js.pl (100%) rename lib/{x11 => }/xserver.js (100%) rename lib/{x11 => }/xutil.js (100%) diff --git a/examples/kbdheatmap/kbdheatmap.js b/examples/kbdheatmap/kbdheatmap.js index e80e07a..a5a732b 100755 --- a/examples/kbdheatmap/kbdheatmap.js +++ b/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; diff --git a/examples/opengl/glxgears.js b/examples/opengl/glxgears.js index 7b87bc6..cff19b2 100644 --- a/examples/opengl/glxgears.js +++ b/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; diff --git a/examples/opengl/test1.js b/examples/opengl/test1.js index 9b0207b..550f41c 100644 --- a/examples/opengl/test1.js +++ b/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) { diff --git a/examples/opengl/tp2.js b/examples/opengl/tp2.js index 314f1b7..805732c 100644 --- a/examples/opengl/tp2.js +++ b/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) { diff --git a/examples/opengl/triangle.js b/examples/opengl/triangle.js index 79d8f73..0d8a178 100644 --- a/examples/opengl/triangle.js +++ b/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) { diff --git a/examples/paint.js b/examples/paint.js index 3cebba9..1385bde 100644 --- a/examples/paint.js +++ b/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; diff --git a/examples/png/test.js b/examples/png/test.js index 6c513eb..59866ef 100644 --- a/examples/png/test.js +++ b/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; diff --git a/examples/screenshot.js b/examples/screenshot.js index 41faa92..0140d0e 100755 --- a/examples/screenshot.js +++ b/examples/screenshot.js @@ -1,4 +1,4 @@ -var x11 = require('../lib/x11'); +var x11 = require('../lib'); var wid = process.argv[2]; console.log(wid); diff --git a/examples/simple/alloccolor.js b/examples/simple/alloccolor.js index d964645..77708f6 100644 --- a/examples/simple/alloccolor.js +++ b/examples/simple/alloccolor.js @@ -1,4 +1,4 @@ -var x11 = require('../../lib/x11'); +var x11 = require('../../lib'); var Exposure = x11.eventMask.Exposure; diff --git a/examples/simple/creategc.js b/examples/simple/creategc.js index ea73d77..a3c377d 100644 --- a/examples/simple/creategc.js +++ b/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) { diff --git a/examples/simple/createwindow.js b/examples/simple/createwindow.js index 347e169..fe92351 100644 --- a/examples/simple/createwindow.js +++ b/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; diff --git a/examples/simple/embed.js b/examples/simple/embed.js index 6844ab1..07b9805 100644 --- a/examples/simple/embed.js +++ b/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; diff --git a/examples/simple/events.js b/examples/simple/events.js index 09be199..3445dca 100644 --- a/examples/simple/events.js +++ b/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(); diff --git a/examples/simple/getprop.js b/examples/simple/getprop.js index b17f3d1..c81ba29 100644 --- a/examples/simple/getprop.js +++ b/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) { diff --git a/examples/simple/gradients.js b/examples/simple/gradients.js index d27a36b..3c3cc96 100644 --- a/examples/simple/gradients.js +++ b/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 diff --git a/examples/simple/hello.js b/examples/simple/hello.js index 6ad9ba1..767c233 100644 --- a/examples/simple/hello.js +++ b/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(); diff --git a/examples/simple/lsatoms.js b/examples/simple/lsatoms.js index 61e16c4..8658f0c 100644 --- a/examples/simple/lsatoms.js +++ b/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; diff --git a/examples/simple/lsatomsp.js b/examples/simple/lsatomsp.js index dd9ce75..8e9141a 100644 --- a/examples/simple/lsatomsp.js +++ b/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; diff --git a/examples/simple/render.js b/examples/simple/render.js index 7cfaefa..dff744b 100644 --- a/examples/simple/render.js +++ b/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) { diff --git a/examples/simple/resizewindow.js b/examples/simple/resizewindow.js index 127154e..d67cf64 100644 --- a/examples/simple/resizewindow.js +++ b/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; diff --git a/examples/simple/xembed.js b/examples/simple/xembed.js index 762391a..3c7d02b 100644 --- a/examples/simple/xembed.js +++ b/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(); diff --git a/examples/smoketest/applewm.js b/examples/smoketest/applewm.js index 1068b33..2ec7776 100644 --- a/examples/smoketest/applewm.js +++ b/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; diff --git a/examples/smoketest/atoms.js b/examples/smoketest/atoms.js index 8bb9d6a..bbaddbc 100644 --- a/examples/smoketest/atoms.js +++ b/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'; diff --git a/examples/smoketest/benchmarks/atom_benchmark_buffered.js b/examples/smoketest/benchmarks/atom_benchmark_buffered.js index 2b5dea0..e4d1c2d 100644 --- a/examples/smoketest/benchmarks/atom_benchmark_buffered.js +++ b/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; diff --git a/examples/smoketest/benchmarks/atom_benchmark_parallel.js b/examples/smoketest/benchmarks/atom_benchmark_parallel.js index 2f25784..f1e868c 100644 --- a/examples/smoketest/benchmarks/atom_benchmark_parallel.js +++ b/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; diff --git a/examples/smoketest/benchmarks/query_pointer_benchmark_parallel.js b/examples/smoketest/benchmarks/query_pointer_benchmark_parallel.js index 167bcf0..7c19e84 100644 --- a/examples/smoketest/benchmarks/query_pointer_benchmark_parallel.js +++ b/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; diff --git a/examples/smoketest/benchmarks/query_pointer_benchmark_sync.js b/examples/smoketest/benchmarks/query_pointer_benchmark_sync.js index 897be48..e5e7d41 100644 --- a/examples/smoketest/benchmarks/query_pointer_benchmark_sync.js +++ b/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; diff --git a/examples/smoketest/bmp.js b/examples/smoketest/bmp.js index 862fab5..6aa92f0 100644 --- a/examples/smoketest/bmp.js +++ b/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) diff --git a/examples/smoketest/changeprop.js b/examples/smoketest/changeprop.js index 2e42fda..5d183fd 100644 --- a/examples/smoketest/changeprop.js +++ b/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) { diff --git a/examples/smoketest/compositetest.js b/examples/smoketest/compositetest.js index 9bfdc47..6cc3246 100644 --- a/examples/smoketest/compositetest.js +++ b/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; diff --git a/examples/smoketest/copyarea.js b/examples/smoketest/copyarea.js index 7e9a6bf..9b20f34 100644 --- a/examples/smoketest/copyarea.js +++ b/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) { diff --git a/examples/smoketest/damagetest.js b/examples/smoketest/damagetest.js index e3a7143..a3e84a7 100644 --- a/examples/smoketest/damagetest.js +++ b/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; diff --git a/examples/smoketest/fixestest.js b/examples/smoketest/fixestest.js index b31341e..8d25f27 100644 --- a/examples/smoketest/fixestest.js +++ b/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; diff --git a/examples/smoketest/getkeyboardmapping.js b/examples/smoketest/getkeyboardmapping.js index 5b9cf6e..d93851d 100644 --- a/examples/smoketest/getkeyboardmapping.js +++ b/examples/smoketest/getkeyboardmapping.js @@ -1,4 +1,4 @@ -var x11 = require('../../lib/x11'); +var x11 = require('../../lib'); var ks = x11.keySyms; var ks2Name = {}; diff --git a/examples/smoketest/listext.js b/examples/smoketest/listext.js index 2ccaed2..2533273 100644 --- a/examples/smoketest/listext.js +++ b/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) { diff --git a/examples/smoketest/listfonts.js b/examples/smoketest/listfonts.js index 2997550..4773ccf 100644 --- a/examples/smoketest/listfonts.js +++ b/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) { diff --git a/examples/smoketest/listproperties.js b/examples/smoketest/listproperties.js index 4592a38..990726c 100644 --- a/examples/smoketest/listproperties.js +++ b/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; diff --git a/examples/smoketest/map_unmap.js b/examples/smoketest/map_unmap.js index c54a0a1..1765505 100644 --- a/examples/smoketest/map_unmap.js +++ b/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; diff --git a/examples/smoketest/polyfillarc.js b/examples/smoketest/polyfillarc.js index c83af41..3098bc4 100644 --- a/examples/smoketest/polyfillarc.js +++ b/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; diff --git a/examples/smoketest/polyfillrect.js b/examples/smoketest/polyfillrect.js index a4a517f..9d639ae 100644 --- a/examples/smoketest/polyfillrect.js +++ b/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; diff --git a/examples/smoketest/polyline.js b/examples/smoketest/polyline.js index a0be063..e8b5091 100644 --- a/examples/smoketest/polyline.js +++ b/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; diff --git a/examples/smoketest/polypoint.js b/examples/smoketest/polypoint.js index f851807..59713e2 100644 --- a/examples/smoketest/polypoint.js +++ b/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; diff --git a/examples/smoketest/polytext8.js b/examples/smoketest/polytext8.js index 5bef0cf..43f5892 100644 --- a/examples/smoketest/polytext8.js +++ b/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; diff --git a/examples/smoketest/putimage.js b/examples/smoketest/putimage.js index 432710c..43d9eca 100644 --- a/examples/smoketest/putimage.js +++ b/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); diff --git a/examples/smoketest/putimage1.js b/examples/smoketest/putimage1.js index 5514e42..6ffc419 100644 --- a/examples/smoketest/putimage1.js +++ b/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; diff --git a/examples/smoketest/query_ext.js b/examples/smoketest/query_ext.js index 9d9c487..8c11f50 100644 --- a/examples/smoketest/query_ext.js +++ b/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) { diff --git a/examples/smoketest/query_pointer.js b/examples/smoketest/query_pointer.js index d65c62b..265406a 100644 --- a/examples/smoketest/query_pointer.js +++ b/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]; diff --git a/examples/smoketest/querytree.js b/examples/smoketest/querytree.js index 39ff7b5..3fb70c9 100644 --- a/examples/smoketest/querytree.js +++ b/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 = []; diff --git a/examples/smoketest/selections.js b/examples/smoketest/selections.js index 0f2f601..5610fd1 100644 --- a/examples/smoketest/selections.js +++ b/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; diff --git a/examples/smoketest/sendevent.js b/examples/smoketest/sendevent.js index 8de488f..ab1d68e 100644 --- a/examples/smoketest/sendevent.js +++ b/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; diff --git a/examples/smoketest/shapetest.js b/examples/smoketest/shapetest.js index 73dfa9d..9e5d76a 100644 --- a/examples/smoketest/shapetest.js +++ b/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; diff --git a/examples/smoketest/sstest.js b/examples/smoketest/sstest.js index 8790d53..0dab215 100644 --- a/examples/smoketest/sstest.js +++ b/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; diff --git a/examples/smoketest/subwindows.js b/examples/smoketest/subwindows.js index 68a0846..01988a5 100644 --- a/examples/smoketest/subwindows.js +++ b/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) { diff --git a/examples/smoketest/testwnd.js b/examples/smoketest/testwnd.js index ff0335b..e53ae15 100644 --- a/examples/smoketest/testwnd.js +++ b/examples/smoketest/testwnd.js @@ -1,4 +1,4 @@ -var x11 = require('../../lib/x11'); +var x11 = require('../../lib'); var Window = require('./wndwrap'); var width = 700; diff --git a/examples/smoketest/transpwindow.js b/examples/smoketest/transpwindow.js index fc2970d..3608586 100644 --- a/examples/smoketest/transpwindow.js +++ b/examples/smoketest/transpwindow.js @@ -1,4 +1,4 @@ -var x11 = require('../../lib/x11'); +var x11 = require('../../lib'); x11.createClient(function(display) { var visual; diff --git a/examples/smoketest/warppointer.js b/examples/smoketest/warppointer.js index 3f25e85..25f9083 100644 --- a/examples/smoketest/warppointer.js +++ b/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); diff --git a/examples/smoketest/wndwrap.js b/examples/smoketest/wndwrap.js index abd74e8..fd12ca4 100644 --- a/examples/smoketest/wndwrap.js +++ b/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; diff --git a/examples/smoketest/xcmisc.js b/examples/smoketest/xcmisc.js index 358e1d5..4bec4c9 100644 --- a/examples/smoketest/xcmisc.js +++ b/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; diff --git a/examples/smoketest/xeyes.js b/examples/smoketest/xeyes.js index 8a43417..fccba27 100644 --- a/examples/smoketest/xeyes.js +++ b/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; diff --git a/examples/smoketest/xtesttest.js b/examples/smoketest/xtesttest.js index 6a1449f..ed6bc5e 100644 --- a/examples/smoketest/xtesttest.js +++ b/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; diff --git a/examples/tetris.js b/examples/tetris.js index 11dbd55..605097a 100644 --- a/examples/tetris.js +++ b/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; diff --git a/examples/vncviewer/vncgui.js b/examples/vncviewer/vncgui.js index 9c6b407..9e2dff4 100644 --- a/examples/vncviewer/vncgui.js +++ b/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]; diff --git a/examples/windowmanager/wm.js b/examples/windowmanager/wm.js index 03f42e5..dcaebdd 100644 --- a/examples/windowmanager/wm.js +++ b/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; diff --git a/lib/x11/auth.js b/lib/auth.js similarity index 100% rename from lib/x11/auth.js rename to lib/auth.js diff --git a/lib/x11/corereqs.js b/lib/corereqs.js similarity index 100% rename from lib/x11/corereqs.js rename to lib/corereqs.js diff --git a/lib/x11/eventmask.js b/lib/eventmask.js similarity index 100% rename from lib/x11/eventmask.js rename to lib/eventmask.js diff --git a/lib/x11/ext/apple-wm.js b/lib/ext/apple-wm.js similarity index 100% rename from lib/x11/ext/apple-wm.js rename to lib/ext/apple-wm.js diff --git a/lib/x11/ext/big-requests.js b/lib/ext/big-requests.js similarity index 100% rename from lib/x11/ext/big-requests.js rename to lib/ext/big-requests.js diff --git a/lib/x11/ext/composite.js b/lib/ext/composite.js similarity index 100% rename from lib/x11/ext/composite.js rename to lib/ext/composite.js diff --git a/lib/x11/ext/damage.js b/lib/ext/damage.js similarity index 100% rename from lib/x11/ext/damage.js rename to lib/ext/damage.js diff --git a/lib/x11/ext/dpms.js b/lib/ext/dpms.js similarity index 100% rename from lib/x11/ext/dpms.js rename to lib/ext/dpms.js diff --git a/lib/x11/ext/fixes.js b/lib/ext/fixes.js similarity index 100% rename from lib/x11/ext/fixes.js rename to lib/ext/fixes.js diff --git a/lib/x11/ext/glx.js b/lib/ext/glx.js similarity index 100% rename from lib/x11/ext/glx.js rename to lib/ext/glx.js diff --git a/lib/x11/ext/glxconstants.js b/lib/ext/glxconstants.js similarity index 100% rename from lib/x11/ext/glxconstants.js rename to lib/ext/glxconstants.js diff --git a/lib/x11/ext/glxrender.js b/lib/ext/glxrender.js similarity index 100% rename from lib/x11/ext/glxrender.js rename to lib/ext/glxrender.js diff --git a/lib/x11/ext/render.js b/lib/ext/render.js similarity index 100% rename from lib/x11/ext/render.js rename to lib/ext/render.js diff --git a/lib/x11/ext/screen-saver.js b/lib/ext/screen-saver.js similarity index 100% rename from lib/x11/ext/screen-saver.js rename to lib/ext/screen-saver.js diff --git a/lib/x11/ext/shape.js b/lib/ext/shape.js similarity index 100% rename from lib/x11/ext/shape.js rename to lib/ext/shape.js diff --git a/lib/x11/ext/xc-misc.js b/lib/ext/xc-misc.js similarity index 100% rename from lib/x11/ext/xc-misc.js rename to lib/ext/xc-misc.js diff --git a/lib/x11/ext/xtest.js b/lib/ext/xtest.js similarity index 100% rename from lib/x11/ext/xtest.js rename to lib/ext/xtest.js diff --git a/lib/x11/handshake.js b/lib/handshake.js similarity index 100% rename from lib/x11/handshake.js rename to lib/handshake.js diff --git a/lib/x11/hexy.js b/lib/hexy.js similarity index 100% rename from lib/x11/hexy.js rename to lib/hexy.js diff --git a/lib/x11/index.js b/lib/index.js similarity index 100% rename from lib/x11/index.js rename to lib/index.js diff --git a/lib/x11/keysyms.js b/lib/keysyms.js similarity index 100% rename from lib/x11/keysyms.js rename to lib/keysyms.js diff --git a/lib/x11/stdatoms.js b/lib/stdatoms.js similarity index 100% rename from lib/x11/stdatoms.js rename to lib/stdatoms.js diff --git a/lib/x11/unpackbuffer.js b/lib/unpackbuffer.js similarity index 100% rename from lib/x11/unpackbuffer.js rename to lib/unpackbuffer.js diff --git a/lib/x11/unpackstream.js b/lib/unpackstream.js similarity index 100% rename from lib/x11/unpackstream.js rename to lib/unpackstream.js diff --git a/lib/x11/xcore.js b/lib/xcore.js similarity index 100% rename from lib/x11/xcore.js rename to lib/xcore.js diff --git a/lib/x11/xerrors.js b/lib/xerrors.js similarity index 100% rename from lib/x11/xerrors.js rename to lib/xerrors.js diff --git a/lib/x11/xproto2js.pl b/lib/xproto2js.pl similarity index 100% rename from lib/x11/xproto2js.pl rename to lib/xproto2js.pl diff --git a/lib/x11/xserver.js b/lib/xserver.js similarity index 100% rename from lib/x11/xserver.js rename to lib/xserver.js diff --git a/lib/x11/xutil.js b/lib/xutil.js similarity index 100% rename from lib/x11/xutil.js rename to lib/xutil.js diff --git a/package.json b/package.json index 3cf9a1a..97a454c 100644 --- a/package.json +++ b/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": "*", diff --git a/test/connect.js b/test/connect.js index 0d1820e..4ce9c33 100644 --- a/test/connect.js +++ b/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'); diff --git a/test/connection-utils.js b/test/connection-utils.js index 6a25ad5..ef1bd2c 100644 --- a/test/connection-utils.js +++ b/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'); diff --git a/test/core-CreateWindow.js b/test/core-CreateWindow.js index 2182c3c..1cbc04e 100644 --- a/test/core-CreateWindow.js +++ b/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'); diff --git a/test/core-ForceScreenSaver.js b/test/core-ForceScreenSaver.js index 20ddfe6..52de60f 100644 --- a/test/core-ForceScreenSaver.js +++ b/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'); diff --git a/test/core-KillKlient.js b/test/core-KillKlient.js index 898cb70..551f8f2 100644 --- a/test/core-KillKlient.js +++ b/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'); diff --git a/test/core-properties.js b/test/core-properties.js index 5ce3a8e..a97f35a 100644 --- a/test/core-properties.js +++ b/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'); diff --git a/test/dpms.js b/test/dpms.js index d875343..d231d37 100644 --- a/test/dpms.js +++ b/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'); diff --git a/test/errors.js b/test/errors.js index 7b971a7..3ac867a 100644 --- a/test/errors.js +++ b/test/errors.js @@ -1,4 +1,4 @@ -var x11 = require('../lib/x11'); +var x11 = require('../lib'); var should = require('should'); var assert = require('assert'); diff --git a/test/sequence-overflow.js b/test/sequence-overflow.js index 5ae50ad..0bfd6ab 100644 --- a/test/sequence-overflow.js +++ b/test/sequence-overflow.js @@ -1,4 +1,4 @@ -var x11 = require('../lib/x11'); +var x11 = require('../lib'); var should = require('should'); var assert = require('assert'); diff --git a/test/xtest.js b/test/xtest.js index df6e867..65c79df 100644 --- a/test/xtest.js +++ b/test/xtest.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');