Parse FocusIn and FocusOut events

Update async to the latest version 🚀

.gitignore

@@ -0,0 +1,4 @@
+*.log
+yarn.lock
+package-lock.json
+node_modules

.travis.yml

@@ -1,7 +1,16 @@
 before_script:
-  - "export DISPLAY=:99.0"
+  - "export XAUTHORITY=/tmp/.Xauthority-Xvfb"
-  - "sh -e /etc/init.d/xvfb start"
+  - "xauth add :99 . $(mcookie)"
+  - "xauth add 127.0.0.2:99 . $(mcookie)"
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -nolisten $NOLISTEN -auth $XAUTHORITY"
+  - "sleep 1"
+
+env:
+  - NOLISTEN=tcp DISPLAY=:99.0
+#  - NOLISTEN=unix DISPLAY=:99.0
+#  - NOLISTEN=unix DISPLAY=127.0.0.2:99.0
 
 language: node_js
 node_js:
-   - 0.8
+   - '12'
+   - '14'

Changelog.md

@@ -0,0 +1,2 @@
+1.0.3 - 19/02/2015
+  - cleanup debug logs               #83

README.md

@@ -1,73 +1,119 @@
-# About
+# node-x11
- X11 protocol client for node.js
 
- Implements core X11 protocol, as well as Xrender, Damage, Composite, Big-Requests, Dpms, Screensaver, XFixes, Shape, XTest, XC-Misc, GLX and Apple-WM extensions.
+X11 protocol client for Node.js: implements the core X11 protocol, as well as Xrender, Damage, Composite, Big-Requests, Dpms, Screensaver, XFixes, Shape, XTest, XC-Misc, GLX, and Apple-WM extensions.
-# install
-
-`npm install x11`
-
-Windows users:
-1) install [XMing](http://www.straightrunning.com/XmingNotes/) or [Cygwin/X](http://x.cygwin.com/)
-2) get node-x11 copy (using [git](http://code.google.com/p/msysgit/downloads/list?can=3) or from [Github](https://github.com/sidorares/node-x11/archives/master ))
-
-#CI build status:
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sidorares/node-x11?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://secure.travis-ci.org/sidorares/node-x11.png)](http://travis-ci.org/sidorares/node-x11)
 
-# example
+## Install
+
+    npm install x11
+
+Windows users:
+
+1.  install [XMing](http://www.straightrunning.com/XmingNotes/) or [Cygwin/X](http://x.cygwin.com/)
+2.  get node-x11 copy (using [git](http://code.google.com/p/msysgit/downloads/list?can=3) or from [Github](https://github.com/sidorares/node-x11/archives/master))
+
+## Example
 
 Core requests usage:
 
-    var x11 = require('x11');
+```js
+var x11 = require('x11');
 
-    var Exposure = x11.eventMask.Exposure;
+var Exposure = x11.eventMask.Exposure;
-    var PointerMotion = x11.eventMask.PointerMotion;
+var PointerMotion = x11.eventMask.PointerMotion;
 
-    x11.createClient(function(err, display) {
+x11.createClient(function(err, display) {
-        if (!err) {
+  if (!err) {
-            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();
-            X.CreateWindow(
+    X.CreateWindow(
-                wid, root,        // new window id, parent
+      wid,
-                0, 0, 100, 100,   // x, y, w, h
+      root, // new window id, parent
-                0, 0, 0, 0,       // border, depth, class, visual
+      0,
-                { eventMask: Exposure|PointerMotion } // other parameters
+      0,
-            );
+      500,
-            X.MapWindow(wid);
+      500, // x, y, w, h
-            var gc = X.AllocID();
+      0,
-            X.CreateGC(gc, wid);
+      0,
-            X.on('event', function(ev) {
+      0,
-                if (ev.type == 12)
+      0, // border, depth, class, visual
-                {
+      { eventMask: Exposure | PointerMotion } // other parameters
-                    X.PolyText8(wid, gc, 50, 50, ['Hello, Node.JS!']);
+    );
-                }
+    X.MapWindow(wid);
-            });
+    var gc = X.AllocID();
-            X.on('error', function(e) {
+    X.CreateGC(gc, wid);
-                console.log(e);
+    var white = display.screen[0].white_pixel;
-            });
+    var black = display.screen[0].black_pixel;
-	    } else {
+    cidBlack = X.AllocID();
-		    console.log(err);
+    cidWhite = X.AllocID();
-        }
+    X.CreateGC(cidBlack, wid, { foreground: black, background: white });
+    X.CreateGC(cidWhite, wid, { foreground: white, background: black });
+    X.on('event', function(ev) {
+      if (ev.type == 12) {
+        X.PolyFillRectangle(wid, cidWhite, [0, 0, 500, 500]);
+        X.PolyText8(wid, cidBlack, 50, 50, ['Hello, Node.JS!']);
+      }
     });
+    X.on('error', function(e) {
+      console.log(e);
+    });
+  } else {
+    console.log(err);
+  }
+});
+```
 
-# Screenshots
+## Screenshots
 
-  ![tetris game](https://lh6.googleusercontent.com/-RCRY9A7WwnA/Tlww0FHP7NI/AAAAAAAAAwo/nxfSxsw6xow/s400/tetris.png)
+![tetris game](https://lh6.googleusercontent.com/-RCRY9A7WwnA/Tlww0FHP7NI/AAAAAAAAAwo/nxfSxsw6xow/s400/tetris.png)
-  ![XRENDER gradients](https://lh4.googleusercontent.com/-VS0BMYYmq6M/Tlww0Y1ij0I/AAAAAAAAAws/pVWsPZ63Yeo/s400/render-gradients.png)
+![XRENDER gradients](https://lh4.googleusercontent.com/-VS0BMYYmq6M/Tlww0Y1ij0I/AAAAAAAAAws/pVWsPZ63Yeo/s400/render-gradients.png)
-  ![OpenGL glxgears](http://img-fotki.yandex.ru/get/4123/37511094.30/0_81712_6c2ebb11_L)
+![OpenGL glxgears](http://img-fotki.yandex.ru/get/4123/37511094.30/0_81712_6c2ebb11_L)
-  ![OpenGL teapot](http://img-fotki.yandex.ru/get/4132/37511094.30/0_81713_82a5ac48_L)
+![OpenGL teapot](http://img-fotki.yandex.ru/get/4132/37511094.30/0_81713_82a5ac48_L)
 
-# Protocol documentation
+## In use
 
-  - http://www.x.org/releases/X11R7.6/doc/
+- [ntk](https://github.com/sidorares/ntk) - higher level toolkit on top of X11
-  - http://www.x.org/releases/X11R7.6/doc/xproto/x11protocol.pdf
+- [node-remote](https://github.com/AndrewSwerlick/node-remote) - media center controller
-  - C Xlib to X11 request mapping table http://tronche.com/gui/x/xlib/appendix/a.html
+- [tiles](https://github.com/dominictarr/tiles) - tiling window manager
+- [vnc](https://github.com/sidorares/node-vnc) - vnc client.
+- [node-ewmh](https://github.com/santigimeno/node-ewmh) - set of EWMH helpers.
+- [OdieWM](https://github.com/bu/OdieWM) - window manager
+- [Dbusmenu](https://github.com/sidorares/node-dbusmenu) - unity global menu client.
+- [AirWM](https://github.com/AirWM/AirWM) - tiling window manager
+- [npdf](https://github.com/sidorares/npdf) - pdf viewer
+- [tinywm](https://github.com/Airblader/node-tinywm) The famous [TinyWM](https://github.com/mackstann/tinywm) written in node.js
+- [basedwm](https://github.com/anko/basedwm) Infinite-desktop panning X window manager in LiveScript
 
-# Other implementations
+## X11 resources/documentation:
 
-  - C: XLib - http://www.sbin.org/doc/Xlib/ http://www.tronche.com/gui/x/xlib/ http://www.x.org/docs/X11/xlib.pdf
+- [Xplain](https://github.com/magcius/xplain) - A series of articles to help explain the X Window System http://magcius.github.io/xplain/article/
-  - C: XCB - http://xcb.freedesktop.org/
+- [Official X11 docs](http://www.x.org/releases/X11R7.6/doc/)
-  - Python:  http://sourceforge.net/projects/python-xlib/ ( github fork: https://github.com/Ademan/python-xlib-branch pypi: http://pypi.python.org/pypi/Python%20Xlib )
+- [protocol specification](http://www.x.org/releases/X11R7.6/doc/xproto/x11protocol.pdf)
-  - Python/twisted:  https://launchpad.net/twisted-x11
+- C Xlib to X11 request mapping table http://tronche.com/gui/x/xlib/appendix/a.html
-  - Perl: http://search.cpan.org/~smccam/X11-Protocol-0.56/Protocol.pm
+- [How to write composite manager](http://www.talisman.org/~erlkonig/misc/x11-composite-tutorial/)
+- [Extended Window Manager Hints specification](http://standards.freedesktop.org/wm-spec/wm-spec-1.3.html)
+
+## Other implementations
+
+- C: XLib - http://www.sbin.org/doc/Xlib/ http://www.tronche.com/gui/x/xlib/ http://www.x.org/docs/X11/xlib.pdf
+- C: XCB - http://xcb.freedesktop.org/
+- Python: http://sourceforge.net/projects/python-xlib/ ( github fork: https://github.com/Ademan/python-xlib-branch pypi: http://pypi.python.org/pypi/Python%20Xlib )
+- https://github.com/alexer/python-xlib-render
+- Python/twisted: https://launchpad.net/twisted-x11
+- Perl: http://search.cpan.org/~smccam/X11-Protocol-0.56/Protocol.pm
+- Go: https://github.com/BurntSushi/xgb
+- Java: https://github.com/xderoche/J11
+- Ruby: https://github.com/dj2/x-ruby-bindings
+- Clojure: https://github.com/noodlewiz/xcljb
+- Guile: https://github.com/mwitmer/guile-xcb
+- Emacs lisp: https://github.com/ch11ng/xelb ( autogenerated from XCB XML )
+
+## Server side (protocol + functionality) implementations for js + DOM
+
+would be really great to make completely web based playground page, connecting node-x11 api to DOM based implementation
+
+- https://github.com/GothAck/javascript-x-server
+- https://github.com/ttaubert/x-server-js

autogen/generate.js

@@ -252,7 +252,7 @@ function genReq(req, last)
    if (req.body.length == 0)
    {       
        result.push('  function() {');
-       result.push('     return new Buffer([' + req.opcode + ', 0, 1, 0]);');
+       result.push('     return Buffer.from([' + req.opcode + ', 0, 1, 0]);');
    } else {
    result.push('  function (args) {');
    result.push('    var extraLength = 0;');
@@ -287,10 +287,10 @@ function genReq(req, last)
    var reqLen4 = ((reqLen + 3) >> 2);
 
    if (extraLength)
-     result.push('    var data = new Buffer(' + reqLen + ' + extraLength);');
+     result.push('    var data = Buffer.alloc(' + reqLen + ' + extraLength);');
    else {
      result.pop(); 
-     result.push('    var data = new Buffer(' + reqLen + ');');
+     result.push('    var data = Buffer.alloc(' + reqLen + ');');
    } 
    result.push('    data[0] = ' + req.opcode + ';');
    if (req.body.length != 0) {

examples/kbdheatmap/kbdheatmap.js

@@ -12,7 +12,7 @@ var ButtonRelease = x11.eventMask.ButtonRelease;
 // image and coords file from http://www.patrick-wied.at/projects/heatmap-keyboard/
 // TODO: add simple tool to use&tag coords in own keyboard photo
 // jpeg decoder is slightly modified version of https://github.com/notmasteryet/jpgjs
-var kbdImg = require('./node-jpg').readJpeg('./keyboard.jpg');
+var kbdImg = require('./node-jpg').readJpeg(__dirname+'/keyboard.jpg');
 var keycoords = require('./coordinates');
 
 // from https://github.com/substack/node-keysym
@@ -26,9 +26,9 @@ var kk2name = {};
 x11.createClient(function(err, display)
 {
     var X = display.client;
-    X.require('big-requests', function(BigReq) 
+    X.require('big-requests', function(err, BigReq)
     {
-        X.require('render', function(Render) {
+        X.require('render', function(err, Render) {
             X.Render = Render;
             BigReq.Enable(function(err, maxLen)
             {

examples/kbdheatmap/node-jpg.js

@@ -571,7 +571,7 @@ module.exports.readJpeg = function(path)
     var imageData = {};
     imageData.width = j.width;
     imageData.height = j.height;
-    imageData.data = new Buffer(j.width*j.height*4);
+    imageData.data = Buffer.from(j.width*j.height*4);
     j.copyToImageData(imageData);
     return imageData;
 }

examples/key-recognition.js

@@ -0,0 +1,69 @@
+var x11 = require('..');
+
+// The list provided by GetKeyboardMapping has sublists where each position
+// represents the result for some key composition.
+keyComposition = [
+  'Key',
+  'shift + Key',
+  'modeSwitch + Key',
+  'modeSwitch + shift + Key',
+  'altGr + Key',
+  'altGr + shift + Key'
+]
+
+x11.createClient(function(err, display){
+  if (err) throw err
+
+  var min = display.min_keycode,  // TODO: explain min_keycode
+      max = display.max_keycode,  // TODO: explain max_keycode
+      chr2Data = [],              // allow us to find a char by the charcode
+      key2Data = [];              // associate chars to a keycode
+
+  // The keySyms is a hash of mnemonic char names, associated to an integer
+  // charcode and its description.
+  for (codeName in x11.keySyms) {
+    keyData = x11.keySyms[codeName];
+    chr2Data[keyData.code] = { codeName: codeName, description: keyData.description };
+  }
+
+  var X = display.client,
+      wid = X.AllocID(),                     // Get a free integer id to a new window.
+      root = display.screen[0].root,         // The mother window. Like your window manager.
+      evKeyPress = x11.eventMask.KeyPress,   // Allow to filter for KeyPress events.
+      white = display.screen[0].white_pixel; // Will paint the window.
+
+  // Get the local key mapping to build key2Data.
+  X.GetKeyboardMapping(min, max-min, function(err, list) {
+    for (var i=0; i < list.length; ++i) {
+      var name = key2Data[i+min] = [];
+      var sublist = list[i];
+      for (var j=0; j < sublist.length; ++j)
+        name.push(chr2Data[sublist[j]]);
+    }
+  });
+
+  // Launch a window to listen by key events:
+  X.CreateWindow(wid, root, 0, 0, 100, 100, 0, 0, 0, 0, { backgroundPixel: white, eventMask: evKeyPress });
+  X.MapWindow(wid);
+
+  X.on('event', function(ev) {
+    if (ev.type == 2) {  // filter by KeyPress. Useful if you have a more open eventMask.
+      var key = key2Data[ev.keycode];  // key is a list of chars related to the pressed key.
+      if (key) {
+        console.log('\n>> key pressed:', ev.keycode);
+        for (var i=0; i<key.length; i++) // Describe each related char
+          if (key[i])
+            console.log(
+              key[i].codeName, '\t', (
+                key[i].description ? key[i].description : 'no description'
+              ), (
+                keyComposition[i] ? '\t' + keyComposition[i] : ''
+              )
+            );
+      }
+      else
+        console.log('>> keyCode '+ ev.keycode +' was not recognized.');
+    }
+  });
+
+});

examples/opengl/glxgears.js

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

examples/opengl/test1.js

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

examples/opengl/tp2.js

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

examples/opengl/triangle.js

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

examples/paint.js

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

examples/png/node-png.js

@@ -874,7 +874,7 @@ module.exports.readPng = function(path)
     var imageData = {};
     imageData.width = j.width;
     imageData.height = j.height;
-    imageData.data = new Buffer(j.width*j.height*4);
+    imageData.data = Buffer.alloc(j.width*j.height*4);
     j.render(imageData);
     return imageData;
 }

examples/png/png-decoder.js

@@ -0,0 +1,344 @@
+/*
+ * Simple png decoder 
+ * https://github.com/b37t1td/png-decoder
+ */
+
+var CRCTable = new Int32Array([
+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+  0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+  0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+  0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+  0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+  0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+  0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+  0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+  0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+  0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+  0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+  0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+  0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+  0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+  0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+  0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+  0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+  0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+  0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+  0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+  0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+  0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+]);
+
+var crc32 = function(buf) {
+  var crc = -1;
+  for (var i = 0; i < buf.length; i++) {
+    crc = CRCTable[(crc ^ buf[i]) & 0xff] ^ (crc >>> 8);
+  }
+  return crc ^ -1;
+};
+
+/*
+ * BE byteArray implementation
+ * by Svetlana Linuxenko <linuxenko@yahoo.com>
+ */
+
+/* eslint no-undef: 0 */
+var byteArray = Uint8Array;
+
+var cmp = function(a, b) {
+  if (!b) b = a; a = this;
+  return a.filter(function(c,i) { return c === b[i]; }).length === a.length;
+};
+
+var toInt = function(a) {
+  if (!a) a = this.slice(this.off, 4);
+  return (a[0] << 24) | (a[1] << 16) | (a[2] << 8) | a[3];
+  //return a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24);
+};
+
+var toBytes = function(int) {
+  return new byteArray([
+    (int >> 24) & 0xff,
+    (int >> 16) & 0xff,
+    (int >> 8) & 0xff,
+    int & 0xff
+  ]);
+};
+
+var nextInt = function() {
+  return this.toInt(this.slice(this.off, (this.off += 4)));
+};
+
+var nextIntBytes = function() {
+  return this.nextBytes(4);
+};
+
+var nextBytes = function(size) {
+  return this.slice(this.off, (this.off += size));
+};
+
+var nextByte = function() {
+  return this.nextBytes(1)[0];
+};
+
+var insertInt = function(int) {
+  this.insertBytes(this.toBytes(int));
+};
+
+var insertBytes = function(bytes, length) {
+  length = length || 4;
+  this.set(bytes, this.off, length);
+  this.off += length;
+};
+
+var insertByte = function(byte) {
+  this.set([byte], this.off, (this.off += 1));
+};
+
+byteArray.prototype.cmp = cmp;
+byteArray.prototype.toInt = toInt;
+byteArray.prototype.nextInt = nextInt;
+byteArray.prototype.nextIntBytes = nextIntBytes;
+byteArray.prototype.toBytes = toBytes;
+byteArray.prototype.insertInt = insertInt;
+byteArray.prototype.insertBytes = insertBytes;
+byteArray.prototype.nextBytes = nextBytes;
+byteArray.prototype.nextByte = nextByte;
+byteArray.prototype.insertByte = insertByte;
+
+Object.defineProperty(byteArray.prototype , 'off', {
+  enumerable: false,
+  configurable: false,
+  writable: true,
+  value : 0
+});
+
+
+var SIGNATURE = new byteArray([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+var IHDR = new byteArray([0x49, 0x48, 0x44, 0x52]);
+var IDAT = new byteArray([0x49, 0x44, 0x41, 0x54]);
+var IEND = new byteArray([0x49, 0x45, 0x4e, 0x44]);
+
+
+/*
+ * Decoder
+ */
+var zlib = require('zlib');
+
+var inflateFunction = function(data) {
+  return zlib.inflateSync(Buffer.from(data));
+};
+
+
+var Decoder = function() { };
+
+Decoder.prototype.parse = function(data) {
+  if (!(data instanceof byteArray)) {
+    data = new byteArray(data);
+  }
+
+  if (!SIGNATURE.cmp(data.nextBytes(SIGNATURE.length))) {
+    throw new Error('Not png');
+  }
+
+  while (data.off < data.length) {
+    var len = data.nextInt();
+    var hdr = data.nextBytes(len + 4);
+
+    if (crc32(hdr) !== data.nextInt()) {
+      throw new Error('Crc error');
+    }
+
+    if (IHDR.cmp(hdr)) {
+      this._IHDR = this._chunkIHDR(hdr.slice(4, len + 4));
+
+      if (this._IHDR.palette !== 8) {
+        throw new Error('Depth error');
+      }
+
+      if (this._IHDR.compression !== 0) {
+        throw new Error('Compression error');
+      }
+
+      if (this._IHDR.filter !== 0) {
+        throw new Error('Filter error');
+      }
+
+      if (this._IHDR.interlace !== 0) {
+        throw new Error('Interlace error');
+      }
+
+      switch (this._IHDR.colorType){
+        case 0: this.bpp = 1; break;
+        case 2: this.bpp = 3; break;
+        case 3: this.bpp = 1; break;
+        case 4: this.bpp = 2; break;
+        case 6: this.bpp = 4; break;
+        default: throw new Error('ColorType error');
+      }
+      this.chunks = [];
+    }
+
+    if (IDAT.cmp(hdr)) {
+      if (!this._IHDR) {
+        throw new Error('IHDR error');
+      }
+
+      this._chunkIDAT(hdr.slice(4, len + 4));
+    }
+
+    if (IEND.cmp(hdr)) {
+      return this._chunkIEND();
+    }
+  }
+
+  throw new Error('Data error');
+};
+
+Decoder.prototype._chunkIEND = function() {
+  var tmp = [];
+  for (var i = 0; i < this.chunks.length; i++) {
+    for (var j = 0; j < this.chunks[i].length; j++) {
+      tmp.push(this.chunks[i][j]);
+    }
+  }
+  return this.filter(inflateFunction(tmp));
+};
+
+Decoder.prototype._chunkIDAT = function(chunk) {
+  this.chunks.push(chunk);
+};
+
+Decoder.prototype._chunkIHDR = function(chunk) {
+  return {
+    width : chunk.nextInt(),
+    height : chunk.nextInt(),
+    palette : chunk.nextByte(),
+    colorType : chunk.nextByte(),
+    compression : chunk.nextByte(),
+    filter : chunk.nextByte(),
+    interlace : chunk.nextByte()
+  };
+};
+
+Decoder.prototype.filter = function(data) {
+  var bpp = this.bpp;
+  var width = this._IHDR.width, height = this._IHDR.height;
+  var pixels = new byteArray((width * height) * bpp);
+  var filter, line, left, leftup, up, pixel;
+  var lineWidth = width * bpp, byte, off;
+
+  for (var y = 0; y < height; y++) {
+
+    filter = data.nextByte();
+    line = data.nextBytes(lineWidth);
+
+    for (var x = 0; x < lineWidth; x++) {
+
+      if (filter !== 0) {
+        off = (y * lineWidth) + x;
+      }
+
+      byte = line.nextByte();
+
+      switch(filter) {
+        case 0: //None
+          pixel = byte;
+          break;
+        case 1: // Sub  Raw(x) + Raw(x - bpp)
+          if (x < bpp) {
+            pixel = byte;
+            break;
+          }
+          pixel = pixels[off - bpp] + byte & 0xff;
+          break;
+        case 2: // Up(x) = Raw(x) + Prior(x)
+          if (y === 0) {
+            pixel = byte;
+            break;
+          }
+          pixel = pixels[off - lineWidth] + byte & 0xff;
+          break;
+        case 3: // Average(x) = Raw(x) + floor((Raw(x-bpp)+Prior(x))/2)
+          if (y === 0) {
+            if (x < bpp) {
+              pixel = byte;
+            } else {
+              pixel = (byte + (pixels[off - bpp] >> 1)) & 0xff;
+            }
+            break;
+          }
+
+          if (x < bpp) {
+            pixel = (byte + (pixels[off - lineWidth] >> 1)) & 0xff;
+            break;
+          }
+
+          pixel = (byte + (pixels[off - bpp] + pixels[off - lineWidth] >> 1)) & 0xff;
+          break;
+        case 4: // Paeth
+          if (y === 0) {
+            if (x < bpp) {
+              pixel = byte;
+            } else {
+              pixel = (byte + (pixels[off - bpp])) & 0xff;
+            }
+            break;
+          }
+
+          if (x < bpp) {
+            pixel = (byte + (pixels[off - lineWidth])) & 0xff;
+            break;
+          }
+
+          up =  pixels[off - lineWidth];
+          left =  pixels[off - bpp];
+          leftup = pixels[(off - lineWidth) - bpp];
+
+          var p = left + up - leftup,
+            pleft = Math.abs(p - left),
+            pup = Math.abs(p - up),
+            pleftup = Math.abs(p - leftup);
+
+          if (pleft <= pup && pleft <= pleftup){
+            pixel = byte + left & 0xff;
+            break;
+          } else if (pup <= pleftup) {
+            pixel = byte + up & 0xff;
+            break;
+          }
+
+          pixel = byte + leftup & 0xff;
+          break;
+        default:
+          throw new Error('Filter error: ' + filter);
+      }
+
+      pixels.insertByte(pixel);
+    }
+  }
+
+  return pixels;
+};
+
+module.exports = Decoder;

examples/png/test.js

@@ -1,94 +1,47 @@
-//var logo = require('./node-png').readPng('./node-logo.png');
+var logo = require('./node-png').readPng('./node-logo.png');
+
 var x11 = require('../../lib');
 
 var Exposure = x11.eventMask.Exposure;
-var KeyPress = x11.eventMask.KeyPress;
-var KeyRelease = x11.eventMask.KeyRelease;
-var ButtonPress = x11.eventMask.ButtonPress;
-var ButtonRelease = x11.eventMask.ButtonRelease;
-var PointerMotion = x11.eventMask.PointerMotion;
-
-var interv = 0;
-var total_frames = 0;
-var last_frames = 0;
 
 x11.createClient(function(err, display)
 {
-
+  var X = display.client;
-    console.log('111111');
+  X.require('render', function(err, Render) {
-    var X = display.client;
+    var root = display.screen[0].root;
-    X.require('big-requests', function(BigReq)
+    main(root, X, Render);
-    {
+  });
-         X.require('render', function(Render) {
-             X.Render = Render;
-             BigReq.Enable(function(err, maxLen)
-             {      
-
-      console.log('222222');
- 
-      var root = display.screen[0].root;
-      var white = display.screen[0].white_pixel;
-      var black = display.screen[0].black_pixel;
-  
-      var win, picWin, piclogoi, pic;
-
-
-      function showpic(path)
-      {
-
-      console.log(path);
-
-      pic = require('./node-png').readPng(path);
-          /*
-          var d = pic.data; var l = pic.data.length;
-          for (var p=0; p < l; p+=4)
-          {
-              b = d[p];
-              d[p] = d[p+2];
-              d[p+2] = b;
-          }
-          */
-
-      console.log(pic);
-      win = X.AllocID();
-      X.CreateWindow(
-         win, root,
-         0, 0, pic.width, pic.height,
-         0, 0, 0, 0,
-         {
-             backgroundPixel: white, eventMask: Exposure|KeyPress|ButtonPress|PointerMotion
-         }
-      );
-      X.MapWindow(win);
-
-      X.gc = X.AllocID();
-      X.CreateGC(X.gc, win);
-
-      //X.PutImage(2, win, X.gc, pic.width, pic.height, 0, 0, 0, 24, pic.data);
-      //piclogo = X.AllocID();
-      //Render.CreatePicture(piclogo, pixmaplogo, Render.rgb24);
-      //picWin = X.AllocID();
-      //Render.CreatePicture(picWin, win, Render.rgb24);
-
-      }
-
-      
-      showpic(process.argv[2]);
-
-
-X.on('event', function(ev) {
-        if (ev.type == 12) // expose
-        {
-             X.PutImage(2, win, X.gc, pic.width, pic.height, 0, 0, 0, 24, pic.data);
-             //Render.Composite(3, piclogo, 0, picWin, 0, 0, 0, 0, 0, 0, logo.width, logo.height);
-        }
 });
 
-X.on('error', function(err) {
-    console.log(err);
-});
 
-             });
+function main(root, X, Render) {
-         });
+
-    });
+  var win, picWin, pic, gc;
-});
+
+  win = X.AllocID();
+  X.CreateWindow(
+     win, root,
+     0, 0, logo.width, logo.height,
+     0, 0, 0, 0,
+     { eventMask: Exposure }
+  );
+  X.MapWindow(win);
+
+  gc = X.AllocID();
+  X.CreateGC(gc, win);
+
+  var logoPixmap = X.AllocID();
+  X.CreatePixmap(logoPixmap, win, 24, logo.width, logo.height);
+  // TODO: add proper png pixel conversion here
+  X.PutImage(2, logoPixmap, gc, logo.width, logo.height, 0, 0, 0, 24, logo.data);
+
+  var logoPicture = X.AllocID();
+  Render.CreatePicture(logoPicture, logoPixmap, Render.rgb24);
+  var winPicture = X.AllocID();
+  Render.CreatePicture(winPicture, win, Render.rgb24);
+
+  X.on('event', function(ev) {
+    if (ev.name == 'Expose')
+      Render.Composite(3, logoPicture, 0, winPicture, 0, 0, 0, 0, 0, 0, logo.width, logo.height);
+  });
+}

examples/png/test1.js

@@ -0,0 +1,80 @@
+//var logo = require('./node-png').readPng('./node-logo.png');
+var fs = require('fs');
+var Decoder = require('./png-decoder');
+var decoder = new Decoder();
+
+var logo = {
+  data : Buffer.from(decoder.parse(fs.readFileSync('./screen.png'))),
+  width : decoder._IHDR.width,
+  height : decoder._IHDR.height
+};
+
+var x11 = require('../../lib');
+
+var Exposure = x11.eventMask.Exposure;
+
+x11.createClient(function(err, display)
+{
+  var X = display.client;
+  X.require('render', function(err, Render) {
+    var root = display.screen[0].root;
+    main(root, X, Render, display);
+  });
+});
+
+
+function main(root, X, Render, display) {
+
+  var win, picWin, pic, gc;
+
+  win = X.AllocID();
+  X.CreateWindow(
+     win, root,
+     0, 0, logo.width, logo.height,
+     0, 0, 0, 0,
+     { eventMask: Exposure }
+  );
+  X.MapWindow(win);
+
+  gc = X.AllocID();
+  X.CreateGC(gc, win);
+
+  var logoPixmap = X.AllocID();
+  X.CreatePixmap(logoPixmap, win, 24, logo.width, logo.height);
+
+  var rscreen = display.screen[0];
+  var screen =
+    rscreen.depths[rscreen.root_depth][
+      Object.keys(rscreen.depths[rscreen.root_depth])[0]];
+
+  var rmask = parseInt(screen.red_mask, 10);
+  var gmask = parseInt(screen.green_mask, 10);
+  var bmask = parseInt(screen.blue_mask, 10);
+
+  for (var y = 0; y < logo.height; y++) {
+    for (var x = 0; x < logo.width; x++) {
+      var pixel = Buffer.from([
+        logo.data[(x + logo.width * y) * 4],
+        logo.data[(x + logo.width * y) * 4 + 1],
+        logo.data[(x + logo.width * y) * 4 + 2], 0]).readInt32LE();
+
+      logo.data[(x + logo.width * y) * 4 ] = (pixel & rmask) >> 16;
+      logo.data[(x + logo.width * y) * 4 + 1] = (pixel & gmask) >> 8;
+      logo.data[(x + logo.width * y) * 4 + 2] = (pixel & bmask) >> 0;
+      logo.data[(x + logo.width * y) * 4 + 3] = 0x00;
+    }
+  }
+
+  X.PutImage(2, logoPixmap, gc, logo.width, logo.height, 0, 0, 0, 24, logo.data);
+
+  var logoPicture = X.AllocID();
+  Render.CreatePicture(logoPicture, logoPixmap, Render.rgb24);
+  var winPicture = X.AllocID();
+  Render.CreatePicture(winPicture, win, Render.rgb24);
+
+  X.on('event', function(ev) {
+    if (ev.name == 'Expose') {
+      Render.Composite(3, logoPicture, 0, winPicture, 0, 0, 0, 0, 0, 0, logo.width, logo.height);
+    }
+  });
+}

examples/screenshot.js

@@ -11,13 +11,13 @@ x11.createClient(function(err, display) {
     X.CreateGC(gc, id);
     var width = 0;
     var hwight = 0;
-    X.GetGeometry(id, function(clientGeom) { 
+    X.GetGeometry(id, function(err, clientGeom) {
         width = clientGeom.width;
         height = clientGeom.height;
 
 
             var dispwin = X.AllocID();
-            X.CreateWindow(dispwin, root, 0, 0, width, height, 1, 1, 0, { eventMask: x11.eventMask.Exposure });
+            X.CreateWindow(dispwin, root, 0, 0, width, height, 0, 0, 0, 0, { eventMask: x11.eventMask.Exposure });
             X.MapWindow(dispwin);
             //X.CopyArea(idScreenshot, dispwin, gc, 0, 0, 0, 0, width, height);
 
@@ -35,10 +35,10 @@ x11.createClient(function(err, display) {
             if (win == dispwin)
                 return drawWithKids(list, cb);
 
-            X.GetWindowAttributes(win, function(res) {
+            X.GetWindowAttributes(win, function(err, res) {
                 if (res[8] == 0)
                     return drawWithKids(list, cb);
-                X.GetGeometry(win, function(geom) {
+                X.GetGeometry(win, function(err, geom) {
                     // (srcDrawable, dstDrawable, gc, srcX, srcY, dstX, dstY, width, height)
                     if (win != root)
                         X.CopyArea(win, dispwin, gc, 0, 0, p.x + geom.xPos, p.y + geom.yPos, geom.width, geom.height);
@@ -71,7 +71,11 @@ x11.createClient(function(err, display) {
 
         });
         */
-        X.GetImage(2, root, 0, 0, width, height, 0xffffffff, function(image) {
+        X.GetImage(2, id, 0, 0, width, height, 0xffffffff, function(err, image) {
+            if (err) {
+              console.log(err);
+              process.exit(1);
+            }
             console.log(image);
             // format, drawable, gc, width, height, dstX, dstY, leftPad, depth, data
             X.PutImage(2, dispwin, gc, width, height, 0, 0, 0, 24, image.data);

examples/simple/gcinvert.js

@@ -0,0 +1,36 @@
+/*
+ * GCFunction usage example
+ */
+var x11 = require('../../lib');
+
+x11.createClient(function(err, display) {
+  var X = display.client;
+  var root = display.screen[0].root;
+  var white = display.screen[0].white_pixel;
+  var black = display.screen[0].black_pixel;
+
+  var wid = X.AllocID();
+  X.CreateWindow(wid, root, 0, 0, 400, 300, 0, 0, 0, 0, { 
+    backgroundPixel: black,
+    eventMask: x11.eventMask.ButtonPress|x11.eventMask.Exposure });
+  var gc = X.AllocID();
+  X.CreateGC(gc, wid, {foreground : white, 'function' : x11.gcFunction.GXinvert});
+  X.MapWindow(wid);
+
+
+  X.on('event', function(ev) {
+
+    if (ev.type === 12) {
+      X.PolyFillRectangle(wid, gc, [0, 0, 400, 300]);
+    }
+
+    if (ev.type === 4) {
+      var x = ev.x;
+      var y = ev.y;
+
+      X.PolyFillRectangle(wid, gc, [x - 25, y - 25, 50, 50]);
+    }
+
+  });
+});
+

examples/simple/gradients.js

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

examples/simple/render.js

@@ -4,10 +4,10 @@ var PointerMotion = x11.eventMask.PointerMotion;
 var xclient = x11.createClient(function(err, display) {
     var X = display.client;
     var root = display.screen[0].root;
-    display.client.require('render', function(Render) {
+    display.client.require('render', function(err, Render) {
         var wid = X.AllocID();
         var white = display.screen[0].white_pixel;
-        varblack = display.screen[0].black_pixel;
+        var black = display.screen[0].black_pixel;
         X.CreateWindow(wid, root, 10, 10, 400, 300, 0, 0, 0, 0, { backgroundPixel: white, eventMask: PointerMotion });
         X.MapWindow(wid);
 

examples/simple/text/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "text",
+  "version": "0.0.0",
+  "description": "ERROR: No README.md file found!",
+  "main": "render-glyph.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "BSD-2-Clause",
+  "dependencies": {
+    "freetype2_render": "~0.1.2"
+  }
+}

examples/simple/text/render-glyph.js

@@ -0,0 +1,145 @@
+var x11 = require('../../../lib');
+var fs = require('fs');
+var PointerMotion = x11.eventMask.PointerMotion;
+var Exposure      = x11.eventMask.Exposure;
+
+
+        var ft2 = require('freetype2_render');
+        var fontface= ft2.parse(fs.readFileSync(process.argv[2]))
+        //console.log(fontface.hasKerning(), process.argv[2], '\n', fontface);
+        //process.exit(0);
+        /*
+        fontface.available_characters.forEach(function(left) {
+          fontface.available_characters.forEach(function(right) {
+            var kern = fontface.kerning(left, right, 50, 0, 96, 0);
+            if (kern.x != 0 || kern.y != 0)
+              console.log(left, right, kern);
+          });
+        });
+        */
+        //console.log(fontface.kerning('A'.charCodeAt(0), 'V'.charCodeAt(0), 50, 0, 96, 0))
+
+
+function padWidth(buf, width) {
+  var height = buf.length / width;
+  if (width %4 === 0)
+    return buf;
+  else {
+    var stride = (width+3)&~3;
+    var res = Buffer.alloc(height*stride);
+    res.fill(0);
+    for (var y=0; y < height; ++y) {
+      // memcpy(tmpbitmap+y*stride, bitmap->buffer+y*ginfo.width, ginfo.width);
+      buf.copy(res, y*stride, y*width, y*width + width);
+    }
+    return res;
+  }
+}
+
+var xclient = x11.createClient({ debug: true }, function(err, display) {
+    var X = display.client;
+    var root = display.screen[0].root;
+    display.client.require('render', function(err, Render) {
+        var wid = X.AllocID();
+        var white = display.screen[0].white_pixel;
+        var black = display.screen[0].black_pixel;
+        X.CreateWindow(wid, root, 10, 10, 400, 300, 0, 0, 0, 0, { backgroundPixel: white, eventMask: Exposure|PointerMotion });
+        X.MapWindow(wid);
+
+        var glyphSet = X.AllocID();
+        Render.CreateGlyphSet(glyphSet, Render.a8);
+
+        var pict = X.AllocID();
+        Render.CreatePicture(pict, wid, Render.rgb24);
+
+        var pix = X.AllocID();
+        X.CreatePixmap(pix, root, 32, 1, 1);
+        var pictSolidPix = X.AllocID();
+        Render.CreatePicture(pictSolidPix, pix, Render.rgba32, {repeat: 1});
+        Render.FillRectangles(1, pictSolidPix, [0x0, 0x0, 0x0, 0xffff], [0, 0, 100, 100]);
+        //X.FreePixmap(pix);
+
+        var pictGrad = X.AllocID();
+        Render.RadialGradient(pictGrad, [260,260], [260,260], 0, 260,
+            [
+                [0,     [0x0000, 0x0, 0, 0xffff ] ],
+                [0.3,   [0xffff, 0x0, 0, 0xffff ] ],
+                [0.997, [0xffff, 0xf, 0, 0x1] ],
+                [1,     [0x0000, 0x0, 0, 0xffff ] ],
+            ]
+        );
+
+        var pictLinearGrad = X.AllocID();
+        Render.LinearGradient(pictLinearGrad, [0,0], [1000,100],
+                [
+                  [0,   [0,0,0,0xffff ] ],
+                 // [0.1, [0xfff, 0, 0xffff, 0x1000] ] ,
+                 // [0.25, [0xffff, 0, 0xfff, 0x3000] ] ,
+                 // [0.5, [0xffff, 0, 0xffff, 0x4000] ] ,
+                  [1,   [0xffff, 0xffff, 0, 0xffff] ]
+                ]);
+
+
+
+       var size = parseInt(process.argv[3]*64);
+
+       console.log(fontface.available_characters.length);
+        var glyphs = fontface.available_characters.map(function(ch) { return fontface.render(ch, size, 0, 96, 0); });
+        var glyphFromCode = [];
+        glyphs.forEach(function(g) {
+          if (!g.image || (g.image.length == 0)) {
+            g.image = Buffer.alloc(64);
+            g.image.fill(0);
+            g.width = 8;
+            g.height = 8;
+            g.x = 0;
+            g.y = 0;
+          }
+          else {
+            g.origWidth = g.width;
+            g.image = padWidth(g.image, g.width);
+            g.width = g.image.length / g.height;
+          }
+          glyphFromCode[g.id] = g;
+        });
+
+        Render.AddGlyphs(glyphSet, glyphs);
+        var text = process.argv[4];
+        var elems = [];
+        var pos = 0;
+        var start = 0;
+        var offX = 0;
+        while (pos + 1 < text.length) {
+          var kern = fontface.kerning(text.charCodeAt(pos), text.charCodeAt(pos+1), size, 0, 96, 0);
+          console.log(kern, text[pos], text[pos+1]);
+          if (kern.x) {
+            elems.push([offX, 0, text.slice(start, pos+1)]);
+            start = pos+1;
+            offX = Math.round(size*kern.x/(26.6*64*64));
+          }
+          pos++;
+        }
+        elems.push([offX, 0, text.slice(start, text.length)]);
+        elems[0][1] = 60;
+        console.log(elems);
+
+        function draw(x, y) {
+          if (!y)
+            y = 0;
+          if (!x)
+            x = 0;
+          // TODO: example with multiple glyphsets in one CompositeGlyphs call
+          Render.FillRectangles(1, pict, [0xffff, 0xffff, 0xffff, 0xffff], [0, 0, 3000, 3000]);
+          //Render.Composite(3, pictLinearGrad, 0, pict, 0, 0, 0, 0, 0, 0, 2500, 2500);
+          // op, src, dst, maskFormat, gsid, srcX, srcY, dstX, dstY, glyphs
+          //Render.CompositeGlyphs8(3, pictSolidPix, pict, 0, glyphSet, 0, 0, [[10, 60, process.argv[4]]]);
+          var yoff = 2*parseInt(process.argv[3]);
+          Render.CompositeGlyphs32(3, pictSolidPix, pict, 0, glyphSet, 260-x, yoff+260-y, elems);
+          Render.CompositeGlyphs32(3, pictSolidPix, pict, 0, glyphSet, 260-x, yoff+260-y, [[0, 140, text]]);
+        }
+
+        X.on('event', function(ev) {
+           draw(ev.x, ev.y);
+        });
+    });
+});

examples/smoketest/applewm.js

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

examples/smoketest/blur-convolution.js

@@ -0,0 +1,51 @@
+// the code is taken from https://github.com/mattlockyer/iat455/blob/6493c882f1956703133c1bffa1d7ee9a83741cbe/assignment1/assignment/effects/blur-effect-dyn.js
+// (c) Matt Lockyer, https://github.com/mattlockyer
+
+function hypotenuse(x1, y1, x2, y2) {
+  var xSquare = Math.pow(x1 - x2, 2);
+  var ySquare = Math.pow(y1 - y2, 2);
+  return Math.sqrt(xSquare + ySquare);
+}
+
+/*
+ * Generates a kernel used for the gaussian blur effect.
+ *
+ * @param dimension is an odd integer
+ * @param sigma is the standard deviation used for our gaussian function.
+ *
+ * @returns an array with dimension^2 number of numbers, all less than or equal
+ *   to 1. Represents our gaussian blur kernel.
+ */
+function generateGaussianKernel(dimension, sigma) {
+  if (!(dimension % 2) || Math.floor(dimension) !== dimension || dimension<3) {
+    throw new Error(
+      'The dimension must be an odd integer greater than or equal to 3'
+    );
+  }
+  var kernel = [];
+
+  var twoSigmaSquare = 2 * sigma * sigma;
+  var centre = (dimension - 1) / 2;
+
+  for (var i = 0; i < dimension; i++) {
+    for (var j = 0; j < dimension; j++) {
+      var distance = hypotenuse(i, j, centre, centre);
+
+      // The following is an algorithm that came from the gaussian blur
+      // wikipedia page [1].
+      //
+      // http://en.wikipedia.org/w/index.php?title=Gaussian_blur&oldid=608793634#Mechanics
+      var gaussian = (1 / Math.sqrt(
+        Math.PI * twoSigmaSquare
+      )) * Math.exp((-1) * (Math.pow(distance, 2) / twoSigmaSquare));
+
+      kernel.push(gaussian);
+    }
+  }
+
+  // Returns the unit vector of the kernel array.
+  var sum = kernel.reduce(function (c, p) { return c + p; });
+  return kernel.map(function (e) { return e / sum; });
+}
+
+module.exports = generateGaussianKernel;

examples/smoketest/bmp.js

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

examples/smoketest/cleararea.js

@@ -0,0 +1,15 @@
+var x11 = require('../../lib');
+var Window = require('./wndwrap');
+
+x11.createClient(function(err, display) {
+    var X = display.client;
+    var w = new Window(X, 0, 0, 700, 500);
+    w.map();
+
+    w.on('expose', function() {
+      var gc = X.AllocID();
+      X.CreateGC(gc, w.id, { foreground: w.black, background: w.white });
+      X.PolyFillRectangle(w.id, gc, [50, 50, 600, 400]);
+      X.ClearArea(w.id, 0, 0, 300, 300, 0);
+    });
+});

examples/smoketest/compositetest.js

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

examples/smoketest/damagetest.js

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

examples/smoketest/fixestest.js

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

examples/smoketest/keyboard/getkeyboardmapping.js

@@ -1,9 +1,11 @@
-var x11 = require('../../lib');
+var x11 = require('../../../lib');
+var keysym = require('keysym');
+
 
 var ks = x11.keySyms;
 var ks2Name = {};
 for (var key in ks)
-    ks2Name[ ks[key] ] = key;
+    ks2Name[ ks[key].code ] = key;
 var kk2Name = {};
 
 x11.createClient(function(err, display) {
@@ -16,7 +18,7 @@ x11.createClient(function(err, display) {
             var name = kk2Name[i+min] = [];
             var sublist = list[i];
             for (var j =0; j < sublist.length; ++j)
-		name.push(ks2Name[sublist[j]]);
+		name.push([ks2Name[sublist[j]], sublist[j]]);
         }
 
         var root = display.screen[0].root;
@@ -27,7 +29,19 @@ x11.createClient(function(err, display) {
         X.MapWindow(wid);
 
         X.on('event', function(ev) {
-            console.log([ev.keycode, kk2Name[ev.keycode]]);
+            console.log(ev.type);
+            console.log(ev);
+            //console.log([ev.keycode, kk2Name[ev.keycode], keysym.fromKeysym(kk2Name[ev.keycode][0][1])]);
+            var shift = ev.buttons & 1;
+            var keySyms = kk2Name[ev.keycode];
+            if (keySyms) {
+              var codePoint = keysym.fromKeysym(keySyms[shift ? 1 : 0][1]).unicode;
+              if (codePoint == 13)
+                codePoint = 10;
+              if (codePoint != 0)
+                process.stdout.write(String.fromCharCode(codePoint));
+               //console.log('\n', codePoint);
+            }
         });
     });
 });

examples/smoketest/keyboard/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "keyboard",
+  "version": "0.0.0",
+  "description": "",
+  "main": "getkeyboardmapping.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

examples/smoketest/putimage.js

@@ -8,7 +8,7 @@ var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;
 
-var bitmap = new Buffer(128*128/8); // 16384 bits, 2048 bytes bitmap
+var bitmap = Buffer.alloc(128*128/8); // 16384 bits, 2048 bytes bitmap
 for (var i=0; i < bitmap.length; ++i)
 {
     bitmap[i] = i % 256;

examples/smoketest/putimage1.js

@@ -1,11 +1,10 @@
 var Buffer = require('buffer').Buffer;
 var x11 = require('../../lib');
 
-var xclient = x11.createClient();
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;
 
-var bitmap = new Buffer(128*128*4); // 16384 bits, 2048 bytes bitmap
+var bitmap = Buffer.alloc(128*128*4); // 16384 bits, 2048 bytes bitmap
 for (var i=0; i < bitmap.length; ++i)
 {
     var byteNum = i%4;
@@ -20,14 +19,11 @@ for (var i=0; i < bitmap.length; ++i)
 
 }
 
-xclient.on('connect', function(err, display) {
+x11.createClient(function(err, display) {
+    if (err) throw err;
 
     var X = display.client;
-    X.require('big-requests', function(BigReq) {
+X.require('render', function(err, Render) {
-       
-        BigReq.Enable(function(maxLen) { console.log( maxLen ); });
-
-X.require('render', function(Render) {
 
     var root = display.screen[0].root;
     var white = display.screen[0].white_pixel;
@@ -72,5 +68,4 @@ X.require('render', function(Render) {
 
 });
 
-    });
 });

examples/smoketest/randr.js

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

examples/smoketest/sendevent.js

@@ -1,11 +1,11 @@
 var x11 = require('../../lib');
 
-var xclient = x11.createClient();
+var xclient = x11.createClient({debug: true});
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;
 var pts = [];
 
-xclient.on('connect', function(err, display) {
+xclient.on('connect', function(display) {
     var X = this;
     var root = display.screen[0].root;
     var white = display.screen[0].white_pixel;
@@ -13,18 +13,16 @@ xclient.on('connect', function(err, display) {
 
     function createWindow()
     {
-
+      var wid = X.AllocID();
-    var wid = X.AllocID();
+      // id, parentId, x, y, width, height, borderWidth, depth, _class, visual, values
-    X.CreateWindow(
+      X.CreateWindow(
-       wid, root, 
+        wid, root, 
-       10, 10, 400, 300, 
+        10, 10, 400, 300, 
-       1, 1, 0,
+        0, 0, 0, 0, { 
-       { 
+          backgroundPixel: white, eventMask: Exposure|PointerMotion  
-           backgroundPixel: white, eventMask: Exposure|PointerMotion  
+      });
-       }
+      X.MapWindow(wid);
-    );
+      return wid;
-    X.MapWindow(wid);
-    return wid;
     }
 
     var wid = createWindow();
@@ -59,7 +57,7 @@ xclient.on('connect', function(err, display) {
         }
     });
 
-    X.on('error', function(e) {
+    //X.on('error', function(e) {
-        console.log(e);
+    //    console.log(e);
-    });
+    //});
 });

examples/smoketest/shape-rectangles.js

@@ -0,0 +1,22 @@
+var x11 = require('../../lib');
+
+var Expose = 12;
+
+x11.createClient(function(err, display) {
+    var X = display.client;
+    var root = display.screen[0].root;
+    X.require('shape', function(err, Shape) {
+        var win = X.AllocID();
+        X.CreateWindow(win, root, 0, 0, 200, 200);
+        X.ChangeWindowAttributes(win, { backgroundPixel: display.screen[0].black_pixel });
+        X.MapWindow(win);
+        Shape.Rectangles(Shape.Op.Set, Shape.Kind.Bounding, win, 0, 0, [
+            [40, 40, 40, 40], [120, 40, 40, 40],
+            [0, 120, 20, 20], [180, 120, 20, 20],
+            [20, 140, 30, 20], [150, 140, 30, 20],
+            [50, 160, 100, 20]
+        ]);
+    });
+    X.on('error', function(err) { console.log(err); });
+
+});

examples/smoketest/shapetest.js

@@ -3,20 +3,25 @@ var x11 = require('../../lib');
 x11.createClient(function(err, display) {
     var X = display.client;
     var root = display.screen[0].root;
-    X.require('shape', function(Shape) {
+    X.require('shape', function(err, Shape) {
         var win = X.AllocID();
         X.CreateWindow(win, root, 0, 0, 200, 200);
-        var gc = X.AllocID();
+        X.ChangeWindowAttributes(win, { backgroundPixel: display.screen[0].white_pixel });
-        X.CreateGC(gc, win);     
+        X.MapWindow(win);
-        //X.MapWindow(win);
+        X.ClearArea(win, 0, 0, 200, 200, false);
-        Shape.SelectInput(win, 1);
+
+        Shape.SelectInput(win, true);
         Shape.InputSelected(win, function(err, isSelected) {
             console.log("IsSelected: " + isSelected);
         });
-        //var pid = X.AllocID();
+
-        //X.CreatePixmap(pid, win, 2, 200, 200);
+        var bitmap = X.AllocID();
-        //X.PolyText8(pid, gc, 0, 0, ['Hello, Node.JS!', ' Hello, world!']);
+        X.CreatePixmap(bitmap, win, 1, 200, 200);
-        //Shape.Mask(Shape.Op.Set, Shape.Kind.Input, win, 0, 0, pid);
+        var gc = X.AllocID();
+        X.CreateGC(gc, bitmap, { foreground: 1 });
+//        X.PolyText8(bitmap, gc, 0, 0, ['Hello, Node.JS!', ' Hello, world!']);
+        X.PolyFillArc(bitmap, gc, [0, 0, 200, 200, 0, 360 * 64]);
+        Shape.Mask(Shape.Op.Set, Shape.Kind.Bounding, win, 0, 0, bitmap);
 
         X.on('event', function(ev) {
           console.log(ev);

examples/smoketest/sstest.js

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

examples/smoketest/transpwindow.js

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

examples/smoketest/trapezoids.js

@@ -0,0 +1,125 @@
+var _ = require('underscore');
+var x11 = require('../../lib');
+var Exposure = x11.eventMask.Exposure;
+var PointerMotion = x11.eventMask.PointerMotion;
+var ButtonPress = x11.eventMask.ButtonPress;
+
+var draw;
+
+var useConvo3 = true;
+
+x11.createClient({ debug: true}, function(err, display) {
+
+  var X = display.client;
+  var root = display.screen[0].root;
+
+  var wid = X.AllocID();
+  X.CreateWindow(
+     wid, root,
+     0, 0, 800, 600,
+     0, 0, 0, 0,
+     {
+        eventMask: Exposure|PointerMotion|ButtonPress
+     }
+  );
+  X.MapWindow(wid);
+
+
+  X.require('render', function(err, Render) {
+
+    Render.QueryFilters(console.log);
+
+    var pixMask = X.AllocID();
+    X.CreatePixmap(pixMask, wid, 8, 600, 600);
+    var pictTraps = X.AllocID();
+    Render.CreatePicture(pictTraps, pixMask, Render.a8);
+
+    var pictWin = X.AllocID();
+    Render.CreatePicture(pictWin, wid, Render.rgb24);
+
+    var pictSolid = X.AllocID();
+    r = 0.2; g = 0.2; b = 0.2; a = 1;
+    Render.CreateSolidFill(pictSolid, r, g, b, a);
+
+    var pixBuff = X.AllocID();
+    X.CreatePixmap(pixBuff, wid, 24, 600, 600);
+    var pictBuff = X.AllocID();
+    Render.CreatePicture(pictBuff, pixBuff, Render.rgb24);
+
+    var convo5 = [ 5, 5, 0.0030,    0.0133,    0.0219,    0.0133,    0.0030,
+      0.0133,    0.0596,    0.0983,    0.0596,    0.0133,
+      0.0219,    0.0983,    0.1621,    0.0983,    0.0219,
+      0.0133,    0.0596,    0.0983,    0.0596,    0.0133,
+      0.0030,    0.0133,    0.0219,    0.0133,    0.0030];
+    var convo3 = [3, 3, 0.01, 0.08, 0.01, 0.08, 0.64, 0.08, 0.01, 0.08, 0.01];
+
+    var convo5 = [21, 21].concat(require('./blur-convolution')(21, 11));
+
+    //Render.SetPictureFilter(pictBuff, 'convolution', convo3);
+    //Render.SetPictureFilter(pictTraps, 'convolution', convo3);
+    //Render.SetPictureFilter(pictBuff, 'bilinear', []);
+    Render.SetPictureFilter(pictBuff, 'best', []);
+
+    draw1 = function(x, y) {
+      console.log('draw 1', x, y);
+       var r = 3 + 2*Math.floor(x / 100);
+       var convo = [r, r].concat(require('./blur-convolution')(r, r));
+       Render.SetPictureFilter(pictBuff, 'convolution', convo);
+
+       var a = (x-400)/500;
+       var m = [
+        Math.cos(a), Math.sin(a), 0,
+        -Math.sin(a), Math.cos(a), 0,
+        0, 0, 1
+      ];
+     // Render.SetPictureTransform(pictTraps, m)
+
+      var r, g, b;
+
+      // fill window
+      r = 1; g = 1; b = 1; a = 0.5;
+      Render.FillRectangles(1, pictBuff, [r, g, b, a], [0, 0, 1000, 1000])
+
+      // fill traps
+      r = 0; g = 0; b = 0; a = 0;
+      Render.FillRectangles(1, pictTraps, [r, g, b, a], [0, 0, 1000, 1000])
+
+      Render.AddTraps(pictTraps, 0, 0, [
+        x, 200, y,
+        //150, 200, 50,
+        5, 250, 300,
+        110, 200, 310,
+        50, 150, 500
+      ]);
+
+
+      // (op, src, mask, dst, srcX, srcY, maskX, maskY, dstX, dstY, width, height)
+      //Render.Composite(Render.PictOp.Over, pictSolid, pictTraps, pictWin, 0, 0, 0, 0, 0, 0, 800, 600);
+      //Render.PictOp.Over
+
+      Render.Composite(Render.PictOp.Over, pictSolid, pictTraps, pictBuff, 0, 0, 0, 0, 0, 0, 800, 600);
+      Render.Composite(Render.PictOp.Over, pictBuff, 0, pictWin, 0, 0, 0, 0, 0, 0, 800, 600);
+
+    };
+
+    draw = function(x, y) {
+      var f = _.debounce(function() {
+        draw1(x, y);
+      }, 100);
+      f();
+    };
+
+  });
+
+}).on('error', function(err) {
+   console.log(err);
+}).on('event', function(ev) {
+    //console.log(ev);
+    if (ev.name == 'MotionNotify') {
+      draw(ev.x, ev.y);
+    } else if (ev.name == 'ButtonPress') {
+      useConvo3 = !useConvo3;
+      draw(ev.x, ev.y);
+      //console.log(ev);
+    }
+});

examples/smoketest/xcmisc.js

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

examples/smoketest/xtesttest.js

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

examples/tetris.js

@@ -25,7 +25,7 @@ var Buffer = require('buffer').Buffer;
 
 var startpos = [4, 15];
 var cupsize = [10, 20];
-var cup = new Buffer(cupsize[0]*cupsize[1]);
+var cup = Buffer.alloc(cupsize[0]*cupsize[1]);
 var moveInterval;
 
 function clearCup()
@@ -250,7 +250,7 @@ x11.createClient(function(err, display) {
     var ks = x11.keySyms;
     var ks2Name = {};
     for (var key in ks)
-        ks2Name[ ks[key] ] = key;
+        ks2Name[ ks[key].code ] = key;
     var kk2Name = {};
     var min = display.min_keycode;
     var max = display.max_keycode;

examples/vncviewer/d3des.js

@@ -56,8 +56,8 @@ var pc2 = [
 function deskey(key, edf)
 {
 	var i, j, l, m, n;
-        var pc1m = new Buffer(56);
+        var pc1m = Buffer.alloc(56);
-        var pcr = new Buffer(56);
+        var pcr = Buffer.alloc(56);
 	var kn = new Array(32);
 
 	for ( j = 0; j < 56; j++ ) {
@@ -388,17 +388,17 @@ function desfunc(block, keys)
 
 module.exports.response = function(challenge, password)
 {
-    var key = new Buffer(8);
+    var key = Buffer.alloc(8);
     key.fill(0);
     key.write(password.substring(0,8));
     var in1 = challenge.slice(0,8);
     var in2 = challenge.slice(8,16);
-    var res1 = new Buffer(8);
+    var res1 = Buffer.alloc(8);
-    var res2 = new Buffer(8);
+    var res2 = Buffer.alloc(8);
     deskey(key, EN0);
     des(in1, res1);
     des(in2, res2);
-    var resp = new Buffer(16);
+    var resp = Buffer.alloc(16);
     res1.copy(resp);
     res2.copy(resp, 8);
     return resp;

examples/vncviewer/hexy.js

@@ -7,7 +7,7 @@
 // It should create a pleasant looking hex dumb by default:
 //    
 //    var hexy = require('hexy.js'),
-//           b = new Buffer("\000\001\003\005\037\012\011bcdefghijklmnopqrstuvwxyz0123456789")
+//           b = Buffer.from("\000\001\003\005\037\012\011bcdefghijklmnopqrstuvwxyz0123456789")
 //    
 //    console.log(hexy.hexy(b))
 //

examples/vncviewer/rfbclient.js

@@ -400,7 +400,7 @@ RfbClient.prototype.readHextileTile = function(rect, cb)
             });
             return;
         }
-        tile.buffer = new Buffer(tilebuflen);
+        tile.buffer = Buffer.alloc(tilebuflen);
      
         function solidBackground() {
             clog('solidBackground');
@@ -667,8 +667,8 @@ function createConnection(params)
         var wstream = fs.createWriteStream(params.rfbFileOut);
         wstream.write('FBS 001.001\n');
         stream.on('data', function(data) {
-            var sizeBuf = new Buffer(4);
+            var sizeBuf = Buffer.alloc(4);
-            var timeBuf = new Buffer(4);
+            var timeBuf = Buffer.alloc(4);
             var size = data.length;
             sizeBuf.writeInt32BE(size, 0);
             wstream.write(sizeBuf);
@@ -676,7 +676,7 @@ function createConnection(params)
             timeBuf.writeInt32BE(+new Date() - start, 0);
             wstream.write(timeBuf);
             var padding = 3 - ((size - 1) & 0x03);
-            var pbuf = new Buffer(padding);
+            var pbuf = Buffer.alloc(padding);
             wstream.write(pbuf);             
         }).on('end', function() {
             wstream.end();

examples/vncviewer/rfbserver.js

@@ -62,7 +62,7 @@ RfbServer.prototype.processSecurity = function()
         break;
     case rfb.security.VNC:
         // generate random 16 byte challenge
-        serv.challenge = new Buffer(16);
+        serv.challenge = Buffer.alloc(16);
         serv.challenge.write('1234567890abcdef');
         console.log(['sending challenge', serv.challenge]);
         serv.pack_stream.pack('a', [serv.challenge]).flush();

examples/vncviewer/unpackstream.js

@@ -34,7 +34,7 @@ function ReadFixedRequest(length, callback)
     this.length = length;
     this.callback = callback;
     //clog(length);
-    this.data = new Buffer(length);
+    this.data = Buffer.alloc(length);
     this.received_bytes = 0;
 }
 
@@ -328,7 +328,7 @@ UnpackStream.prototype.pack = function(format, args)
         }
     }
 
-    var buf = new Buffer(packetlength);
+    var buf = Buffer.alloc(packetlength);
     var offset = 0;
     var arg = 0;
     for (var i = 0; i < format.length; ++i)

examples/vncviewer/vncgui.js

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

examples/windowmanager/wm.js

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

examples/xpm/node-logo.xpm

@@ -0,0 +1,75 @@
+/* XPM */
+static char * node_logo_xpm[] = {
+"245 66 6 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #8CC84B",
+"@	c #8DC84C",
+"#	c #89C746",
+"$	c #8AC748",
+"                                                                                                                           ..                                                                                                                        ",
+"                                                                                                                           ....                                                                                                                      ",
+"                                                                                                                           ......                                                                                                                    ",
+"                                                                                                                           .......                                                                                                                   ",
+"                                                                                                                           .........                                                                                                                 ",
+"                                                                                                                           ...........                                                                                                               ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                                                              ",
+"                                                                                                                           ............                                                                               ++                             ",
+"                 ....                                             ++++                                              ..     ............                             ....                                            ++++++                    .. .  .",
+"               ........                                         ++++++++                                          ......   ............                           .......                                         +++++++++                      .. .",
+"             ............                                     ++++++++++++                                      .......................                         ...........                                     ++++++ ++++++                     ...",
+"            ...............                                  ++++++++++++++                                   .........................                        ..............                                 +++++++    ++++++                      ",
+"          ..................                               ++++++++++++++++++                                ..........................                      ..................                              ++++++        ++++++                    ",
+"        ......................                           ++++++++++++++++++++++                            ............................                    .....................                           ++++++           ++++++                   ",
+"      ..........................                        +++++++++++++++++++++++++                        ..............................                  .........................                       ++++++               ++++++                 ",
+"     .............................                    ++++++++++++++++++++++++++++                     ................................                 ............................                   +++++++                  ++++++               ",
+"   ................................                 ++++++++++++++++++++++++++++++++                  .................................               ................................                ++++++                      ++++++             ",
+" ....................................             ++++++++++++++++++++++++++++++++++++              ...................................             ...................................              +++++                         ++++++            ",
+" ....................................             ++++++++++++++++++++++++++++++++++++             ....................................            .....................................            ++++                             ++++            ",
+" ....................................             ++++++++++++++++++++++++++++++++++++            .....................................            .....................................            +++                               +++            ",
+" ....................................             ++++++++++++++++++++++++++++++++++++            .....................................            .....................................            +++         +      ++++++++       +++            ",
+" ....................................             ++++++++++++++++++++++++++++++++++++            .....................................            .....................................            +++        +++   ++++++++++++     +++            ",
+" ................    ................             ++++++++++++++++++++++++++++++++++++            ..................  .................            .................   .................            +++        +++  ++++++++++++++    +++            ",
+" ...............      ...............             ++++++++++++++++++++++++++++++++++++            ................      ...............            ................      ...............            +++        +++  ++++      ++++    +++            ",
+" .............          .............             ++++++++++++++++++++++++++++++++++++            ...............        ..............            ..............         ..............            +++        +++  +++        +++    +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............    ++@#   ............             +++        +++  +++         +++   +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............  #@+++++   ..........              +++        +++  ++++++            +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............  +++++++   ........                +++        +++  +++++++++++       +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............  +++++++   ......                  +++        +++    ++++++++++++    +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............  +++++++   ....                    +++        +++      +++++++++++   +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............  @++++++   ...                     +++        +++            +++++   +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............            ............            .............    $+++                            +++        +++ +++          +++   +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .............           .............            ..............                                   +++        +++ ++++         +++   +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            ...............        ..............            ...............                                  +++        +++  ++++       ++++   +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .................    ................            .................                                +++        +++  ++++++++++++++    +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .....................................            ...................                              +++        +++   +++++++++++++    +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .....................................            ....................                             +++        +++     +++++++++      +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++            .....................................            ......................                           +++        +++                    +++            ",
+" ............            ............             ++++++++++++++++++++++++++++++++++++             ....................................            ........................                         +++++      +++                   ++++            ",
+" ...........              ...........             ++++++++++++++++++++++++++++++++++++             ....................................             .........................                        ++++++   ++++                 +++++             ",
+" .........                  .........               ++++++++++++++++++++++++++++++++                ..................................                ........................                        ++++++++++++               ++++++              ",
+" ........                    ........                 ++++++++++++++++++++++++++++                    ..............................                   .........................                        +++++++++              ++++++                ",
+" ......                        ......                  ++++++++++++++++++++++++++                       ..........................                       ........................                         ++++++              ++++++                 ",
+" ....                            ....                    ++++++++++++++++++++++                           ......................                           ......................                                           ++++++                   ",
+" ..                                ..                      ++++++++++++++++++                              ....................                              ..................                                ++++       ++++++                     ",
+"                                                             ++++++++++++++                                  ................                                 ...............                                  ++++++   ++++++                       ",
+"                                                              ++++++++++++                                     ............                                     ...........                                      ++++++++++++                        ",
+"                                                                ++++++++                                        .........                                         ........                                        +++++++++                          ",
+"                                                                  ++++                                            ......                                            ....                                            +++++                            ",
+"                                                                                                                    ..                                                                                                                               "};

examples/xpm/node-xpm.js

@@ -0,0 +1,151 @@
+/* Extracted from https://github.com/klepthys/node-xpm
+ * This code is available as a standalone module named xpm
+/*
+The MIT License (MIT)
+
+Copyright (c) 2015 Sebastien Dumetz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+  */
+
+var fs = require('fs');
+
+
+function PixmapFromFile (path,options){
+  if(!options && typeof path == "object"){
+    this.options = path;
+    path = null;
+  }else{
+    this.options = options||{};
+  }
+  if(path){
+    return this.parse(fs.readFileSync(path, {encoding:"utf-8"}));
+  }
+}
+/**
+ *
+ * @param  {[type]}   data     utf-8 file data
+ * @param  {Function} callback optionnal callback.
+ */
+PixmapFromFile.prototype.parse = function (data) {
+  if(!/^\/\*\s*XPM\s*\*\/$/m.test(data)){
+    throw new Error("Not an XPM file");
+  }
+  var size = this.getSize(data);
+  var content = this.getArray(data,size);
+  var colors = this.mapColors(data,size);
+  size.data = this.toBuffer(colors,content,size);
+  return size;
+};
+PixmapFromFile.prototype.getSize = function(data){
+  var match = /{\n?"([0-9\s]*)\s?"/.exec(data);
+  if(!match){
+    throw new Error("can't parse size infos");
+  }
+  var values = match[1].split(" ").map(function(i){return parseInt(i)});
+  return {width:values[0],height:values[1],count:values[2],length:values[3]}
+}
+
+PixmapFromFile.prototype.getArray = function(data,size){
+  //var reg = new RegExp('"((?!(?:[0-9]+\\s?){4}).{'+size.length+'}(?!\\sc\\s).*)"',"g"); //Works also but much less simple
+  var reg = new RegExp('"(.{'+size.width*size.length+'})"',"g");
+  var res;
+  var rows = [];
+  while((res = reg.exec(data)) !== null){
+    rows.push(res[1]);
+  }
+  if(rows.length != size.height){
+    throw new Error("found : "+rows.length+" rows. Should have found :"+size.height+" rows.");
+  }
+  return rows;
+}
+// return RGBA color
+PixmapFromFile.prototype.mapColors = function(content,size){
+  var reg = new RegExp('"(.' + ((size.length > 1)? "{"+(size.length)+"}" : "") + ")\\s+c\\s+#?(None|[0-9a-fA-F]{6})\"","gm");
+  var res;
+  var colors = {};
+  while((res = reg.exec(content)) !== null){
+    if(res[2] === "None"){
+      colors[res[1]] = "00000000"
+    }else{
+        colors[res[1]] = res[2]+"FF";//RGBA
+    }
+
+  }
+  if(Object.keys(colors).length != size.count){
+    throw new Error("found : "+Object.keys(colors).length+" colors. Should have found :"+size.count+" colors.");
+  }
+  return colors;
+}
+
+PixmapFromFile.prototype.toBuffer = function (colors,content,size) {
+  var buf = Buffer.alloc(size.width*size.height*4);
+  var offset = 0, byte,color;
+  var copy;
+  if( !this.options.format || this.options.format.toUpperCase() === "BGRA"){
+    copy = this.copyBGRABuffer;
+  }else if(this.options.format && this.options.format.toUpperCase() === "RGBA"){
+    copy = this.copyRGBABuffer;
+  }else{
+    throw new Error("invalid format option : ",this.options.format," valid values are BGRA (default) or RGBA")
+  }
+  content.forEach(function(row){
+    //console.log("parsing : ",row)
+    while(row && row.length >0){
+      var code = row.slice(0,size.length);
+      row = row.slice(size.length);
+      if(!colors[code]){
+        throw new Error("unknown color : ",code);
+      }
+      offset = copy(buf,offset,colors[code]);;
+    }
+  });
+  return buf;
+};
+
+/**
+ * Takes an array of rows. Each char/sequence represents a colored pixel
+ * @param  {[type]} content [description]
+ * @return {Buffer}         A 1d array of pixels in RGBA
+ */
+PixmapFromFile.prototype.copyBGRABuffer = function(buf, offset, color){
+  [4,2,0,6].forEach(function(i){
+    buf.writeUInt8(parseInt(color[i]+color[i+1],16),offset);
+    offset ++;
+  });
+  return offset;
+}
+PixmapFromFile.prototype.copyRGBABuffer = function(buf, offset, color){
+  buf.writeUInt32BE(parseInt(color,16),offset);
+  return offset+4;
+}
+PixmapFromFile.prototype.open = function(path,callback){
+  var self = this;
+  fs.readFile(path, {encoding:"utf-8"}, function(err,data){
+    if(err){
+      return callback(err);
+    }else{
+      callback(null,self.parse(data));
+    }
+  });
+
+
+}
+
+module.exports = PixmapFromFile;

examples/xpm/test.js

@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+
+var x11 = require('../../lib');
+var PixmapFromFile = require('./node-xpm.js');
+var Exposure = x11.eventMask.Exposure;
+
+x11.createClient(function(err, display)
+{
+  var X = display.client;
+  X.require('render', function(err, Render) {
+    var root = display.screen[0].root;
+    var pixmap = new PixmapFromFile();
+    pixmap.open("node-logo.xpm",function(err,logo){
+      if(err){
+        console.log(new Error().stack);
+        return console.error("pixmap open Error : ",err);
+      }
+      main(root, X, Render,logo);
+    });
+  });
+});
+
+function main(root, X, Render, logo) {
+
+  var win, picWin, pic, gc;
+
+  win = X.AllocID();
+  X.CreateWindow(
+     win, root,
+     0, 0, logo.width, logo.height,
+     0, 0, 0, 0,
+     { eventMask: Exposure }
+  );
+  X.MapWindow(win);
+
+  gc = X.AllocID();
+  X.CreateGC(gc, win);
+
+  var logoPixmap = X.AllocID();
+  X.CreatePixmap(logoPixmap, win, 24, logo.width, logo.height);
+  // TODO: add proper png pixel conversion here
+  X.PutImage(2, logoPixmap, gc, logo.width, logo.height, 0, 0, 0, 24, logo.data);
+
+  var logoPicture = X.AllocID();
+  Render.CreatePicture(logoPicture, logoPixmap, Render.rgb24);
+  var winPicture = X.AllocID();
+  Render.CreatePicture(winPicture, win, Render.rgb24);
+
+  X.on('event', function(ev) {
+    if (ev.name == 'Expose')
+      Render.Composite(3, logoPicture, 0, winPicture, 0, 0, 0, 0, 0, 0, logo.width, logo.height);
+  });
+}

lib/auth.js

@@ -1,91 +1,110 @@
-// TODO: http://en.wikipedia.org/wiki/X_Window_authorization
+// TODO: differentiate between auth types (i.e., MIT-MAGIC-COOKIE-1 and XDM-AUTHORIZATION-1)
+// and choose the best based on the algorithm in libXau's XauGetBestAuthByAddr
 
 var fs = require('fs');
 var Buffer = require('buffer').Buffer;
 // add 'unpack' method for buffer
 require('./unpackbuffer').addUnpack(Buffer);
 
+var typeToName = {
+    256: 'Local',
+  65535: 'Wild',
+    254: 'Netname',
+    253: 'Krb5Principal',
+    252: 'LocalHost',
+      0: 'Internet',
+      1: 'DECnet',
+      2: 'Chaos',
+      5: 'ServerInterpreted',
+      6: 'Internet6'
+};
+
 function parseXauth( buf )
 {
     var offset = 0;
     var auth = [];
     var cookieProperties = ['address', 'display', 'authName', 'authData'];
 
-    function handleCookieProperty(property) {
-        var length = buf.unpack('n', offset)[0];
-        offset += 2;
-        cookie[property] = buf.unpackString(length, offset);
-        offset += length; 
-    }
-
     while (offset < buf.length)
     {
         var cookie = {};
-        var typeToName = {
+        cookie.type = buf.readUInt16BE(offset);
-            256: 'Local',
-          65535: 'Wild',
-            254: 'Netname',
-            253: 'Krb5Principal', 
-            252: 'LocalHost',
-              0: 'Internet', 
-              1: 'DECnet', 
-              2: 'Chaos',
-              5: 'ServerInterpreted', 
-              6: 'InternetV6'
-        };
-        cookie.type = buf.unpack('n')[0];
         if (!typeToName[cookie.type]) {
             console.warn('Unknown address type');
         }
         offset += 2;
-        //JSHint becomes angry when handleCookieProperty is declared inside loop
+        cookieProperties.forEach(function(property) {
-        cookieProperties.forEach(handleCookieProperty);
+          var length = buf.unpack('n', offset)[0];
+          offset += 2;
+          if (cookie.type === 0 && property == 'address') { // Internet
+            // 4 bytes of ip addess, convert to w.x.y.z string
+            cookie.address = [ buf[offset], buf[offset+1], buf[offset+2], buf[offset+3]]
+              .map(function(octet) { return octet.toString(10) }).join('.');
+          } else {
+            cookie[property] = buf.unpackString(length, offset);
+          }
+          offset += length;
+        });
         auth.push(cookie);
     }
     return auth;
 }
 
-module.exports = function( display, host, cb )
+var homedir = require('os').homedir;
-{
+var path = require('path');
-    var XAuthorityFile = process.env.XAUTHORITY;
+
-    if (!XAuthorityFile)
+function readXauthority(cb) {
-    {
+  var filename = process.env.XAUTHORITY || path.join(homedir(), '.Xauthority');
-        if ( process.platform.match(/win/) ) {
+  fs.readFile(filename, function(err, data) {
-            // http://www.straightrunning.com/XmingNotes/trouble.php
+    if (!err)
-            //
+      return cb(null, data);
-            // The Xming magic cookie program, xauth (user-based), uses an 
+    if(err.code == 'ENOENT') {
-            // Xauthority file (not the traditional .Xauthority file) in 
+      // Xming/windows uses %HOME%/Xauthority ( .Xauthority with no dot ) - try with this name
-            // the %HOME% directory. To use xauth from Command Processor 
+      filename = process.env.XAUTHORITY || path.join(homedir(), 'Xauthority');
-            // e.g. on Windows machine 192.168.0.2 with user colin...
+      fs.readFile(filename, function (err, data) {
-            XAuthorityFile = process.env.USERPROFILE + '\\Xauthority';
+        if (err.code == 'ENOENT') {
+          cb(null, null);
         } else {
-            XAuthorityFile = process.env.HOME + '/.Xauthority';
+          cb(err);
         }
+      });
+    } else {
+      cb(err);
     }
+  });
+}
 
-    fs.readFile(XAuthorityFile, function (err, data) {
+module.exports = function( display, host, socketFamily, cb )
+{
+  var family;
+  if (socketFamily === 'IPv4') {
+    family = 0; // Internet
+  } else if (socketFamily === 'IPv6') {
+    family = 6; // Internet6
+  } else {
+    family = 256; // Local
+  }
+  readXauthority(function(err, data) {
+    if(err) return cb(err);
 
-        if (err) 
+    if (!data) {
-        {
+      return cb(null, {
-            if (err.code == 'ENOENT')
+        authName: '',
-            {
+        authData: ''
-                cb('','');
+      });
-                return;
+    }
-            }
+    var auth = parseXauth(data);
-            throw err;
+    for (var cookieNum in auth)
-        }
+    {
-
+      var cookie = auth[cookieNum];
-        var auth = parseXauth(data);
+      if ((typeToName[cookie.family] === 'Wild' || (cookie.type === family && cookie.address === host)) &&
-        for (var cookieNum in auth)
+          (cookie.display.length === 0 || cookie.display === display))
-        {
+        return cb( null, cookie );
-            var cookie = auth[cookieNum];
+    }
-            if (cookie.display == display && cookie.address == host)
+    // If no cookie is found, proceed without authentication
-            {
+    cb(null, {
-                cb( cookie.authName, cookie.authData );
+      authName: '',
-                return;
+      authData: ''
-            }
-        }
-        // throw 'No auth cookie matching display=' + display + ' and  host=' + host;
-        cb( '', '' );            
     });
+  });
 };

lib/corereqs.js

@@ -1,94 +1,244 @@
+// full list of event/error/request codes for all extensions:
+// http://www.opensource.apple.com/source/X11server/X11server-106.7/kdrive/xorg-server-1.6.5-apple3/dix/protocol.txt
+
 var xutil = require('./xutil');
 var hexy = require('./hexy').hexy;
 
 var valueMask = {
     CreateWindow: {
-        backgroundPixmap: 0x00000001,
+        backgroundPixmap      : {
-        backgroundPixel : 0x00000002,
+          mask: 0x00000001,
-        borderPixmap    : 0x00000004,
+          format: 'L'
-        borderPixel     : 0x00000008,
+        },
-        bitGravity      : 0x00000010,
+        backgroundPixel       : {
-        winGravity      : 0x00000020,
+          mask: 0x00000002,
-        backingStore    : 0x00000040,
+          format: 'L'
-        backingPlanes   : 0x00000080,
+        },
-        backingPixel    : 0x00000100,
+        borderPixmap          : {
-        overrideRedirect: 0x00000200,
+          mask: 0x00000004,
-        saveUnder       : 0x00000400,
+          format: 'L'
-        eventMask       : 0x00000800,
+        },
-      doNotPropagateMask: 0x00001000,
+        borderPixel           : {
-        colormap        : 0x00002000,
+          mask: 0x00000008,
-        cursor          : 0x00004000
+          format: 'L'
+        },
+        bitGravity            : {
+          mask: 0x00000010,
+          format: 'Cxxx'
+        },
+        winGravity            : {
+          mask: 0x00000020,
+          format: 'Cxxx'
+        },
+        backingStore          : {
+          mask: 0x00000040,
+          format: 'Cxxx'
+        },
+        backingPlanes         : {
+          mask: 0x00000080,
+          format: 'L'
+        },
+        backingPixel          : {
+          mask: 0x00000100,
+          format: 'L'
+        },
+        overrideRedirect      : {
+          mask: 0x00000200,
+          format: 'Cxxx'
+        },
+        saveUnder             : {
+          mask: 0x00000400,
+          format: 'Cxxx'
+        },
+        eventMask             : {
+          mask: 0x00000800,
+          format: 'L'
+        },
+        doNotPropagateMask    : {
+          mask: 0x00001000,
+          format: 'L'
+        },
+        colormap              : {
+          mask: 0x00002000,
+          format: 'L'
+        },
+        cursor                : {
+          mask: 0x00004000,
+          format: 'L'
+        }
     },
     CreateGC: {
-          'function'    : 0x00000001, // TODO: alias? _function?
+       'function'             : { // TODO: alias? _function?
-           planeMask    : 0x00000002,
+          mask: 0x00000001,
-           foreground   : 0x00000004,
+          format: 'Cxxx'
-           background   : 0x00000008,
+        },
-           lineWidth    : 0x00000010,
+       planeMask              : {
-           lineStyle    : 0x00000020,
+          mask: 0x00000002,
-           capStyle     : 0x00000040,
+          format: 'L'
-           joinStyle    : 0x00000080,
+        },
-           fillStyle    : 0x00000100,
+       foreground             : {
-           fillRule     : 0x00000200,
+          mask: 0x00000004,
-           tile         : 0x00000400,
+          format: 'L'
-           stipple      : 0x00000800,
+        },
-           tileStippleXOrigin: 0x00001000,
+       background             : {
-           tileStippleYOrigin: 0x00002000,
+          mask: 0x00000008,
-           font         : 0x00004000,
+          format: 'L'
-           subwindowMode: 0x00008000,
+        },
-           graphicsExposures: 0x00010000,
+       lineWidth              : {
-           clipXOrigin  : 0x00020000,
+          mask: 0x00000010,
-           clipYOrigin  : 0x00040000,
+          format: 'Sxx'
-           clipMask     : 0x00080000,
+        },
-           dashOffset   : 0x00100000,
+       lineStyle              : {
-           dashes       : 0x00200000,
+          mask: 0x00000020,
-           arcMode      : 0x00400000
+          format: 'Cxxx'
+        },
+       capStyle               : {
+          mask: 0x00000040,
+          format: 'Cxxx'
+        },
+       joinStyle              : {
+          mask: 0x00000080,
+          format: 'Cxxx'
+        },
+       fillStyle              : {
+          mask: 0x00000100,
+          format: 'Cxxx'
+        },
+       fillRule               : {
+          mask: 0x00000200,
+          format: 'Cxxx'
+        },
+       tile                   : {
+          mask: 0x00000400,
+          format: 'L'
+        },
+       stipple                : {
+          mask: 0x00000800,
+          format: 'L'
+        },
+       tileStippleXOrigin     : {
+          mask: 0x00001000,
+          format: 'sxx'
+        },
+       tileStippleYOrigin     : {
+          mask: 0x00002000,
+          format: 'sxx'
+        },
+       font                   : {
+          mask: 0x00004000,
+          format: 'L'
+        },
+       subwindowMode          : {
+          mask: 0x00008000,
+          format: 'Cxxx'
+        },
+       graphicsExposures      : {
+          mask: 0x00010000,
+          format: 'Cxxx'
+        },
+       clipXOrigin            : {
+          mask: 0x00020000,
+          format: 'Sxx'
+        },
+       clipYOrigin            : {
+          mask: 0x00040000,
+          format: 'Sxx'
+        },
+       clipMask               : {
+          mask: 0x00080000,
+          format: 'L'
+        },
+       dashOffset             : {
+          mask: 0x00100000,
+          format: 'Sxx'
+        },
+       dashes                 : {
+          mask: 0x00200000,
+          format: 'Cxxx'
+        },
+       arcMode                : {
+          mask: 0x00400000,
+          format: 'Cxxx'
+        }
     },
     ConfigureWindow: {
-	x: 		0x000001,
+      x                       : {
-	y:		0x000002,
+        mask: 0x000001,
-	width:		0x000004,
+        format: 'sxx'
-	height:		0x000008,
+      },
-	borderWidth:	0x000010,
+    	y                       : {
-	sibling:        0x000020,
+        mask: 0x000002,
-	stackMode:	0x000040
+        format: 'sxx'
+      },
+    	width                   : {
+        mask: 0x000004,
+        format: 'Sxx'
+      },
+    	height                  : {
+        mask: 0x000008,
+        format: 'Sxx'
+      },
+    	borderWidth             : {
+        mask: 0x000010,
+        format: 'Sxx'
+      },
+    	sibling                 : {
+        mask: 0x000020,
+        format: 'L'
+      },
+    	stackMode               : {
+        mask: 0x000040,
+        format: 'Cxxx'
+      }
     }
 };
 
+
 var valueMaskName = {};
 for (var req in valueMask) {
     var masks = valueMask[req];
     var names = valueMaskName[req] = {};
     for (var m in masks)
-        names[masks[m]] = m;
+        names[masks[m].mask] = m;
 }
 
 function packValueMask(reqname, values)
 {
     var bitmask = 0;
     var masksList = [];
+    var format = '';
     var reqValueMask = valueMask[reqname];
     var reqValueMaskName = valueMaskName[reqname];
 
     if (!reqValueMask)
         throw new Error(reqname + ': no value mask description');
 
-    for (var v in values)
+    for (var value in values)
     {
-        var valueBit = reqValueMask[v];
+        var v = reqValueMask[value];
-        if (!valueBit)
+        if (v) {
-            throw new Error(reqname + ': incorrect value param ' + v);
+            var valueBit = v.mask;
-        masksList.push(valueBit);
+            if (!valueBit)
-        bitmask |= valueBit;
+                throw new Error(reqname + ': incorrect value param ' + value);
+            masksList.push(valueBit);
+            bitmask |= valueBit;
+        }
     }
-    masksList.sort();
+
+    /* numeric sort */
+    masksList.sort(function(a, b) {
+        return a - b;
+    });
+
     var args = [];
-    for (m in masksList)
+    for (var i=0,length=masksList.length;i<length;i++)
     {
-       var valueName = reqValueMaskName[masksList[m]];
+        var value = masksList[i];
-       args.push( values[valueName] );
+        var valueName = reqValueMaskName[value];
+        format += reqValueMask[valueName].format
+        args.push( values[valueName] );
     }
-    return [bitmask, args]
+    return [format, bitmask, args]
 }
 
 /*
@@ -113,7 +263,7 @@ the way requests are described here
 
 */
 
-module.exports = {
+var templates = {
    CreateWindow: [
        // create request packet - function OR format string
        function(id, parentId, x, y, width, height, borderWidth, depth, _class, visual, values) {
@@ -129,45 +279,21 @@ module.exports = {
            if (values === undefined)
                values = {}
 
-           var packetLength = 8 + (values ? Object.keys(values).length : 0);
            var format = 'CCSLLssSSSSLL';
 
-           // create bitmask
-           var bitmask = 0;
            // TODO: slice from function arguments?
-           var args = [1, depth, packetLength, id, parentId, x, y, width, height, borderWidth, _class, visual];
 
            // TODO: the code is a little bit mess
            // additional values need to be packed in the following way:
            // bitmask (bytes #24 to #31 in the packet) - 32 bit indicating what adittional arguments we supply
            // values list (bytes #32 .. #32+4*num_values) in order of corresponding bits TODO: it's actually not 4*num. Some values are 4b ytes, some - 1 byte
 
-
+           var vals = packValueMask('CreateWindow', values);
-           // TODO: replace with packValueMask
+           var packetLength = 8 + (values ? vals[2].length : 0);
-           var masksList = [];
+           var args = [1, depth, packetLength, id, parentId, x, y, width, height, borderWidth, _class, visual];
-           for (var v in values)
+           format += vals[0];
-           {
+           args.push(vals[1]);
-               var valueBit = valueMask['CreateWindow'][v];
+           args = args.concat(vals[2]);
-               if (!valueBit)
-               {
-                   throw new Error('CreateWindow: incorrect value param ' + v);
-               }
-               masksList.push(valueBit);
-               bitmask |= valueBit;
-               format += 'L'; // TODO: not all values are 4 bytes CARD32!!!
-           }
-           // values packed in order of corresponding bit
-           masksList.sort();
-           // set bits to indicate additional values we are sending in this request
-           args.push(bitmask);
-
-           // add values in the order of the bits
-           // TODO: maybe it's better just to scan all 32 bits anstead of sorting parameters we are actually have?
-           for (var m in masksList)
-           {
-              var valueName = valueMaskName['CreateWindow'][masksList[m]];
-              args.push( values[valueName] );
-           }
            return [format, args];
        }
 
@@ -175,16 +301,13 @@ module.exports = {
 
    ChangeWindowAttributes:[
        function(wid, values) {
-           var format = 'CxSLL';
+           var format = 'CxSLSxx';
-           var packetLength = 3 + (values ? Object.keys(values).length : 0);
            var vals = packValueMask('CreateWindow', values);
-           var args = [2, packetLength, wid, vals[0]];
+           var packetLength = 3 + (values ? vals[2].length : 0);
-           var valArr = vals[1];
+           var args = [2, packetLength, wid, vals[1]];
-           for (var v in valArr)
+           var valArr = vals[2];
-           {
+           format += vals[0];
-               format += 'L';
+           args = args.concat(valArr);
-               args.push(valArr[v]);
-           }
            return [format, args];
         }
    ],
@@ -245,60 +368,11 @@ module.exports = {
          * }
          */
         function(win, options) {
-            var format = 'CxSLSxx';
+            var vals = packValueMask('ConfigureWindow', options);
-            var n = 3;
+            var format = 'CxSLSxx' + vals[0];
-            var mask = 0;
+            var args = [12, vals[2].length + 3, win, vals[1]];
-            var params = [];
+            args = args.concat(vals[2]);
-            if (options.x !== undefined) {
+            return [format, args];
-                mask |= valueMask.ConfigureWindow.x;
-                format += 'sxx';
-                params.push(options.x);
-                ++ n;
-            }
-
-            if (options.y !== undefined) {
-                mask |= valueMask.ConfigureWindow.y;
-                format += 'sxx';
-                params.push(options.y);
-                ++ n;
-            }
-
-            if (options.width !== undefined) {
-                mask |= valueMask.ConfigureWindow.width;
-                format += 'Sxx';
-                params.push(options.width);
-                ++ n;
-            }
-
-            if (options.height !== undefined) {
-                mask |= valueMask.ConfigureWindow.height;
-                format += 'Sxx';
-                params.push(options.height);
-                ++ n;
-            }
-
-            if (options.borderWidth !== undefined) {
-                mask |= valueMask.ConfigureWindow.borderWidth;
-                format += 'Sxx';
-                params.push(options.borderWidth);
-                ++ n;
-            }
-
-            if (options.sibling !== undefined) {
-                mask |= valueMask.ConfigureWindow.sibling;
-                format += 'L';
-                params.push(options.sibling);
-                ++ n;
-            }
-
-            if (options.stackMode !== undefined) {
-                mask |= valueMask.ConfigureWindow.stackMode;
-                format += 'Cxxx';
-                params.push(options.stackMode);
-                ++ n;
-            }
-
-            return [format, [12, n, win, mask].concat(params)];
         }
    ],
 
@@ -326,6 +400,11 @@ module.exports = {
         }
    ],
 
+   LowerWindow: [
+        function(win) {
+            return module.exports.ConfigureWindow[0](win, { stackMode : 1 });
+        }
+   ],
 
    QueryTree: [
         ['CxSL', [15, 2]],
@@ -386,7 +465,7 @@ module.exports = {
        function(mode, wid, name, type, units, data)
        {
           var padded4 = (data.length + 3) >> 2;
-          var pad = new Buffer( (padded4<<2) - data.length);
+          var pad = Buffer.alloc( (padded4<<2) - data.length);
           var format = 'CCSLLLCxxxLaa';
           var requestLength = 6 + padded4;
           var dataLenInFormatUnits = data.length / (units >> 3);
@@ -409,7 +488,7 @@ module.exports = {
        },
 
        function(buf, format) {
-	   var res = buf.unpack('LLL');
+     var res = buf.unpack('LLL');
            var prop = {};
            prop.type = res[0];
            prop.bytesAfter = res[1];
@@ -536,6 +615,20 @@ module.exports = {
        }
    ],
    
+   AllowEvents: [
+       function(mode, ts) {
+           return [ 'CCSL', [ 35, mode, 2, ts ] ];
+       }
+   ],
+
+   GrabServer: [
+       [ 'CxS', [36, 1]]
+   ],
+
+   UngrabServer: [
+       [ 'CxS', [37, 1]]
+   ],
+
    QueryPointer: [
        [ 'CxSL', [38, 2] ],
        function(buf, sameScreen) {
@@ -634,20 +727,35 @@ module.exports = {
        }
    ],
 
+   FreePixmap: [
+      function (pixmap) {
+          return [ 'CxSL', [54, 2, pixmap] ];
+      }
+   ],
+
+   CreateCursor: [
+       function(cid, source, mask, foreRGB, backRGB, x, y) {
+          foreR = foreRGB.R
+          foreG = foreRGB.G
+          foreB = foreRGB.B
+
+          backR = backRGB.R
+          backG = backRGB.G
+          backB = backRGB.B
+          return [ 'CxSLLLSSSSSSSS', [93, 8, cid, source, mask, foreR, foreG, foreB, backR, backG, backB, x, y] ];
+       }
+   ],
+
    // opcode 55
    CreateGC: [
        function(cid, drawable, values) {
            var format = 'CxSLLL';
-           var packetLength = 4 + (values ? Object.keys(values).length : 0);
-           var args = [55, packetLength, cid, drawable];
            var vals = packValueMask('CreateGC', values);
-           args.push(vals[0]);     // values bitmask
+           var packetLength = 4 + (values ? vals[2].length : 0);
-           var valArr = vals[1];
+           var args = [55, packetLength, cid, drawable];
-           for (var v in valArr)
+           format += vals[0]
-           {
+           args.push(vals[1]);     // values bitmask
-               format += 'L'; // TODO: we know format string length in advance and += inefficient for string
+           args = args.concat(vals[2])
-               args.push(valArr[v]);
-           }
            return [format, args];
         }
    ],
@@ -655,20 +763,22 @@ module.exports = {
    ChangeGC: [
        function(cid, values) {
            var format = 'CxSLL';
-           var packetLength = 3 + (values ? Object.keys(values).length : 0);
-           var args = [56, packetLength, cid];
            var vals = packValueMask('CreateGC', values);
-           args.push(vals[0]);     // values bitmask
+           var packetLength = 3 + (values ? vals[2].length : 0);
-           var valArr = vals[1];
+           var args = [56, packetLength, cid];
-           for (var v in valArr)
+           format += vals[0]
-           {
+           args.push(vals[1]);     // values bitmask
-               format += 'L'; // TODO: we know format string length in advance and += inefficient for string
+           args = args.concat(vals[2])
-               args.push(valArr[v]);
-           }
            return [format, args];
         }
    ],
 
+   ClearArea: [
+       function(wid, x, y, width, height, exposures) {
+          return [ 'CCSLssSS', [61, exposures, 4, wid, x, y, width, height] ];
+       }
+   ],
+
    //
    CopyArea: [
        function(srcDrawable, dstDrawable, gc, srcX, srcY, dstX, dstY, width, height) {
@@ -741,7 +851,7 @@ module.exports = {
           var padded = xutil.padded_length(data.length);
           var reqLen = 6 + padded/4; // (length + 3) >> 2 ???
           var padLength = padded - data.length;
-          var pad = new Buffer(padLength); // TODO: new pack format 'X' - skip amount of bytes supplied in numerical argument
+          var pad = Buffer.alloc(padLength); // TODO: new pack format 'X' - skip amount of bytes supplied in numerical argument
 
           // TODO: move code to calculate reqLength and use BigReq if needed outside of corereq.js
           // NOTE: big req is used here (first 'L' in format, 0 and +1 in params), won't work if not enabled
@@ -760,7 +870,7 @@ module.exports = {
            return {
                depth: depth,
                visualId: visualId,
-               data: buf.slice(20)
+               data: buf.slice(24)
            };
        }
    ],
@@ -899,7 +1009,7 @@ module.exports = {
 		}
    ],
 
-   KillKlient: [
+   KillClient: [
        function(resource) {
            return [ 'CxSL', [113, 2, resource] ];
        }
@@ -911,11 +1021,19 @@ module.exports = {
        }
    ],
    
+   Bell: [
+       function(percent) {
+           return ["CxCs",[108,1]];
+       }
+   ],
+
    ForceScreenSaver: [
        function(activate) {
            return [ 'CCS', [115, activate?1:0, 1] ];
        }
    ]
+};
 
+templates.KillKlient = templates.KillClient;
 
-}
+module.exports = templates;

lib/ext/apple-wm.js

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

lib/ext/big-requests.js

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

lib/ext/composite.js

@@ -106,9 +106,12 @@ exports.requireExt = function(display, callback)
 
         // currently version 0.4 TODO: bump up with coordinate translations
         ext.QueryVersion(0, 4, function(err, vers) {
+            if (err)
+                return callback(err);
+
             ext.major = vers[0];
             ext.minor = vers[1];
-            callback(ext);
+            callback(null, ext);
         });
     });
 }

lib/ext/damage.js

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

lib/ext/dpms.js

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

lib/ext/fixes.js

@@ -3,6 +3,19 @@
 var x11 = require('..');
 // TODO: move to templates
 
+function parse_rectangle(buf, pos) {
+    if (!pos) {
+        pos = 0;
+    }
+
+    return {
+        x : buf[pos],
+        y : buf[pos + 1],
+        width : buf[pos + 2],
+        height : buf[pos + 3]
+    }
+}
+
 exports.requireExt = function(display, callback)
 {
     var X = display.client;
@@ -35,10 +48,83 @@ exports.requireExt = function(display, callback)
             X.pack_stream.flush();
         };
 
+        ext.WindowRegionKind = {
+            Bounding : 0,
+            Clip : 1
+        };
+
+        ext.CreateRegion = function(region, rects) {
+            X.seq_num ++;
+            var format = 'CCSL';
+            format += Array(rects.length + 1).join('ssSS');
+            var args = [ ext.majorOpcode, 5, 2 + (rects.length << 1), region ];
+            rects.forEach(function(rect) {
+                args.push(rect.x);
+                args.push(rect.y);
+                args.push(rect.width);
+                args.push(rect.height);
+            });
+
+            X.pack_stream.pack(format, args);
+            X.pack_stream.flush();
+        }
+
+        ext.CreateRegionFromWindow = function(region, wid, kind) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSLLCxxx', [ ext.majorOpcode, 7, 4, region, wid, kind ]);
+            X.pack_stream.flush();
+        }
+
+        ext.DestroyRegion = function(region) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSL', [ ext.majorOpcode, 10, 2, region ]);
+            X.pack_stream.flush();
+        }
+
+        ext.UnionRegion = function(src1, src2, dst) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSLLL', [ ext.majorOpcode, 13, 4, src1, src2, dst ]);
+            X.pack_stream.flush();
+        }
+
+        ext.TranslateRegion = function(region, dx, dy) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSLss', [ ext.majorOpcode, 17, 3, region, dx, dy ]);
+            X.pack_stream.flush();
+        }
+
+        ext.FetchRegion = function(region, cb) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSL', [ ext.majorOpcode, 19, 2, region ]);
+            X.replies[X.seq_num] = [
+                function(buf, opt) {
+                    var n_rectangles = (buf.length - 24) >> 3;
+                    var format = 'ssSSxxxxxxxxxxxxxxxx';
+                    format += Array(n_rectangles + 1).join('ssSS');
+                    var res = buf.unpack(format);
+                    var reg = {
+                        extents : parse_rectangle(res),
+                        rectangles : []
+                    };
+
+                    for (var i = 0; i < n_rectangles; ++ i) {
+                        reg.rectangles.push(parse_rectangle(res, 4 + (i << 2)));
+                    }
+
+                    return reg;
+                },
+                cb
+            ];
+
+            X.pack_stream.flush();
+        }
+
         ext.QueryVersion(5, 0, function(err, vers) {
+            if (err)
+                return callback(err);
             ext.major = vers[0];
             ext.minor = vers[1];
-            callback(ext);
+            callback(null, ext);
         });
 
         ext.events = {

lib/ext/glx.js

@@ -8,6 +8,9 @@
 
   http://www.opengl.org/wiki/Tutorial:_OpenGL_3.0_Context_Creation_(GLX)
 
+  https://github.com/xderoche/J11/blob/master/src/gnu/x11/extension/glx/GL.java
+
+
 */
 var x11 = require('..');
 // TODO: move to templates
@@ -49,6 +52,18 @@ exports.requireExt = function(display, callback)
             X.pack_stream.flush();
         }
 
+        ext.CreateGLXPixmap = function(screen, visual, pixmap, glxpixmap) {
+            X.seq_num++;
+            X.pack_stream.pack('CCSLLLL', [ext.majorOpcode, 13, 5, screen, visual, pixmap, glxpixmap]);
+
+            console.log('CreateGlxPix', X.seq_num);
+            console.log(ext.majorOpcode, 13, 5, screen, visual, pixmap, glxpixmap);
+            console.trace();
+
+
+            X.pack_stream.flush();
+        }
+
         ext.QueryExtensionsString = function(screen, callback) {
             X.seq_num++;
             X.pack_stream.pack('CCSL', [ext.majorOpcode, 18, 2, screen]);
@@ -164,7 +179,7 @@ exports.requireExt = function(display, callback)
                 function(buf, opt) {
                     var format = Buffer(count);
                     format.fill('L');
-                    return buf.unpack(format.toString());
+                    return buf.unpack('xxxxxxxxxxxxxxxxxxxxxxxx' + format.toString());
                 },
                 callback
             ];
@@ -213,7 +228,6 @@ exports.requireExt = function(display, callback)
         ext.Render = function(ctx, data) {
             X.seq_num++;
             var length = 0;
-            //console.log(data);
             if (Buffer.isBuffer(data))
                 length = 2+data.length/4;
             else if (Array.isArray(data)) {
@@ -221,7 +235,6 @@ exports.requireExt = function(display, callback)
                 for (var i=0; i < data.length; ++i)
                     length += data[i].length/4;
             }
-            //console.log('LENGTH: ', length);
             X.pack_stream.pack('CCSL', [ext.majorOpcode, 1, length, ctx]);
             if (Buffer.isBuffer(data))
                 X.pack_stream.write_queue.push(data);
@@ -233,11 +246,80 @@ exports.requireExt = function(display, callback)
             X.pack_stream.flush();
         }
 
+        ext.VendorPrivate = function(ctx, code, data) {
+            X.seq_num++;
+            X.pack_stream.pack('CCSLL', [ext.majorOpcode, 16, 3+data.length/4, code, ctx]);
+            X.pack_stream.write_queue.push(data);
+            X.pack_stream.flush();
+        }
+
+        // 1330 - X_GLXvop_BindTexImageEXT
+        // 1331 - X_GLXvop_ReleaseTexImageEXT
+        ext.BindTexImage = function(ctx, drawable, buffer, attribs) {
+           if (!attribs)
+             attribs = [];
+           var data = Buffer.alloc(12 + attribs.length*4);
+           data.writeUInt32LE(drawable, 0);
+           data.writeUInt32LE(buffer, 4);
+           data.writeUInt32LE(attribs.length, 8);
+           for (var i=0; i < attribs.length; ++i)
+             data.writeUint32LE(attribs.length, 12+i*4);
+           ext.VendorPrivate(ctx, 1330, data);
+        }
+
+        ext.ReleaseTexImage = function(ctx, drawable, buffer) {
+           var data = Buffer.alloc(8);
+           data.writeUint32LE(drawable, 0);
+           data.writeUint32LE(buffer, 4);
+           ext.VendorPrivate(ctx, 1331, data);
+        }
+
+        // VendorPrivateWithReply - opcode 17
+
+        ext.RenderLarge = function(ctx, requestNum, requestTotal, data) {
+          X.seq_num++;
+
+          //var data = Buffer.concat(data);
+          var padLength = 4 - data.length % 4;
+          if (padLength == 4)
+            padLength = 0;
+          var length = 4 + (data.length+padLength) / 4;
+          X.pack_stream.pack('CCSLSSL', [ext.majorOpcode, 2, length, ctx, requestNum, requestTotal, data.length]);
+
+          X.pack_stream.write_queue.push(data);
+          var pad = Buffer.alloc(padLength);
+          pad.fill(0);
+          X.pack_stream.write_queue.push(pad);
+          X.pack_stream.flush();
+        }
+
         ext.renderPipeline = function(ctx) {
             return require('./glxrender')(this, ctx);
         }
 
-        callback(ext);
+	var errors = [
+	  "context",
+	  "contect state",
+	  "drawable",
+	  "pixmap",
+	  "context tag",
+	  "current window",
+	  "Render request",
+	  "RenderLarge request",
+	  "(unsupported) VendorPrivate request",
+	  "FB config",
+	  "pbuffer",
+	  "current drawable",
+	  "window"
+        ];
+
+	errors.forEach(function(message, code) {
+  	  X.errorParsers[ext.firstError + code] = function(err) {
+	    err.message = "GLX: Bad " + message;
+	  };
+	});
+
+        callback(null, ext);
     });
 }
 

lib/ext/glxrender.js

@@ -2,7 +2,7 @@
 
 var constants = require('./glxconstants');
 
-var MAX_SMALL_RENDER=65000;
+var MAX_SMALL_RENDER=65536-16;
 
 module.exports = function(GLX, ctx) {
     buffers = [];
@@ -10,17 +10,13 @@ module.exports = function(GLX, ctx) {
 
     function commandBuffer(opcode, len) {
         if (currentLength + len > MAX_SMALL_RENDER) {
-            console.log("Flushing buffer ", currentLength);
             render();
         }
         if (len > MAX_SMALL_RENDER)
-        {
+            throw Error('Buffer too big. Make sure you are using RenderLarge for large commands');
-            throw Error('Buffer too big. Please implement RenderLarge request');
-            // renderLarge();
-        }
 
         currentLength += len;
-        var res = Buffer(len);
+        var res = Buffer.alloc(len);
         res.writeUInt16LE(len, 0);
         res.writeUInt16LE(opcode, 2);
         return res;
@@ -101,6 +97,14 @@ module.exports = function(GLX, ctx) {
         buffers.push(res);
     }
 
+    function serialize3i(opcode, i1, i2, i3) {
+       var res = commandBuffer(opcode, 16);
+        res.writeUInt32LE(i1, 4);
+        res.writeUInt32LE(i2, 8);
+        res.writeUInt32LE(i3, 12);
+        buffers.push(res);
+    }
+
     function serialize2i1f(opcode, i1, i2, f1) {
        var res = commandBuffer(opcode, 16);
         res.writeUInt32LE(i1, 4);
@@ -109,6 +113,15 @@ module.exports = function(GLX, ctx) {
         buffers.push(res);
     }
 
+    function serialize2ifv(opcode, i1, i2, fv) {
+       var res = commandBuffer(opcode, 12 + fv.length*4);
+        res.writeUInt32LE(i1, 4);
+        res.writeUInt32LE(i2, 8);
+        for (var i=0; i < fv.length; ++i)
+          res.writeFloatLE(fv[i], 12+i*4);
+        buffers.push(res);
+    }
+
     function serialize2i4f(opcode, i1, i2, f1, f2, f3, f4) {
        var res = commandBuffer(opcode, 28);
         res.writeUInt32LE(i1, 4);
@@ -121,8 +134,16 @@ module.exports = function(GLX, ctx) {
     }
 
     function render(ctxLocal) {
+
         if (!ctxLocal) // ctxLocal overrides ctx passed during creation of renderContext
             ctxLocal = ctx;
+
+        if (buffers.length == 0) {
+          buffers = [];
+          currentLength = 0;
+          return;
+        }
+
         GLX.Render(ctxLocal, buffers);
         buffers = [];
         currentLength = 0;
@@ -222,7 +243,7 @@ module.exports = function(GLX, ctx) {
             serialize2i(85, target, mode);
         },
         BindTexture: function(target, texture) {
-            serialize2i(4117, target, texture);
+           serialize2i(4117, target, texture);
         },
         TexEnvf: function(target, pname, param) {
             serialize2i1f(112, target, pname, param);
@@ -230,7 +251,114 @@ module.exports = function(GLX, ctx) {
         TexParameterf: function(target, pname, param) {
             serialize2i1f(105, target, pname, param);
         },
-        TexCoords2f: function(x, y) {
+        TexParameterfv: function(target, pname, param) {
+            serialize2ifv(106, target, pname, param);
+        },
+        TexParameteri: function(target, pname, param) {
+            serialize3i(107, target, pname, param);
+        },
+        TexImage2D: function(target, level, internalFormat, width, height, border, format, type, data) {
+
+          render();
+
+          var typeSize = [];
+          typeSize[constants.FLOAT] = 4;
+          typeSize[constants.BYTE] = 1;
+          typeSize[constants.UNSIGNED_BYTE] = 1;
+
+          var res = Buffer.alloc(60 + data.length*typeSize[type]);
+          res.writeUInt32LE(res.length, 0);
+          res.writeUInt32LE(110, 4);
+
+          res[8] = 0; // swapbytes
+          res[9] = 0; // lsbfirst
+          res.writeUInt16LE(0, 10);   // unused 
+
+	/*
+	defaults: (from http://stackoverflow.com/questions/21563590/glteximage2d-protocol-arguments?noredirect=1#comment32577251_21563590 )
+
+	GL_UNPACK_SWAP_BYTES        boolean   false           true or false
+	GL_UNPACK_LSB_FIRST         boolean   false           true or false
+	GL_UNPACK_ROW_LENGTH        integer   0               [0,oo)
+	GL_UNPACK_SKIP_ROWS         integer   0               [0,oo)
+	GL_UNPACK_SKIP_PIXELS       integer   0               [0,oo)
+	GL_UNPACK_ALIGNMENT         integer   4               1, 2, 4, or 8
+
+	*/
+
+          res.writeUInt32LE(0, 12);   // rowlength
+          res.writeUInt32LE(0, 16);  // skiprows
+          res.writeUInt32LE(0, 20);  // skippixels
+          res.writeUInt32LE(4, 24);  // alignment
+
+          res.writeUInt32LE(target, 28);
+          res.writeUInt32LE(level, 32);
+          res.writeUInt32LE(internalFormat, 36);
+          res.writeUInt32LE(width, 40);
+          res.writeUInt32LE(height, 44);
+          res.writeUInt32LE(border, 48);
+          res.writeUInt32LE(format, 52);
+          res.writeUInt32LE(type, 56);
+
+          switch(type) {
+          case constants.FLOAT:
+            for (var i=0; i < data.length; ++i)
+              res.writeFloatLE(data[i], 60+i*typeSize[type]);
+            break;
+          case constants.BYTE:
+          case constants.UNSIGNED_BYTE:
+            for (var i=0; i < data.length; ++i)
+              res[60+i] = data[i];
+            break;
+          default:
+            throw new Error('unsupported texture type:' + type);
+          }
+
+          // bake sure buffer for glxRender request is emptied first 
+          render();
+          
+          var dataLen = res.length;
+          var maxSize = 262124;
+          var totalRequests = 1 + parseInt(dataLen / maxSize) - 1;
+          if (dataLen % maxSize)
+            totalRequests++;
+
+          // for some reason RenderLarge does not like everything to be sent in one go
+          // add one extra buffer request for small requests
+          if (dataLen < maxSize) {
+            GLX.RenderLarge(ctx, 1, 2, res);
+            GLX.RenderLarge(ctx, 2, 2, Buffer(0));
+            return;
+          }
+       
+          var pos = 0;
+          var reqNum = 1;
+          while(dataLen > 0) {
+            if (dataLen < maxSize) {
+              GLX.RenderLarge(ctx, reqNum, totalRequests, res.slice(pos));
+              break;
+            } else {
+              GLX.RenderLarge(ctx, reqNum, totalRequests, res.slice(pos, pos + maxSize));
+              pos += maxSize;
+              dataLen -= maxSize;
+              reqNum++;
+            }
+          }
+          
+        },
+     
+        ProgramString: function(target, format, src) {
+          serialize3i(target, format, src);
+          buffers.push(Buffer(src));
+        },
+
+        BindProgram: function(target, program) {
+          serialize2i(target, format, src);
+        },
+
+        
+
+        TexCoord2f: function(x, y) {
             serialize2f(54, x, y);
         }
     };

lib/ext/randr.js

@@ -7,7 +7,6 @@ exports.requireExt = function(display, callback)
 {
     var X = display.client;
     X.QueryExtension('RANDR', function(err, ext) {
-        debugger;
 
         if (!ext.present)
             return callback(new Error('extension not available'));
@@ -41,6 +40,67 @@ exports.requireExt = function(display, callback)
             All: 15
         };
 
+        ext.Rotation = {
+            Rotate_0: 1,
+            Rotate_90: 2,
+            Rotate_180: 4,
+            Rotate_270: 8,
+            Reflect_X: 16,
+            Reflect_Y: 32
+        };
+
+        ext.ConfigStatus = {
+            Sucess: 0,
+            InvalidConfigTime: 1,
+            InvalidTime: 2,
+            Failed: 3
+        };
+
+        ext.ModeFlag = {
+            HSyncPositive: 1,
+            HSyncNegative: 2,
+            VSyncPositive: 4,
+            VSyncNegative: 8,
+            Interlace: 16,
+            DoubleScan: 32,
+            CSync: 64,
+            CSyncPositive: 128,
+            CSyncNegative: 256,
+            HSkewPresent: 512,
+            BCast: 1024,
+            PixelMultiplex: 2048,
+            DoubleClock: 4096,
+            ClockDivideBy2: 8192
+        }
+
+        ext.SetScreenConfig = function(win, ts, configTs, sizeId, rotation, rate, cb) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSLLLSSSS', [ext.majorOpcode, 2, 6, win, ts, configTs, sizeId, rotation, rate, 0]);
+            X.replies[X.seq_num] = [
+                function(buf, opt) {
+                    var res = buf.unpack('LLLSSLL');
+                    return {
+                        status : opt,
+                        newTs : res [0],
+                        configTs : res[1],
+                        root : res[2],
+                        subpixelOrder : res[3]
+                    }
+                },
+                function(err, res) {
+                    var err;
+                    if (res.status !== 0) {
+                        err = new Error('SetScreenConfig error');
+                        err.code = res.status;
+                    }
+
+                    cb(err, res);
+                }
+            ];
+
+            X.pack_stream.flush();
+        },
+
         ext.SelectInput = function(win, mask)
         {
             X.seq_num++;
@@ -48,12 +108,177 @@ exports.requireExt = function(display, callback)
             X.pack_stream.flush();
         },
 
+        ext.GetScreenInfo = function(win, cb) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSL', [ext.majorOpcode, 5, 2, win]);
+            X.replies[X.seq_num] = [
+                function(buf, opt) {
+                    var i, j;
+                    var res = buf.unpack('LLLSSSSSS');
+                    var info = {
+                        rotations : opt,
+                        root : res [0],
+                        timestamp : res[1],
+                        config_timestamp : res[2],
+                        sizeID : res[4],
+                        rotation : res[5],
+                        rate : res[6],
+                        rates: []
+                    };
+
+                    var nSizes = res[3];
+                    var nRates = res[7];
+
+                    var screens_len = nSizes << 2;
+                    var format = Array(screens_len + 1).join('S');
+                    res = buf.unpack(format, 24);
+                    info.screens = [];
+                    for (i = 0; i < screens_len; i += 4) {
+                        info.screens.push({
+                            px_width : res[i],
+                            px_height : res[i + 1],
+                            mm_width : res[i + 2],
+                            mm_height : res[i + 3]
+                        });
+                    }
+
+                    format = Array(nRates + 1).join('S');
+                    info.rates = buf.unpack(format, 24 + screens_len * 2);
+                    return info;
+                },
+                cb
+            ];
+
+            X.pack_stream.flush();
+        },
+
+        ext.GetScreenResources = function(win, cb)
+        {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSL', [ext.majorOpcode, 8, 2, win]);
+            X.replies[X.seq_num] = [
+                function(buf, opt) {
+                    var i;
+                    var pos = 0;
+                    var res = buf.unpack('LLSSSSxxxxxxxx');
+                    var resources = {
+                        timestamp : res[0],
+                        config_timestamp : res[1],
+                        modeinfos : []
+                    };
+
+                    pos += 24;
+                    var format = Array(res[2] + 1).join('L');
+                    resources.crtcs = buf.unpack(format, pos);
+                    pos +=  res[2] << 2;
+                    format = Array(res[3] + 1).join('L');
+                    resources.outputs = buf.unpack(format, pos);
+                    pos +=  res[3] << 2;
+                    format = Array(res[4] + 1).join('LSSLSSSSSSSSL');
+                    res_modes = buf.unpack(format, pos);
+                    pos +=  res[4] << 5;
+                    for (i = 0; i < res[4]; i+= 13) {
+                        resources.modeinfos.push({
+                            id : res_modes[i + 0],
+                            width : res_modes[i + 1],
+                            height : res_modes[i + 2],
+                            dot_clock : res_modes[i + 3],
+                            h_sync_start : res_modes[i + 4],
+                            h_sync_end : res_modes[i + 5],
+                            h_total : res_modes[i + 6],
+                            h_skew : res_modes[i + 7],
+                            v_sync_start : res_modes[i + 8],
+                            v_sync_end : res_modes[i + 9],
+                            v_total : res_modes[i + 10],
+                            modeflags : res_modes[i + 12],
+                            name : buf.slice(pos, pos + res_modes[i + 11]).toString()
+                        });
+
+                        pos += res_modes[i + 11];
+                    }
+
+                    return resources;
+                },
+                cb
+            ];
+
+            X.pack_stream.flush();
+        },
+        ext.GetOutputInfo = function(output, ts, cb)
+        {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSLL', [ext.majorOpcode, 9, 3, output, ts ]);
+            X.replies[X.seq_num] = [
+                function(buf, opt) {
+                    var i;
+                    var pos = 0;
+                    var res = buf.unpack('LLLLCCSSSSS');
+                    var info = {
+                        timestamp : res[0],
+                        crtc : res[1],
+                        mm_width : res[2],
+                        mm_height : res[3],
+                        connection : res[4],
+                        subpixelOrder : res[5],
+                        preferredModes: res[8]
+                    };
+
+                    pos += 28;
+                    var format = Array(res[6] + 1).join('L');
+                    info.crtcs = buf.unpack(format, pos);
+                    pos +=  res[6] << 2;
+                    format = Array(res[7] + 1).join('L');
+                    info.modes = buf.unpack(format, pos);
+                    pos +=  res[7] << 2;
+                    format = Array(res[9] + 1).join('L');
+                    info.clones = buf.unpack(format, pos);
+                    pos +=  res[9] << 2;
+                    info.name = buf.slice(pos, pos + res_modes[10]).toString('binary');
+                    return info;
+                },
+                cb
+            ];
+
+            X.pack_stream.flush();
+        },
+        ext.GetCrtcInfo = function(crtc, configTs, cb) {
+            X.seq_num ++;
+            X.pack_stream.pack('CCSLL', [ext.majorOpcode, 20, 3, crtc, configTs ]);
+            X.replies[X.seq_num] = [
+                function(buf, opt) {
+                    var pos = 0;
+                    var res = buf.unpack('LssSSLSSSS');
+                    var info = {
+                        status : opt,
+                        timestamp : res[0],
+                        x : res[1],
+                        y : res[2],
+                        width : res[3],
+                        height : res[4],
+                        mode : res[5],
+                        rotation : res[6],
+                        rotations : res[7]
+                    };
+
+                    pos += 24;
+                    var format = Array(res[8] + 1).join('L');
+                    info.output = buf.unpack(format, pos);
+                    format = Array(res[9] + 1).join('L');
+                    info.possible = buf.unpack(format, pos);
+                    return info;
+                },
+                cb
+            ];
+
+            X.pack_stream.flush();
+        },
+
         X.eventParsers[ext.firstEvent + ext.events.RRScreenChangeNotify] = function(type, seq, extra, code, raw)
         {
-	    var event = {};
+            var event = {};
-	    event.raw = raw;
+            event.raw = raw;
             event.type = type
-	    event.seq = seq;
+            event.seq = seq;
             event.rotation = code;
             var values = raw.unpack('LLLSSSSSS');
             event.time = extra
@@ -68,10 +293,15 @@ exports.requireExt = function(display, callback)
             event.physHeight = values[8];
 
             event.name = 'RRScreenChangeNotify';
-	    console.log(event);
+            return event;
-	    return event;
         };
 
-        callback(ext);
+
+        ext.QueryVersion(255, 255, function(err, version) {
+          if (err) return callback(err);
+          ext.major_version = version[0];
+          ext.minor_version = version[1];
+          callback(null, ext);
+        });
     });
 }

lib/ext/screen-saver.js

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

lib/ext/shape.js

@@ -21,7 +21,7 @@ exports.requireExt = function(display, callback)
 
         ext.Kind = {
             Bounding: 0,
-	    Clip: 1,
+            Clip: 1,
             Input: 2
         };
 
@@ -31,12 +31,19 @@ exports.requireExt = function(display, callback)
             Intersect: 2,
             Subtract: 3,
             Invert: 4
-        }
+        };
+
+        ext.Ordering = {
+            Unsorted: 0,
+            YSorted: 1,
+            YXSorted: 2,
+            YXBanded: 3
+        };
 
         ext.QueryVersion = function(cb)
         {
             X.seq_num++;
-            captureStack();
+//            captureStack();
             X.pack_stream.pack('CCSLL', [ext.majorOpcode, 0, 1]);
             X.replies[X.seq_num] = [
                 function(buf, opt) {
@@ -48,18 +55,36 @@ exports.requireExt = function(display, callback)
             X.pack_stream.flush();
         }
 
+        // Accepts rectangles as [[x, y, width, height]]
+        ext.Rectangles = function( op, kind, window, x, y, rectangles, ordering /* = Ordering.Unsorted */ )
+        {
+            if (ordering === undefined)
+                ordering = ext.Ordering.Unsorted;
+
+            var length = 4 + rectangles.length * 2;
+
+            X.seq_num++;
+//            captureStack();
+            X.pack_stream.pack('CCSCCCxLss', [ext.majorOpcode, 1, length, op, kind, ordering, window, x, y]);
+            for (var i = 0; i < rectangles.length; ++i) {
+                var r = rectangles[i];
+                X.pack_stream.pack('ssSS', r);
+            }
+            X.pack_stream.flush();
+        }
+
         ext.Mask = function( op, kind, window, x, y, bitmap )
         {
             X.seq_num++;
-            captureStack();
+//            captureStack();
-            X.pack_stream.pack('CCSCCxxLssL', [ext.majorOpcode, 2, 5, op, kind, x, y, bitmap]);
+            X.pack_stream.pack('CCSCCxxLssL', [ext.majorOpcode, 2, 5, op, kind, window, x, y, bitmap]);
             X.pack_stream.flush();
         }
 
         ext.SelectInput = function( window, enable )
         {
             X.seq_num++;
-            captureStack();
+//            captureStack();
             X.pack_stream.pack('CCSLCxxx', [ext.majorOpcode, 6, 3, window, enable ]);
             X.pack_stream.flush();
         }
@@ -67,7 +92,7 @@ exports.requireExt = function(display, callback)
         ext.InputSelected = function( window, cb )
         {
             X.seq_num++;
-            captureStack();
+//            captureStack();
             X.pack_stream.pack('CCSL', [ext.majorOpcode, 7, 2, window ]);
             X.replies[X.seq_num] = [
                 function(buf, opt) {
@@ -78,14 +103,40 @@ exports.requireExt = function(display, callback)
             X.pack_stream.flush();
         }
 
-        callback(ext);
+        callback(null, ext);
 
         /*
         ext.QueryVersion(function(err, version) {
             ext.major = version[0];
             ext.minor = version[1];
-            callback(ext);
+            callback(null, ext);
         });
         */
+
+        ext.events = {
+            ShapeNotify: 0
+        }
+
+        X.eventParsers[ext.firstEvent + ext.events.ShapeNotify] = function(type, seq, extra, code, raw)
+        {
+            var event = {};
+            event.type = type;
+            event.kind = code;
+            event.seq = seq;
+
+            event.window = extra;
+
+            var values = raw.unpack('ssSSLC');
+
+            event.x = values[0];
+            event.y = values[1];
+            event.width = values[2];
+            event.height = values[3];
+            event.time = values[4];
+            event.shaped = values[5];
+            event.name = 'ShapeNotify';
+
+            return event;
+        };
     });
 }

lib/ext/xc-misc.js

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

lib/ext/xtest.js

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

lib/gcfunction.js

@@ -0,0 +1,22 @@
+/*
+ * GCFunction named shortcuts
+ */
+
+module.exports = {
+  GXclear        : 0x0,
+  GXand          : 0x1,
+  GXandReverse   : 0x2,
+  GXcopy         : 0x3,
+  GXandInverted  : 0x4,
+  GXnoop         : 0x5,
+  GXxor          : 0x6,
+  GXor           : 0x7,
+  GXnor          : 0x8,
+  GXequiv        : 0x9,
+  GXinvert       : 0xa,
+  GXorReverse    : 0xb,
+  GXcopyInverted : 0xc,
+  GXorInverted   : 0xd,
+  GXnand         : 0xe,
+  GXset          : 0xf
+};

lib/handshake.js

@@ -32,31 +32,39 @@ function readVisuals(bl, visuals, n_visuals, cb)
     });
 }
 
-function readDepths(bl, display, depths, n_depths, cb)
-{
-    if (n_depths == 0)
-    {
-        cb();
-        return;
-    }
-
-    bl.unpack( 'CxSxxxx', function(res) {
-        var dep = res[0];
-        var n_visuals = res[1];
-        var visuals = {};
-        readVisuals(bl, visuals, n_visuals, function()
-        {
-            depths[dep] = visuals;
-            if (Object.keys(depths).length == n_depths)
-                cb();
-            else
-                readDepths(bl, display, depths, n_depths, cb);
-        });  
-    });
-}
-
 function readScreens(bl, display, cbDisplayReady)
 {
+     var numParsedDepths = 0;
+     var readDepths = function(bl, display, depths, n_depths, cb)
+     {
+         if (n_depths == 0)
+         {
+             cb();
+             return;
+         }
+
+         bl.unpack( 'CxSxxxx', function(res) {
+             var dep = res[0];
+             var n_visuals = res[1];
+             var visuals = {};
+             readVisuals(bl, visuals, n_visuals, function()
+             {
+                 if (dep in depths) {
+                     for (var visual in visuals) {
+                         depths[dep][visual] = visuals[visual];
+                     }
+                 } else {
+                     depths[dep] = visuals;
+                 }
+                 numParsedDepths++;
+                 if (numParsedDepths == n_depths)
+                     cb();
+                 else
+                     readDepths(bl, display, depths, n_depths, cb);
+             });  
+         });
+     }
+
      // for (i=0; i < display.screen_num; ++i)
      {
          var scr = {};
@@ -90,7 +98,7 @@ function readScreens(bl, display, cbDisplayReady)
                  if (display.screen.length == display.screen_num)
                  {
                      delete display.screen_num;
-                     cbDisplayReady(display);
+                     cbDisplayReady(null, display);
                      return;
                  } else {
                      readScreens(bl, display, cbDisplayReady);
@@ -108,9 +116,14 @@ bl.unpack('C', function(res) {
      if (res[0] == 0)
      {
          // conection time error
-         // unpack error (? TODO)
+         // unpack error
-         var err = new Error;
+         bl.unpack('Cxxxxxx', function (rlen) {
-         cb(err); // TODO: detect that this is error on xcore side
+             bl.get(rlen[0], function (reason) {
+                 var err = new Error;
+                 err.message = 'X server connection failed: ' + reason.toString();
+                 cb(err);
+             });
+         });
          // TODO: do we need to close stream from our side?
          // TODO: api to close source stream via attached unpackstream
          return;
@@ -189,9 +202,12 @@ function getByteOrder() {
     }
 }
 
-function writeClientHello(stream, displayNum, authHost)
+function writeClientHello(stream, displayNum, authHost, authFamily)
 {
-    getAuthString( displayNum, authHost, function( authType, authData ) {
+    getAuthString( displayNum, authHost, authFamily, function( err, cookie ) {
+        if (err) {
+            throw err;
+        }
         var byte_order = getByteOrder();
         var protocol_major = 11; // TODO: config? env?
         var protocol_minor = 0;
@@ -201,10 +217,10 @@ function writeClientHello(stream, displayNum, authHost)
             byte_order,
             protocol_major,
             protocol_minor,
-            authType.length,
+            cookie.authName.length,
-            authData.length,
+            cookie.authData.length,
-            authType,
+            cookie.authName,
-            authData
+            cookie.authData
             ]
         );
         stream.flush();

lib/hexy.js

@@ -7,7 +7,7 @@
 // It should create a pleasant looking hex dumb by default:
 //    
 //    var hexy = require('hexy.js'),
-//           b = new Buffer("\000\001\003\005\037\012\011bcdefghijklmnopqrstuvwxyz0123456789")
+//           b = Buffer.alloc("\000\001\003\005\037\012\011bcdefghijklmnopqrstuvwxyz0123456789")
 //    
 //    console.log(hexy.hexy(b))
 //

lib/index.js

@@ -1,13 +1,20 @@
 var core = require('./xcore');
 var em = require('./eventmask').eventMask;
-var keysyms = require('./keysyms');
 var server = require('./xserver');
 
 module.exports.createClient = core.createClient;
 module.exports.createServer = server.createServer;
 module.exports.eventMask = em;
-module.exports.keySyms = keysyms;
 
+Object.defineProperty(module.exports, 'keySyms', {
+  enumerable: true,
+  get: function() { return require('./keysyms'); }
+});
+
+Object.defineProperty(module.exports, 'gcFunction', {
+  enumerable: true,
+  get: function() { return require('./gcfunction'); }
+});
 
 //TODO:
 // keepe everything in namespace for consistensy (eventMask, keySyms, class, destination ...

lib/keysyms.update.sh

@@ -0,0 +1,35 @@
+#!/bin/bash -e
+
+keysymdef_url=http://cgit.freedesktop.org/xorg/proto/xproto/plain/keysymdef.h
+keysymdef=$(mktemp)
+
+wget $keysymdef_url -O $keysymdef
+
+(
+echo "
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\\
+
+   This file is automatically translated from X.Org's xproto/keysymdef.h
+   Please, do not update this file with your hands, run $(basename "$0").
+
+\\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+module.exports = {
+"
+
+sed -r '
+  s/#ifdef\s+/\/\/ Group /
+  s/#endif.*//
+  s/#define\s+([^ ]+)(\s+)([^ ]+)\s*\/\*\s*([^\*]+[^ ])\s*\*\//  \1:\2{ code: \3, description: "\4" },/
+  s/(\b)U\+([0-9A-F]+)(\b)/\1(\\u\2)\3/i
+  s/#define\s+([^ ]+)(\s+)([^ ]+)/  \1:\2{ code: \3, description: null },/
+  #s/#define\s+([^ ]+)(\s+[^ ]+)/  \1:\2,/
+' $keysymdef
+
+echo -n '
+  NoSymbol: 0
+};'
+
+) > "$(dirname "$0")/keysyms.js"
+
+rm $keysymdef

lib/unpackstream.js

@@ -23,7 +23,7 @@ function ReadFixedRequest(length, callback)
 {
     this.length = length;
     this.callback = callback;
-    this.data = new Buffer(length);
+    this.data = Buffer.alloc(length);
     this.received_bytes = 0;
 }
 
@@ -201,7 +201,7 @@ UnpackStream.prototype.pstr = function(str)
     var len = xutil.padded_length(str.length);
     if (len == 0)
         return; // nothing to write
-    var buf = new Buffer(len);
+    var buf = Buffer.alloc(len);
     buf.write(str, 'binary');
     this.write_queue.push(buf);
 }
@@ -231,7 +231,7 @@ UnpackStream.prototype.pack = function(format, args)
         }
     }
 
-    var buf = new Buffer(packetlength);
+    var buf = Buffer.alloc(packetlength);
     var offset = 0;
     var arg = 0;
     for (var i = 0; i < format.length; ++i)
@@ -245,13 +245,23 @@ UnpackStream.prototype.pack = function(format, args)
                 var n = args[arg++];
                 buf[offset++] = n;
                 break;
-            case 's': // TODO: implement signed INT16!!!
+            case 's':
+                var n = args[arg++];
+                buf.writeInt16LE(n, offset);
+                offset += 2;
+                break;
+
             case 'S':
                 var n = args[arg++];
                 buf[offset++] = n & 0xff;
                 buf[offset++] = (n >> 8) & 0xff;
                 break;
-            case 'l': // TODO: implement signed INT32!!!
+            case 'l':
+                var n = args[arg++];
+                buf.writeInt32LE(n, offset);
+                offset += 4;
+                break;
+
             case 'L':
                 var n = args[arg++];
                 buf[offset++] = n & 0xff;
@@ -259,12 +269,14 @@ UnpackStream.prototype.pack = function(format, args)
                 buf[offset++] = (n >> 16) & 0xff;
                 buf[offset++] = (n >> 24) & 0xff;
                 break;
-            case 'a':  // string or buffer
+            case 'a':  // string, buffer, or array
                 var str = args[arg++];
                 if (Buffer.isBuffer(str))
                 {
                     str.copy(buf, offset);
                     offset += str.length;
+                } else if(Array.isArray(str)) {
+                	for(var item of str) buf[offset++] = item;
                 } else {
                     // TODO: buffer.write could be faster
                     for (var c = 0; c < str.length; ++c)

lib/xcore.js

@@ -6,7 +6,6 @@ var handshake = require('./handshake');
 
 var EventEmitter = require('events').EventEmitter;
 var PackStream = require('./unpackstream');
-var coreRequestsTemplate = require('./corereqs');
 var hexy = require('./hexy').hexy;
 
 var Buffer = require('buffer').Buffer;
@@ -18,11 +17,30 @@ var os = require('os');
 var xerrors = require('./xerrors');
 var coreRequests = require('./corereqs');
 var stdatoms = require('./stdatoms');
+var em = require('./eventmask').eventMask;
 
-function XClient(stream, displayNum, screenNum, options)
+function stash ()
+{
+    require('./ext/apple-wm');
+    require('./ext/big-requests');
+    require('./ext/composite');
+    require('./ext/damage');
+    require('./ext/dpms');
+    require('./ext/fixes');
+    require('./ext/glxconstants');
+    require('./ext/glx');
+    require('./ext/glxrender');
+    require('./ext/randr');
+    require('./ext/render');
+    require('./ext/screen-saver');
+    require('./ext/shape');
+    require('./ext/xc-misc');
+    require('./ext/xtest');
+}
+
+function XClient(displayNum, screenNum, options)
 {
     EventEmitter.call(this);
-    this.stream = stream;
     this.options = options ? options : {};
 
     // TODO: this is probably not used
@@ -31,7 +49,20 @@ function XClient(stream, displayNum, screenNum, options)
 
     this.displayNum = displayNum;
     this.screenNum = screenNum;
-    this.authHost = os.hostname();
+}
+util.inherits(XClient, EventEmitter);
+
+XClient.prototype.init = function(stream)
+{
+    this.stream = stream;
+
+    this.authHost = stream.remoteAddress;
+    // Node v0.10.x does not have stream.remoteFamily, so dig in to find it
+    this.authFamily = stream._getpeername ? stream._getpeername().family : stream.remoteFamily;
+    if (!this.authHost || this.authHost === '127.0.0.1' || this.authHost === '::1') {
+      this.authHost = os.hostname();
+      this.authFamily = null;
+    }
 
     var pack_stream = new PackStream();
 
@@ -63,8 +94,26 @@ function XClient(stream, displayNum, screenNum, options)
     this.pack_stream = pack_stream;
 
     this.rsrc_id = 0; // generated for each new resource
-    this.seq_num = 0; // incremented in each request. (even if we don't expect reply)
+    var cli = this;
-    this.seq2stack = {}; // debug: map seq_num to stack at the moment request was issued   
+    if (cli.options.debug) {
+      this.seq_num_ = 0;
+      this.seq2stack = {}; // debug: map seq_num to stack at the moment request was issued
+      Object.defineProperty(cli, "seq_num", {
+        set : function(v) {
+          cli.seq_num_ = v;
+          var err = new Error();
+          Error.captureStackTrace(err, arguments.callee);
+          err.timestamp = Date.now();
+          cli.seq2stack[client.seq_num] = err;
+        },
+        get: function() {
+	  return cli.seq_num_;
+        }
+      });
+    } else {
+      this.seq_num = 0;
+    }
+
 
     // in/out packets indexed by sequence ID
     this.replies = {};
@@ -78,15 +127,19 @@ function XClient(stream, displayNum, screenNum, options)
         return names;
     })();
 
+    this.eventMask = em;
+
     this.event_consumers = {}; // maps window id to eventemitter TODO: bad name
     this.eventParsers = {};
+    this.errorParsers = {};
+    this._extensions = {};
 
     this.importRequestsFromTemplates(this, coreRequests);
 
     this.startHandshake();
     this._closing = false;
+    this._unusedIds = [];
 }
-util.inherits(XClient, EventEmitter);
 
 // TODO: close() = set 'closing' flag, watch it in replies and writeQueue, terminate if empty
 XClient.prototype.terminate = function()
@@ -135,18 +188,6 @@ XClient.prototype.importRequestsFromTemplates = function(target, reqs)
             else
                client.seq_num++;
 
-            // disable long stack trace for the moment, it's too expensive
-            // performance when enabled (travis-ci worker, Xfvb): 70000 requests finished in 52196 ms, 1341.0989347842747 req/sec
-            // without: 70000 requests finished in 14904 ms, 4696.725711218465 req/sec
-            // MBPro, XQuartz: with 3600 req/sec, without 24200 req/sec 
-            if (this.options.debug === true) {
-               var err = new Error();
-               err.name = reqName; //???
-               Error.captureStackTrace(err, arguments.callee);
-               err.timestamp = Date.now();
-               client.seq2stack[client.seq_num] = err;
-            }
-
             // is it fast?
             var args = Array.prototype.slice.call(req_proxy.arguments);
 
@@ -168,7 +209,7 @@ XClient.prototype.importRequestsFromTemplates = function(target, reqs)
                      var value = req_proxy.arguments[1];
                      if (client.atoms[value]) {
                          -- client.seq_num;
-                         return process.nextTick(function() {
+                         return setImmediate(function() {
                              callback(undefined, client.atoms[value]);
                          });
                      } else {
@@ -194,7 +235,7 @@ XClient.prototype.importRequestsFromTemplates = function(target, reqs)
                      var atom = req_proxy.arguments[0];
                      if (client.atom_names[atom]) {
                          -- client.seq_num;
-                         return process.nextTick(function() {
+                         return setImmediate(function() {
                              callback(undefined, client.atom_names[atom]);
                          });
                      } else {
@@ -226,13 +267,20 @@ XClient.prototype.importRequestsFromTemplates = function(target, reqs)
 
 XClient.prototype.AllocID = function()
 {
-    // TODO: handle overflow (XCMiscGetXIDRange from XC_MISC ext)
+  if (this._unusedIds.length > 0) {
-    // TODO: unused id buffer
+    return this._unusedIds.pop();
-    this.display.rsrc_id++;
+  }
-    return (this.display.rsrc_id << this.display.rsrc_shift) + this.display.resource_base;
+  // TODO: handle overflow (XCMiscGetXIDRange from XC_MISC ext)
-}
+  this.display.rsrc_id++;
+  return (this.display.rsrc_id << this.display.rsrc_shift) + this.display.resource_base;
+};
 
-XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
+XClient.prototype.ReleaseID = function(id) {
+  this._unusedIds.push(id);
+};
+
+// TODO: move core events unpackers to corereqs.js
+XClient.prototype.unpackEvent = function(type, seq, extra, code, raw, headerBuf)
 {
     var event = {}; // TODO: constructor & base functions
     // Remove the most significant bit. See Chapter 1, Event Format section in X11 protocol
@@ -251,7 +299,7 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         var values = raw.unpack('LLLssssSC');
         //event.raw = values;
         // TODO: use unpackTo???
-        event.name = [,,'KeyPress', 'KeyRelease', 'MouseDown', 'MouseUp', 'MouseMove'][type]
+        event.name = [,,'KeyPress', 'KeyRelease', 'ButtonPress', 'ButtonRelease', 'MotionNotify'][type]
         event.time = extra;
         event.keycode = code;
         event.root = values[0];
@@ -263,8 +311,8 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.y = values[6];
         event.buttons = values[7];
         event.sameScreen = values[8];
-    } else if (type == 7) { //EnterWindow
+    } else if (type == 7 || type == 8) { //EnterNotify || LeaveNotify
-        event.name = 'EnterWindow'
+        event.name = type === 7 ? 'EnterNotify' : 'LeaveNotify';
         var values = raw.unpack('LLLssssSC');
         event.root = values[0]
         event.wid = values[1]
@@ -274,7 +322,14 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.x = values[5];
         event.y = values[6];
         event.values = values
-
+    } else if (type == 9) { // FocusIn
+        event.name = "FocusIn";
+        event.mode = raw.unpack('C')[0];
+        event.wid = extra;
+    } else if (type == 10) { // FocusOut
+        event.name = "FocusOut";
+        event.mode = raw.unpack('C')[0];
+        event.wid = extra;
     } else if (type == 12) { // Expose
         var values = raw.unpack('SSSSS');
         event.name = 'Expose'
@@ -285,35 +340,44 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.height = values[3];
         event.count = values[4]; // TODO: ???
     } else if (type == 16) { // CreateNotify
-        var values = raw.unpack('LLssSSSc');
+        var values = raw.unpack('LssSSSc');
         event.name = 'CreateNotify'
         event.parent = extra;
         event.wid = values[0];
-        event.x = values[2];
+        event.x = values[1];
-        event.y = values[3];
+        event.y = values[2];
-        event.width = values[4];
+        event.width = values[3];
-        event.height = values[5];
+        event.height = values[4];
+        event.borderWidth = values[5];
         event.overrideRedirect = values[6] ? true : false;
         // x, y, width, height, border
     } else if (type == 17) { // destroy notify
-        var values = raw.unpack('LL');
+        var values = raw.unpack('L');
         event.name = 'DestroyNotify'
-        event.wid = extra;
+        event.event = extra;
-        event.wid1 = values[0];
+        event.wid = values[0];
+    } else if (type == 18) { // UnmapNotify
+        var values = raw.unpack('LC');
+        event.name = 'UnmapNotify'
+        event.event = extra;
+        event.wid = values[0];
+        event.fromConfigure = values[1] ? true : false;
     } else if (type == 19) { // MapNotify
-        var values = raw.unpack('LLC');
+        var values = raw.unpack('LC');
         event.name = 'MapNotify'
-        event.wid = extra;
+        event.event = extra;
-        event.wid1 = values[0];
+        event.wid = values[0];
+        event.overrideRedirect = values[1] ? true : false;
     } else if (type == 20) {
-        var values = raw.unpack('LL');
+        var values = raw.unpack('L');
         event.name = 'MapRequest'
         event.parent = extra;
         event.wid = values[0];
     } else if (type == 22) {
         var values = raw.unpack('LLssSSSC');
-        event.name = 'Overlap' //?
+        event.name = 'ConfigureNotify';
         event.wid = extra;
+        // TODO rename
         event.wid1 = values[0];
         event.aboveSibling = values[1];
         event.x = values[2];
@@ -323,15 +387,17 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.borderWidth = values[6];
         event.overrideRedirect = values[7];
     } else if (type == 23) {
-        var values = raw.unpack('LLLssSSS');
+        var values = raw.unpack('LLssSSSS');
-        event.name = 'ConfigureRequest'
+        event.name = 'ConfigureRequest';
+        event.stackMode = code;
         event.parent = extra;
         event.wid = values[0];
-        event.x = values[1]
+        event.sibling = values[1];
-        event.y = values[2]
+        event.x = values[2]
-        event.width = values[3]
+        event.y = values[3]
-        event.height = values[4]
+        event.width = values[4]
-        event.borderWidth = values[5];
+        event.height = values[5]
+        event.borderWidth = values[6];
         //
         // The value-mask indicates which components were specified in
         // the request. The value-mask and the corresponding values are reported as given
@@ -344,7 +410,7 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
     } else if (type == 28) {// PropertyNotify
         event.name = 'PropertyNotify';
         var values = raw.unpack('LLC');
-        event.window = extra;
+        event.wid = extra;
         event.atom = values[0];
         event.time = values[1];
         event.state = values[2];
@@ -356,6 +422,7 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.selection = values[1];
     } else if (type == 30) {// SelectionRequest
         event.name = 'SelectionRequest';
+        // TODO check this
         event.time = extra;
         var values = raw.unpack('LLLLL');
         event.owner = values[0];
@@ -365,25 +432,39 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.property = values[4];
     } else if (type == 31) {// SelectionNotify
         event.name = 'SelectionNotify';
+        // TODO check this
         event.time = extra;
         var values = raw.unpack('LLLL');
         event.requestor = values[0];
         event.selection = values[1];
         event.target = values[2];
         event.property = values[3];
+    } else if (type == 33) {// ClientMessage
+        event.name = 'ClientMessage';
+        event.format = code;
+        event.wid = extra;
+        event.message_type = raw.unpack('L')[0];
+        var format = (code === 32) ? 'LLLLL' : (code === 16) ? 'SSSSSSSSSS' : 'CCCCCCCCCCCCCCCCCCCC';
+        event.data = raw.unpack(format, 4);
+    } else if (type == 34) {
+        event.name = 'MappingNotify';
+        event.request = headerBuf[4];
+        event.firstKeyCode = headerBuf[5];
+        event.count = headerBuf[6];
     }
     return event;
 }
 
 XClient.prototype.expectReplyHeader = function()
 {
-    // TODO: BigReq!!!!
+    // TODO: move error parsers to corereqs.js
 
     var client = this;
     client.pack_stream.get( 8, function(headerBuf) {
             var res = headerBuf.unpack('CCSL');
             var type = res[0];
             var seq_num = res[2];
+            var bad_value = res[3];
 
             if (type == 0)
             {
@@ -391,21 +472,25 @@ XClient.prototype.expectReplyHeader = function()
                 var error = new Error();
                 error.error = error_code;
                 error.seq = seq_num;
-                error.message = xerrors.errorText[error_code];
+                if (client.options.debug) {
-                if (client.options.debug)
+                  error.longstack = client.seq2stack[error.seq]
-                    error.stack = client.seq2stack[error.seq]
+                  console.log(client.seq2stack[error.seq].stack);
+                }
 
                 // unpack error packet (32 bytes for all error types, 8 of them in CCSL header)
                 client.pack_stream.get(24, function(buf) {
-                    // TODO: dispatch, use sequence number
+
-                    //TODO: add more generic way to read common values
+		    var res = buf.unpack('SC');
-                    // if (error_code == 14)
+	   	    error.message = xerrors.errorText[error_code];
-                    {
+		    error.badParam = bad_value;
-                        var res = buf.unpack('LSC');
+		    error.minorOpcode = res[0];
-                        error.badParam = res[0]; // id: GC, WinID, Font, Atom etc; Value
+		    error.majorOpcode = res[1];
-                        error.minorOpcode = res[1];
+
-                        error.majorOpcode = res[2];                       
+	            var extUnpacker = client.errorParsers[error_code];
+                    if (extUnpacker) {
+                      extUnpacker(error, error_code, seq_num, bad_value, buf);
                     }
+
                     var handler = client.replies[seq_num];
                     if (handler) {
                         var callback = handler[1];
@@ -413,7 +498,8 @@ XClient.prototype.expectReplyHeader = function()
                         if (!handled)
                             client.emit('error', error);
                         // TODO: should we delete seq2stack and reply even if there is no handler?
-                        delete client.seq2stack[seq_num];
+			if (client.options.debug)
+                          delete client.seq2stack[seq_num];
                         delete client.replies[seq_num];
                     } else
                         client.emit('error', error);
@@ -425,11 +511,11 @@ XClient.prototype.expectReplyHeader = function()
                 client.pack_stream.get(24, function(buf) {
                     var extra = res[3];
                     var code = res[1];
-                    var ev = client.unpackEvent(type, seq_num, extra, code, buf);
+                    var ev = client.unpackEvent(type, seq_num, extra, code, buf, headerBuf);
 
                     // raw event 32-bytes packet (primarily for use in SendEvent);
                     // TODO: Event::pack based on event parameters, inverse to unpackEvent
-                    ev.rawData = new Buffer(32);
+                    ev.rawData = Buffer.alloc(32);
                     headerBuf.copy(ev.rawData);
                     buf.copy(ev.rawData, 8);
 
@@ -438,6 +524,11 @@ XClient.prototype.expectReplyHeader = function()
                     if (ee) {
                        ee.emit('event', ev);
                     }
+                    if (ev.parent) {
+                       ee = client.event_consumers[ev.parent];
+                       if (ee)
+                         ee.emit('child-event', ev);
+                    }
                     client.expectReplyHeader();
                 } );
                 return;
@@ -469,15 +560,16 @@ XClient.prototype.expectReplyHeader = function()
     );
 }
 
-XClient.prototype.startHandshake = function()
+XClient.prototype.startHandshake = function() {
-{
     var client = this;
 
-    handshake.writeClientHello(this.pack_stream, this.displayNum, this.authHost);
+    handshake.writeClientHello(this.pack_stream, this.displayNum, this.authHost, this.authFamily);
-    handshake.readServerHello(this.pack_stream, function(display) 
+    handshake.readServerHello(this.pack_stream, function(err, display)
     {
-        // TODO: readServerHello can set error state in display
+        if (err) {
-        // emit error in that case
+            client.emit('error', err);
+            return;
+        }
         client.expectReplyHeader();
         client.display = display;
         display.client = client;
@@ -487,9 +579,24 @@ XClient.prototype.startHandshake = function()
 
 XClient.prototype.require = function(extName, callback)
 {
-   var ext = require('./ext/' + extName);
+   var self = this;
-   ext.requireExt(this.display, callback);
+   var ext = this._extensions[extName];
-}
+   if (ext) {
+       return process.nextTick(function() {
+           callback(null, ext);
+       });
+   }
+
+   ext = require('./ext/' + extName);
+   ext.requireExt(this.display, function(err, _ext) {
+       if (err) {
+           return callback(err);
+       }
+
+       self._extensions[extName] = _ext;
+       callback(null, _ext);
+   });
+};
 
 module.exports.createClient = function(options, initCb)
 {
@@ -509,8 +616,6 @@ module.exports.createClient = function(options, initCb)
        throw new Error("Cannot parse display");
 
     var host = displayMatch[1];
-    if (!host)
-        host = '127.0.0.1';
 
     var displayNum = displayMatch[2];
     if (!displayNum)
@@ -521,6 +626,8 @@ module.exports.createClient = function(options, initCb)
 
     // open stream
     var stream;
+    var connected = false;
+    var cbCalled = false;
     var socketPath;
 
     // try local socket on non-windows platforms
@@ -533,41 +640,55 @@ module.exports.createClient = function(options, initCb)
             {
                 socketPath = display;
             }
-        } else if(host == '127.0.0.1') //TODO check if it's consistent with xlib (DISPLAY=127.0.0.1:0 -> local unix socket or port 6000?)
+        } else if(!host)
             socketPath = '/tmp/.X11-unix/X' + displayNum;
     }
-    //socketPath = '/tmp/.X11-unix/X' + displayNum;
+    var client = new XClient(displayNum, screenNum, options);
-    if(socketPath)
+
-    {
+    var connectStream = function() {
-      stream = net.createConnection(socketPath);
+        if (socketPath) {
-    }
+            stream = net.createConnection(socketPath);
-    else
+        } else {
-    {
+            stream = net.createConnection(6000 + parseInt(displayNum), host);
-      stream = net.createConnection(6000 + parseInt(displayNum), host);
+        }
-    }
+        stream.on('connect', function() {
-    var client = new XClient(stream, displayNum, screenNum, options);
+            connected = true;
+            client.init(stream);
+        });
+        stream.on('error', function(err) {
+            if (!connected && socketPath && err.code === 'ENOENT') {
+                // Retry connection with TCP on localhost
+                socketPath = null;
+                host = 'localhost';
+                connectStream();
+            } else if (initCb && !cbCalled) {
+                cbCalled = true;
+                initCb(err);
+            } else {
+                client.emit('error', err);
+            }
+        });
+    };
+    connectStream();
     if (initCb)
     {
         client.on('connect', function(display) {
-            // Once connected don't call initCb on error, just emit
-            stream.removeListener('error', initCb);
-            stream.on('error', function(err) {
-                client.emit('error', err);
-            });
             // opt-in BigReq
             if (!options.disableBigRequests) {
-                client.require('big-requests', function(BigReq) {
+                client.require('big-requests', function(err, BigReq) {
+                    if (err)
+                        return initCb(err)
                     BigReq.Enable(function(err, maxLen) {
                         display.max_request_length = maxLen;
+	                cbCalled = true;
                         initCb(undefined, display);
                     });
                 });
             } else {
+	        cbCalled = true;
                 initCb(undefined, display);
             }
         });
-
-        stream.on('error', initCb);
     }
     return client;
 }

package.json

@@ -12,11 +12,15 @@
     "X"
   ],
   "homepage": "https://github.com/sidorares/node-x11",
-  "version": "0.4.0",
+  "version": "2.3.0",
   "maintainers": [
     {
       "name": "Andrey Sidorov",
       "email": "sidoares@yandex.ru"
+    },
+    {
+      "name": "Santiago Gimeno",
+      "email": "santiago.gimeno@gmail.com"
     }
   ],
   "bugs": {
@@ -36,14 +40,15 @@
     "node": "*"
   },
   "devDependencies": {
-    "mocha": "*",
+    "async": "^3.0.1",
-    "should": "*",
+    "mocha": "^7.1.2",
-    "sax": "*",
+    "sax": "^1.2.4",
-    "async": "*",
+    "should": "^13.2.1",
-    "sinon": "*"
+    "sinon": "^7.2.5"
   },
   "scripts": {
     "test": "node test-runner.js",
     "prepublish": "npm prune"
-  }
+  },
+  "dependencies": {}
 }

test-runner.js

@@ -2,90 +2,109 @@ var x11 = require('./lib');
 var Mocha = require('mocha');
 var fs = require('fs');
 var path = require('path');
-var util = require('util');
 var async = require('async');
 
 var mocha = new Mocha({
-    timeout : 80000
+    timeout : 80000,
+    reporter : 'spec'
 });
 
 // To be able to perform the tests we need the server:
 // 1 - to support the dpms extension.
 // 2 - dpms version is 1.1.
 // 3 - to be dpms capable.
-var run_dpms_test = function(cb) {
+var run_dpms_test = function(X, cb) {
-    var client = x11.createClient(function(err, dpy) {
+    X.require('dpms', function(err, ext) {
-        if (err) return cb(false);
+        if (!err) {
-        var display = dpy;
+            var dpms = ext;
-        var X = display.client;
+            dpms.GetVersion(undefined, undefined, function(err, version) {
-        X.require('dpms', function(ext) {
+                if (!err && version[0] === 1 && version[1] === 1) {
-            if (!util.isError(ext)) {
+                    dpms.Capable(function(err, capable) {
-                dpms = ext;
+                        if (!err && capable[0] == 1) cb(true);
-                dpms.GetVersion(undefined, undefined, function(err, version) {
+                        else cb(false);
-                    if (!err && version[0] === 1 && version[1] === 1) {
+                    });
-                        dpms.Capable(function(err, capable) {
+                } else {
-                            if (!err && capable[0] == 1) cb(true);
+                    cb(false);
-                            else cb(false);
-                        });
-                    } else {
-                        cb(false);
-                    }
-                });
-            } else {
-                cb(false);
-            }
-        });
-    });
-
-    client.on('error', function() {
-        cb(false);
-    });
-};
-
-var run_xtest_test = function(cb) {
-    var client = x11.createClient(function(err, dpy) {
-        if (err) return cb(false);
-        var display = dpy;
-        var X = display.client;
-        X.require('dpms', function(ext) {
-            if (!util.isError(ext)) cb(true);
-            else cb(false);
-        });
-    });
-
-    client.on('error', function() {
-        cb(false);
-    });
-};
-
-// Add all files from test root directory
-async.forEach(
-    fs.readdirSync('./test'),
-    function(file, cb) {
-        if (file === 'dpms.js') {
-            run_dpms_test(function(run) {
-                if (run) {
-                    mocha.addFile(path.join('./test', file));
                 }
-
-                cb();
-            });
-        } else if (file === 'xtest.js') {
-            run_xtest_test(function(run) {
-                if (run) {
-                    mocha.addFile(path.join('./test', file));
-                }
-
-                cb();
             });
         } else {
-            mocha.addFile(path.join('./test', file));
+            cb(false);
-            cb();
         }
-    },
+    });
-    function(err) {
+};
-        mocha.run(function() {
+
-            process.exit();
+var run_xtest_test = function(X, cb) {
-        });
+    X.require('xtest', function(err) {
+        if (!err) cb(true);
+        else cb(false);
+    });
+};
+
+var run_randr_test = function(X, cb) {
+    X.require('randr', function(err, ext) {
+        if (!err) {
+            var randr = ext;
+            randr.QueryVersion(1, 2, function(err, version) {
+                if (err) {
+                    cb(false);
+                } else {
+                    cb((version[0] === 1) && (version[1] >= 2));
+                }
+            });
+        } else {
+            cb(false);
+        }
+    });
+};
+
+x11.createClient(function(err, display) {
+    if (err) {
+        console.log('Could not create X client');
+        process.exit(-1);
     }
-);
+
+    var X = display.client;
+    // Add all files from test root directory
+    async.forEach(
+        fs.readdirSync('./test'),
+        function(file, cb) {
+            if (file === 'dpms.js') {
+                run_dpms_test(X, function(run) {
+                    if (run) {
+                        mocha.addFile(path.join('./test', file));
+                    }
+
+                    cb();
+                });
+            } else if (file === 'xtest.js') {
+                run_xtest_test(X, function(run) {
+                    if (run) {
+                        mocha.addFile(path.join('./test', file));
+                    }
+
+                    cb();
+                });
+            } else if (file === 'randr.js') {
+                run_randr_test(X, function(run) {
+                    if (run) {
+                        mocha.addFile(path.join('./test', file));
+                    }
+
+                    cb();
+                });
+            } else {
+                mocha.addFile(path.join('./test', file));
+                cb();
+            }
+        },
+        function() {
+            X.terminate();
+            X.on('end', function() {
+                mocha.run(function(failures) {
+                    process.exit(failures);
+                });
+            });
+
+        }
+    );
+});

test/allow-events.js

@@ -0,0 +1,103 @@
+var x11 = require('../lib');
+var should = require('should');
+var assert = require('assert');
+
+// This test was ported from X Test Suite @ http://cgit.freedesktop.org/xorg/test/xts/
+
+function warp_pointer(wid, x, y, cb) {
+    var self = this;
+    this.X.QueryPointer(wid, function(err, old_pointer) {
+        if (err) {
+            return cb(err);
+        }
+
+        self.X.WarpPointer(0,
+                           wid,
+                           0,
+                           0,
+                           0,
+                           0,
+                           x,
+                           y);
+
+        self.X.QueryPointer(wid, function(err, new_pointer) {
+            if (err) {
+                return cb(err);
+            }
+
+            cb(undefined, {
+                old_x : old_pointer.childX,
+                old_y : old_pointer.childY,
+                new_x : new_pointer.childX,
+                new_y : new_pointer.childY
+            });
+        });
+    });
+}
+
+function is_pointer_frozen(cb) {
+    var self = this;
+    warp_pointer.call(this, this.wid, 0, 0, function(err) {
+        if (err) {
+            return cb(err);
+        }
+
+        warp_pointer.call(self, self.wid, 1, 1, function(err, data) {
+            if (err) {
+                return cb(err);
+            }
+
+            cb(undefined, data.old_x === data.new_x);
+        });
+    });
+}
+
+describe('AllowEvents', function() {
+    before(function(done) {
+        var self = this;
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            self.screen = dpy.screen[0];
+            self.root = self.screen.root;
+            self.wid = self.X.AllocID();
+            self.X.CreateWindow(self.wid,
+                                self.root,
+                                0,
+                                0,
+                                self.screen.pixel_width,
+                                self.screen.pixel_height);
+            self.X.MapWindow(self.wid);
+            done();
+        });
+
+        client.on('error', function (err) {
+            console.error('Error : ', err);
+        });
+    });
+
+    it('if pointer is frozen by the client calling AllowEvents with AsyncPointer should resume the processing', function(done) {
+        var self = this;
+        this.X.GrabPointer(
+            this.wid,
+            false,
+            x11.eventMask.PointerMotion,
+            0, // sync
+            1, // async
+            0, // None
+            0, // None
+            0
+        );
+
+        is_pointer_frozen.call(this, function(err, frozen) {
+            should.not.exist(err);
+            frozen.should.equal(true);
+            self.X.AllowEvents(0, 0);
+            is_pointer_frozen.call(self, function(err, frozen) {
+                should.not.exist(err);
+                frozen.should.equal(false);
+                done();
+            });
+        });
+    });
+});

test/atoms-cache.js

@@ -63,7 +63,7 @@ describe('Atoms and atom names cache', function() {
         });
     });
 
-    it('should be used after the first request for non-std atom_names', function(done) {
+    xit('should be used after the first request for non-std atom_names', function(done) {
         var self = this;
         var my_name;
         /*
@@ -94,7 +94,7 @@ describe('Atoms and atom names cache', function() {
             function(err) {
                 should.not.exist(err);
                 should.exist(my_name);
-                self.spy.reset();
+                self.spy.resetHistory();
                 self.X.InternAtom(true, my_name, function(err, atom) {
                     should.not.exist(err);
                     my_atom.should.equal(atom);

test/cache-extensions.js

@@ -0,0 +1,34 @@
+var x11 = require('../lib');
+var should = require('should');
+
+describe('requiring an X11 extension on same connection', function() {
+    before(function(done) {
+        var self = this;
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            done();
+        });
+
+        client.on('error', function (err) {
+            console.error('Error : ', err);
+        });
+    });
+
+    it('should be cached', function(done) {
+        var self = this;
+        this.X.require('xtest', function(err, randr) {
+            should.not.exist(err);
+            self.X.require('xtest', function(err, randr1) {
+                should.not.exist(err);
+                randr.should.equal(randr1);
+                done();
+            });
+        });
+    });
+
+    after(function(done) {
+        this.X.terminate();
+        this.X.on('end', done);
+    });
+});

test/change-property.js

@@ -0,0 +1,93 @@
+var x11 = require('../lib');
+var should = require('should');
+
+var TEST_PROPERTY = 'My Test Property';
+
+describe('ChangeProperty', function() {
+    before(function(done) {
+        var self = this;
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            self.wid = self.X.AllocID();
+            self.wid_helper = self.X.AllocID();
+            self.X.CreateWindow(self.wid, dpy.screen[0].root, 0, 0, 1, 1); // 1x1 pixel window
+            self.X.QueryTree(dpy.screen[0].root, function(err, list) {
+                should.not.exist(err);
+                list.children.indexOf(self.wid).should.not.equal(-1);
+                self.X.ChangeWindowAttributes(self.wid, { eventMask: x11.eventMask.PropertyChange });
+                done();
+            });
+        });
+
+        client.on('error', done);
+    });
+
+    it('should add a new WINDOW property with length 1', function(done) {
+        var self = this;
+        this.X.InternAtom(false, TEST_PROPERTY, function(err, atom) {
+            should.not.exist(err);
+            var raw = Buffer.alloc(4);
+            raw.writeUInt32LE(self.wid, 0);
+            self.X.ChangeProperty(0, self.wid, atom, self.X.atoms.WINDOW, 32, raw);
+            self.X.once('event', function(ev) {
+                ev.type.should.equal(28);
+                ev.atom.should.equal(atom);
+                ev.wid.should.equal(self.wid);
+                self.X.GetProperty(0, self.wid, atom, self.X.atoms.WINDOW, 0, 1000000000, function(err, prop) {
+                    should.not.exist(err);
+                    prop.data.readUInt32LE(0).should.equal(self.wid);
+                    done();
+                });
+            });
+        });
+    });
+
+    it('should add a new WINDOW property with length 2', function(done) {
+        var self = this;
+        this.X.InternAtom(false, TEST_PROPERTY, function(err, atom) {
+            should.not.exist(err);
+            var raw = Buffer.from(new Array(8));
+            raw.writeUInt32LE(self.wid, 0);
+            raw.writeUInt32LE(self.wid_helper, 4);
+            self.X.ChangeProperty(0, self.wid, atom, self.X.atoms.ATOM, 32, raw);
+            self.X.once('event', function(ev) {
+                ev.type.should.equal(28);
+                ev.atom.should.equal(atom);
+                ev.wid.should.equal(self.wid);
+                self.X.GetProperty(0, self.wid, atom, self.X.atoms.ATOM, 0, 1000000000, function(err, prop) {
+                    should.not.exist(err);
+                    prop.data.readUInt32LE(0).should.equal(self.wid);
+                    prop.data.readUInt32LE(4).should.equal(self.wid_helper);
+                    done();
+                });
+            });
+        });
+    });
+
+    it('should replace a the WINDOW property with length 0', function(done) {
+        var self = this;
+        this.X.InternAtom(false, TEST_PROPERTY, function(err, atom) {
+            should.not.exist(err);
+            var raw = Buffer.alloc(0);
+            self.X.ChangeProperty(0, self.wid, atom, self.X.atoms.WINDOW, 32, raw);
+            self.X.once('event', function(ev) {
+                ev.type.should.equal(28);
+                ev.atom.should.equal(atom);
+                ev.wid.should.equal(self.wid);
+                self.X.GetProperty(0, self.wid, atom, self.X.atoms.WINDOW, 0, 1000000000, function(err, prop) {
+                    should.not.exist(err);
+                    prop.data.length.should.equal(0);
+                    done();
+                });
+            });
+        });
+    });
+
+    after(function(done) {
+        this.X.DestroyWindow(this.wid);
+        this.X.terminate();
+        this.X.on('end', done);
+    });
+});
+

test/changeGC.js

@@ -0,0 +1,54 @@
+var x11 = require('../lib');
+var should = require('should');
+
+describe('CreateGC', function() {
+    before(function(done) {
+        var self = this;
+        this.client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            self.root = dpy.screen[0].root;
+            self.white = dpy.screen[0].white_pixel;
+            self.black = dpy.screen[0].black_pixel;
+            self.wid = self.X.AllocID();
+            self.X.CreateWindow(self.wid, self.root, 0, 0, 1, 1); // 1x1 pixel window
+            self.X.MapWindow(self.wid);
+            self.X.QueryTree(self.root, function(err, list) {
+                should.not.exist(err);
+                list.children.indexOf(self.wid).should.not.equal(-1);
+                done();
+            });
+        });
+    });
+
+    it('should create a Graphic Context correctly', function() {
+        var self = this;
+        this.client.on('error', function(err) {
+            should.not.exist(err);
+        });
+
+        this.gc = this.X.AllocID();
+        this.X.CreateGC(this.gc,
+                        this.wid,
+                        {
+                            foreground: this.black,
+                            background: this.white,
+                            lineStyle : 0
+                        }
+        );
+        
+        this.X.ChangeGC(this.gc,
+                        {
+                            foreground: 0xffff00,
+                            background: 0x0000ff,
+                            lineStyle : 2
+                        }
+        );
+    });
+
+    after(function(done) {
+        this.X.DestroyWindow(this.wid);
+        this.X.on('end', done);
+        this.X.terminate();
+    });
+});

test/client-message.js

@@ -0,0 +1,114 @@
+var x11 = require('../lib');
+var UnpackStream = require('../lib/unpackstream.js');
+var should = require('should');
+
+//Used Atoms
+var ATOM = {};
+
+describe('ClientMessage', function() {
+    before(function(done) {
+      var self = this;
+      var client = x11.createClient(function(err, dpy) {
+          should.not.exist(err);
+          self.X = dpy.client;
+          self.wid = self.X.AllocID();
+          self.X.CreateWindow(self.wid, dpy.screen[0].root, 0, 0, 1, 1); // 1x1 pixel window
+
+          self.X.InternAtom(false, 'TEST_ATOM_1', function(err, atom) {
+              should.not.exist(err);
+              ATOM['TEST_ATOM_1'] = atom;
+
+              done();
+            });
+      });
+
+      client.on('error', done);
+    });
+
+    it('should receive client message with format=8', function(done) {
+        var self = this;
+
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X.once('event', function(ev) {
+                ev.name.should.equal('ClientMessage');
+                ev.wid.should.equal(self.wid);
+                ev.message_type.should.equal(ATOM.TEST_ATOM_1);
+                ev.data.should.be.an.Array();
+                ev.data.length.should.equal(20);
+                done();
+            });
+
+            var X = dpy.client;
+            var eventData = Buffer.alloc(32);
+            eventData.writeInt8(33, 0);                          //Event Type 33 = ClientMessage
+            eventData.writeInt8(8,  1);                          //Format
+            eventData.writeInt32LE(self.wid, 4);                 //Window ID
+            eventData.writeInt32LE(ATOM.TEST_ATOM_1, 8);         //Message Type
+
+            X.SendEvent(self.wid, false, 0, eventData);
+        });
+
+        client.on('error', done);
+    });
+
+    it('should receive client message with format=16', function(done) {
+        var self = this;
+
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X.once('event', function(ev) {
+                ev.name.should.equal('ClientMessage');
+                ev.wid.should.equal(self.wid);
+                ev.message_type.should.equal(ATOM.TEST_ATOM_1);
+                ev.data.should.be.an.Array();
+                ev.data.length.should.equal(10);
+                done();
+            });
+
+            var X = dpy.client;
+            var eventData = Buffer.alloc(32);
+            eventData.writeInt8(33, 0);                          //Event Type 33 = ClientMessage
+            eventData.writeInt8(16,  1);                          //Format
+            eventData.writeInt32LE(self.wid, 4);                 //Window ID
+            eventData.writeInt32LE(ATOM.TEST_ATOM_1, 8);         //Message Type
+
+            X.SendEvent(self.wid, false, 0, eventData);
+        });
+
+        client.on('error', done);
+    });
+
+    it('should receive client message with format=32', function(done) {
+        var self = this;
+
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X.once('event', function(ev) {
+                ev.name.should.equal('ClientMessage');
+                ev.wid.should.equal(self.wid);
+                ev.message_type.should.equal(ATOM.TEST_ATOM_1);
+                ev.data.should.be.an.Array();
+                ev.data.length.should.equal(5);
+                done();
+            });
+
+            var X = dpy.client;
+            var eventData = Buffer.alloc(32);
+            eventData.writeInt8(33, 0);                          //Event Type 33 = ClientMessage
+            eventData.writeInt8(32,  1);                         //Format
+            eventData.writeInt32LE(self.wid, 4);                 //Window ID
+            eventData.writeInt32LE(ATOM.TEST_ATOM_1, 8);         //Message Type
+
+            X.SendEvent(self.wid, false, 0, eventData);
+        });
+
+        client.on('error', done);
+    });
+
+    after(function(done) {
+        this.X.DestroyWindow(this.wid);
+        this.X.on('end', done);
+        this.X.terminate();
+    });
+});

test/configure-request.js

@@ -0,0 +1,53 @@
+var x11 = require('../lib');
+var should = require('should');
+
+describe('ConfigureRequest', function() {
+    before(function(done) {
+        var self = this;
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            self.root = dpy.screen[0].root;
+            self.wid = self.X.AllocID();
+            /* self.X acts like a WM */
+            self.X.ChangeWindowAttributes(self.root, { eventMask: x11.eventMask.SubstructureRedirect });
+            self.X.CreateWindow(self.wid, self.root, 0, 0, 1, 1); // 1x1 pixel window
+            self.X.QueryTree(self.root, function(err, list) {
+                should.not.exist(err);
+                list.children.indexOf(self.wid).should.not.equal(-1);
+                done();
+            });
+        });
+
+        client.on('error', function (err) {
+            console.error('Error : ', err);
+        });
+    });
+
+    it('should be emitted to the WM if this.wid is configured by a client', function(done) {
+        var self = this;
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X.once('event', function(ev) {
+                ev.name.should.equal('ConfigureRequest');
+                ev.x.should.equal(0);
+                ev.y.should.equal(20);
+                ev.width.should.equal(200);
+                ev.height.should.equal(300);
+                ev.wid.should.equal(self.wid);
+                done();
+            });
+
+            var X = dpy.client;
+            X.MoveResizeWindow(self.wid, 0, 20, 200, 300);
+        });
+
+        client.on('error', done);
+    });
+
+    after(function(done) {
+        this.X.DestroyWindow(this.wid);
+        this.X.on('end', done);
+        this.X.terminate();
+    });
+});

test/configure-window.js

@@ -22,34 +22,35 @@ describe('ConfigureWindow', function() {
             });
         });
 
-        client.on('error', done);
+        client.on('error', function (err) {
+            console.error('Error : ', err);
+        });
     });
 
     it('should ResizeWindow correctly to 200x300 pixels', function(done) {
         var self = this;
-        this.X.ResizeWindow(this.wid, 200, 300);
         this.X.once('event', function(ev) {
             ev.type.should.equal(22); /* ConfigureNotify */
             ev.height.should.equal(300);
             ev.width.should.equal(200);
             done();
         });
+        this.X.ResizeWindow(this.wid, 200, 300);
     });
 
     it('should MoveWindow correctly to x: 100, y: 150 pixels', function(done) {
         var self = this;
-        this.X.MoveWindow(this.wid, 100, 150);
         this.X.once('event', function(ev) {
             ev.type.should.equal(22); /* ConfigureNotify */
             ev.x.should.equal(100);
             ev.y.should.equal(150);
             done();
         });
+        this.X.MoveWindow(this.wid, 100, 150);
     });
 
     it('should MoveResizeWindow correctly to x: 200, y: 250 and 500x100 pixels', function(done) {
         var self = this;
-        this.X.MoveResizeWindow(this.wid, 200, 250, 500, 100);
         this.X.once('event', function(ev) {
             ev.type.should.equal(22); /* ConfigureNotify */
             ev.x.should.equal(200);
@@ -58,22 +59,45 @@ describe('ConfigureWindow', function() {
             ev.width.should.equal(500);
             done();
         });
+        this.X.MoveResizeWindow(this.wid, 200, 250, 500, 100);
     });
 
     it('should RaiseWindow correctly', function(done) {
         var self = this;
-        this.X.RaiseWindow(this.wid);
         this.X.once('event', function(ev) {
             ev.type.should.equal(22); /* ConfigureNotify */
             ev.aboveSibling.should.equal(self.wid_helper);
             done();
         });
+        this.X.RaiseWindow(this.wid);
+    });
+
+    it('should LowerWindow correctly', function(done) {
+        var self = this;
+        this.X.once('event', function(ev) {
+            ev.type.should.equal(22); /* ConfigureNotify */
+            ev.aboveSibling.should.equal(0); /* 0 -> no window below this */
+            done();
+        });
+        this.X.LowerWindow(this.wid);
+    });
+
+    it('should ignore invalid mask values', function(done) {
+        this.X.once('event', function(ev) {
+            ev.x.should.equal(0);
+            done();
+        });
+
+        this.X.ConfigureWindow(this.wid, { foo : 3, x : 0 }, function(err) {
+            console.log(err);
+        });
     });
 
     after(function(done) {
+        this.X.removeAllListeners('event');
         this.X.DestroyWindow(this.wid);
         this.X.DestroyWindow(this.wid_helper);
-        this.X.terminate();
         this.X.on('end', done);
+        this.X.terminate();
     });
 });

test/connect.js

@@ -52,9 +52,16 @@ describe('Client', function() {
   });
 
   it('returns error when connecting to non existent display', function(done) {
+    var errorCbCalled = false;
     var client = x11.createClient({ display : ':44' }, function(err, display) {
         assert(util.isError(err));
+	errorCbCalled = true;
         done();
     });
+    // TODO: stop writing to socket after first error
+    client.on('error', function() {
+      if (!errorCbCalled)
+        done('should not reach here before first done()');
+    });
   });
 });

test/core-CreateWindow.js

@@ -48,4 +48,56 @@ describe('CreateWindow request', function() {
       });
   });
 
+  it('should work with any kind of attributes too', function(done) {
+      var wid = X.AllocID();
+      X.CreateWindow(wid, display.screen[0].root, 0, 0, 1, 1, 0, 0, 0, 0, { overrideRedirect : true }); // 1x1 pixel window
+      X.QueryTree(display.screen[0].root, function(err, list) {
+          should.not.exist(err);
+          list.children.should.containEql(wid);
+          done();
+      });
+  });
+
+  it('should emit CreateNotify event when', function(done) {
+      var wid = X.AllocID();
+      var root = display.screen[0].root;
+      X.ChangeWindowAttributes(root, { eventMask: x11.eventMask.SubstructureNotify });
+      X.on('event', function(ev) {
+        switch (ev.name) {
+          case 'CreateNotify':
+            ev.parent.should.equal(root);
+            ev.wid.should.equal(wid);
+            ev.x.should.equal(0);
+            ev.y.should.equal(0);
+            ev.width.should.equal(1);
+            ev.height.should.equal(1);
+            ev.borderWidth.should.equal(0);
+            ev.overrideRedirect.should.equal(false);
+          break;
+
+          case 'MapNotify':
+            ev.event.should.equal(root);
+            ev.wid.should.equal(wid);
+            ev.overrideRedirect.should.equal(false);
+            X.UnmapWindow(wid);
+          break;
+
+          case 'UnmapNotify':
+            ev.event.should.equal(root);
+            ev.wid.should.equal(wid);
+            ev.fromConfigure.should.equal(false);
+            X.DestroyWindow(wid);
+          break;
+
+          case 'DestroyNotify':
+            ev.event.should.equal(root);
+            ev.wid.should.equal(wid);
+            done();
+          break;
+        }
+      });
+
+      X.CreateWindow(wid, root, 0, 0, 1, 1); // 1x1 pixel window
+      X.MapWindow(wid);
+  })
 });

test/core-KillKlient.js

@@ -8,43 +8,41 @@ describe('KillKlient request', function() {
   var X;
   beforeEach(function(done) {
       var client = x11.createClient(function(err, dpy) {
-          if (!err) {
+          should.not.exist(err);
-              display = dpy;
+          display = dpy;
-              X = display.client;
+          X = display.client;
-          }
+          var root = display.screen[0].root;
+          var eventMask = x11.eventMask.SubstructureNotify;
+          X.ChangeWindowAttributes(root, { eventMask: eventMask });
+          done();
+      });
 
-          done(err);
+      client.on('error', done);
-      });
-      client.on('error', function(err) {
-         done(err);
-      });
   });
 
   afterEach(function(done) {
-      X.terminate();
       X.on('end', done);
-      X = null;
+      X.terminate();
-      display = null;
   });
 
-  it('should exist as client member', function(done) {
+  it('should exist as client member', function() {
       should.exist(X.KillKlient);
       assert.equal(typeof X.KillKlient, 'function');
-      done();
   });
 
   it('should terminate other client connection', function(done) {
       x11.createClient(function(err, dpy) {
-          if (!err) {
+          should.not.exist(err);
-            var otherclient = dpy.client;
+          var otherclient = dpy.client;
-            var wnd = otherclient.AllocID();
+          var wnd = otherclient.AllocID();
-            otherclient.CreateWindow(wnd, dpy.screen[0].root, 0, 0, 1, 1);
+          X.once('event', function(ev) {
-            otherclient.on('end', done);
+              ev.name.should.equal('CreateNotify');
-            X.KillKlient(wnd);
+              ev.wid.should.equal(wnd);
-          } else {
+              X.KillKlient(wnd);
-            done(err);
+          });
-          }
+
+          otherclient.CreateWindow(wnd, dpy.screen[0].root, 0, 0, 1, 1);
+          otherclient.on('end', done);
       });
   });
-
 });

test/core-properties.js

@@ -57,7 +57,7 @@ describe('Window property', function() {
               assert.equal(ev.atom, X.atoms.WM_NAME, 'atom in notification should be same as in ChangeProperty');
               // TODO: replace 0 with X.PropertyNewValue
               assert.equal(ev.state, 0, 'atom in notification should be same as in ChangeProperty');
-              assert.equal(ev.window, wid, 'window in notification should be same as in ChangeProperty');
+              assert.equal(ev.wid, wid, 'window in notification should be same as in ChangeProperty');
               done();
               return;
           }
@@ -82,8 +82,8 @@ describe('Window property', function() {
       });
   });
 
-  it('should exist in the ListProperties result after inserted');
+  // it('should exist in the ListProperties result after inserted');
-  it('should not exist after GetProperty with delete flag called');
+  // it('should not exist after GetProperty with delete flag called');
   //it('should not exist after GetProperty with delete flag called', function(done) {
   //    done();
   //});

test/createGC.js

@@ -0,0 +1,46 @@
+var x11 = require('../lib');
+var should = require('should');
+
+describe('CreateGC', function() {
+    before(function(done) {
+        var self = this;
+        this.client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            self.root = dpy.screen[0].root;
+            self.white = dpy.screen[0].white_pixel;
+            self.black = dpy.screen[0].black_pixel;
+            self.wid = self.X.AllocID();
+            self.X.CreateWindow(self.wid, self.root, 0, 0, 1, 1); // 1x1 pixel window
+            self.X.MapWindow(self.wid);
+            self.X.QueryTree(self.root, function(err, list) {
+                should.not.exist(err);
+                list.children.indexOf(self.wid).should.not.equal(-1);
+                done();
+            });
+        });
+    });
+
+    it('should create a Graphic Context correctly', function() {
+        var self = this;
+        this.client.on('error', function(err) {
+            should.not.exist(err);
+        });
+
+        this.gc = this.X.AllocID();
+        this.X.CreateGC(this.gc,
+                        this.wid,
+                        {
+                            foreground: this.black,
+                            background: this.white,
+                            lineStyle : 0
+                        }
+        );
+    });
+
+    after(function(done) {
+        this.X.DestroyWindow(this.wid);
+        this.X.on('end', done);
+        this.X.terminate();
+    });
+});

test/dpms.js

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

test/errors.js

@@ -5,27 +5,31 @@ var assert = require('assert');
 describe('Client', function() {
 
   var display;
-  beforeEach(function(done) {
+  before(function(done) {
-      var client = x11.createClient(function(err, dpy) {
+      var client = x11.createClient({ debug: false }, function(err, dpy) {
-        console.log(err)
+          should.not.exist(err);
           display = dpy;
-          done(err);
+          done();
       });
   });
 
   it('should emit error which is instance of Error with sequence number corresponding to source request', function(done) {
-    display.client.options.debug = true;
+    var times = 0;
-    display.client.CreateWindow(); // should emit error
+    //id, parentId, x, y, width, height, borderWidth, depth, _class, visual, values
+    display.client.CreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {});
     var seq = display.client.seq_num;
-    display.client.once('error', function(err) {
+    display.client.on('error', function(err) {
-        assert.equal(err.constructor, Error);
+      switch (++ times) {
-        assert.equal(seq, err.seq);
+        case 11:
-        display.client.CreateWindow(); // should emit error
+          display.client.removeAllListeners('error');
-        seq = display.client.seq_num;
+          done();
-        display.client.once('error', function(err) {
+        break;
-            assert.equal(seq, err.seq);
+        default:
-            done();
+          assert.equal(err.constructor, Error);
-        });
+          assert.equal(seq, err.seq);
-     });
+          display.client.CreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}); // should emit error
+          seq = display.client.seq_num;
+       }
+    });
   });
 });

test/randr.js

@@ -0,0 +1,63 @@
+var x11 = require('../lib');
+var async = require('async');
+var should = require('should');
+var assert = require('assert');
+var util = require('util');
+
+describe('RANDR extension', function() {
+    before(function(done) {
+        var self = this;
+        var client = x11.createClient(function(err, dpy) {
+            should.not.exist(err);
+            self.X = dpy.client;
+            self.screen = dpy.screen[0];
+            self.root = self.screen.root;
+            self.X.require('randr', function(err, ext) {
+                should.not.exist(err);
+                self.randr = ext;
+                /* We HAVE to QueryVersion before using it. Otherwise it does not work as expected */
+                self.randr.QueryVersion(1, 2, done);
+            });
+        });
+
+        client.on('error', done);
+    });
+
+    it('GetScreenInfo should get same px and mm width and height as in display.screen[0]', function(done) {
+        var self = this;
+        this.randr.GetScreenInfo(this.root, function(err, info) {
+            should.not.exist(err);
+            var active_screen = info.screens[info.sizeID];
+            active_screen.px_width.should.equal(self.screen.pixel_width);
+            active_screen.px_height.should.equal(self.screen.pixel_height);
+            active_screen.mm_width.should.equal(self.screen.mm_width);
+            active_screen.mm_height.should.equal(self.screen.mm_height);
+            done();
+        });
+    });
+
+    it('GetScreenResources && GetOutputInfo', function(done) {
+        var self = this;
+        this.randr.GetScreenResources(this.root, function(err, resources) {
+            should.not.exist(err);
+            should.exist(resources);
+            async.each(
+                resources.outputs,
+                function(output, cb) {
+                    self.randr.GetOutputInfo(output, 0, function(err, info) {
+                        should.not.exist(err);
+                        should.exist(info);
+                        cb();
+                    });
+                },
+                done
+            );
+
+        });
+    });
+
+    after(function(done) {
+        this.X.terminate();
+        this.X.on('end', done);
+    });
+});

test/smoke-require-ext.js

@@ -0,0 +1,16 @@
+var fs = require('fs');
+var assert = require('assert');
+
+describe('all extension modules', function() {
+  it('should not throw when require\'d', function(done) {
+    var extFolder = __dirname + '/../lib/ext';
+    fs.readdir(extFolder, function(err, list) {
+      assert.ifError(err);
+      list.forEach(function(name) {
+        var m = require(extFolder + '/' + name);
+      });
+      done();
+    });
+  });
+})
+

test/xtest.js

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