.gitignore

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

.travis.yml

@@ -7,10 +7,14 @@ before_script:
 
 env:
   - NOLISTEN=tcp DISPLAY=:99.0
-#  - NOLISTEN=unix DISPLAY=:99.0
-#  - NOLISTEN=unix DISPLAY=127.0.0.2:99.0
+  - NOLISTEN=unix DISPLAY=:99.0
+  - NOLISTEN=unix DISPLAY=127.0.0.2:99.0
 
 language: node_js
 node_js:
-   - '12'
-   - '14'
+   - '0.10'
+   - '0.12'
+   - '4.2'
+   - '5'
+   - '6'
+   - '7'

README.md

@@ -1,119 +1,105 @@
-# node-x11
+# About
+[![Gitter](https://badges.gitter.im/Join\ Chat.svg)](https://gitter.im/sidorares/node-x11?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+ X11 protocol client for node.js
 
-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.
+ Implements core X11 protocol, as well as Xrender, Damage, Composite, Big-Requests, Dpms, Screensaver, XFixes, Shape, XTest, XC-Misc, GLX and Apple-WM extensions.
+# install
 
-[![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)
-
-## Install
-
-    npm install x11
+`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 ))
 
-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:
 
-## Example
+[![Build Status](https://secure.travis-ci.org/sidorares/node-x11.png)](http://travis-ci.org/sidorares/node-x11)
+
+# example
 
 Core requests usage:
 
 ```js
-var x11 = require('x11');
+    var x11 = require('x11');
 
-var Exposure = x11.eventMask.Exposure;
-var PointerMotion = x11.eventMask.PointerMotion;
+    var Exposure = x11.eventMask.Exposure;
+    var PointerMotion = x11.eventMask.PointerMotion;
 
-x11.createClient(function(err, display) {
-  if (!err) {
-    var X = display.client;
-    var root = display.screen[0].root;
-    var wid = X.AllocID();
-    X.CreateWindow(
-      wid,
-      root, // new window id, parent
-      0,
-      0,
-      500,
-      500, // x, y, w, h
-      0,
-      0,
-      0,
-      0, // border, depth, class, visual
-      { eventMask: Exposure | PointerMotion } // other parameters
-    );
-    X.MapWindow(wid);
-    var gc = X.AllocID();
-    X.CreateGC(gc, wid);
-    var white = display.screen[0].white_pixel;
-    var black = display.screen[0].black_pixel;
-    cidBlack = X.AllocID();
-    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!']);
-      }
+    x11.createClient(function(err, display) {
+        if (!err) {
+            var X = display.client;
+            var root = display.screen[0].root;
+            var wid = X.AllocID();
+            X.CreateWindow(
+                wid, root,        // new window id, parent
+                0, 0, 100, 100,   // x, y, w, h
+                0, 0, 0, 0,       // border, depth, class, visual
+                { eventMask: Exposure|PointerMotion } // other parameters
+            );
+            X.MapWindow(wid);
+            var gc = X.AllocID();
+            X.CreateGC(gc, wid);
+            X.on('event', function(ev) {
+                if (ev.type == 12)
+                {
+                    X.PolyText8(wid, gc, 50, 50, ['Hello, Node.JS!']);
+                }
+            });
+            X.on('error', function(e) {
+                console.log(e);
+            });
+	    } else {
+		    console.log(err);
+        }
     });
-    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)
-![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 teapot](http://img-fotki.yandex.ru/get/4132/37511094.30/0_81713_82a5ac48_L)
+  ![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)
+  ![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)
 
-## In use
+# In use
+  - [ntk](https://github.com/sidorares/ntk) - higher level toolkit on top of X11
+  - [node-remote](https://github.com/AndrewSwerlick/node-remote) - media center controller
+  - [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
 
-- [ntk](https://github.com/sidorares/ntk) - higher level toolkit on top of X11
-- [node-remote](https://github.com/AndrewSwerlick/node-remote) - media center controller
-- [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
+# X11 resources/documentation:
 
-## X11 resources/documentation:
+  - [Xplain](https://github.com/magcius/xplain) - A series of articles to help explain the X Window System http://magcius.github.io/xplain/article/
+  - [Official X11 docs](http://www.x.org/releases/X11R7.6/doc/) 
+  - [protocol specification](http://www.x.org/releases/X11R7.6/doc/xproto/x11protocol.pdf)
+  - C Xlib to X11 request mapping table http://tronche.com/gui/x/xlib/appendix/a.html
+  - [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)
 
-- [Xplain](https://github.com/magcius/xplain) - A series of articles to help explain the X Window System http://magcius.github.io/xplain/article/
-- [Official X11 docs](http://www.x.org/releases/X11R7.6/doc/)
-- [protocol specification](http://www.x.org/releases/X11R7.6/doc/xproto/x11protocol.pdf)
-- C Xlib to X11 request mapping table http://tronche.com/gui/x/xlib/appendix/a.html
-- [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
 
-## 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
 
-- 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
 
-## 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 
 
-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
+  - 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 Buffer.from([' + req.opcode + ', 0, 1, 0]);');
+       result.push('     return new Buffer([' + 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 = Buffer.alloc(' + reqLen + ' + extraLength);');
+     result.push('    var data = new Buffer(' + reqLen + ' + extraLength);');
    else {
      result.pop(); 
-     result.push('    var data = Buffer.alloc(' + reqLen + ');');
+     result.push('    var data = new Buffer(' + reqLen + ');');
    } 
    result.push('    data[0] = ' + req.opcode + ';');
    if (req.body.length != 0) {

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 = Buffer.from(j.width*j.height*4);
+    imageData.data = new Buffer(j.width*j.height*4);
     j.copyToImageData(imageData);
     return imageData;
 }

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 = Buffer.alloc(j.width*j.height*4);
+    imageData.data = new Buffer(j.width*j.height*4);
     j.render(imageData);
     return imageData;
 }

examples/simple/render.js

@@ -7,7 +7,7 @@ var xclient = x11.createClient(function(err, display) {
     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;
+        varblack = 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/render-glyph.js

@@ -26,7 +26,7 @@ function padWidth(buf, width) {
     return buf;
   else {
     var stride = (width+3)&~3;
-    var res = Buffer.alloc(height*stride);
+    var res = new Buffer(height*stride);
     res.fill(0);
     for (var y=0; y < height; ++y) {
       // memcpy(tmpbitmap+y*stride, bitmap->buffer+y*ginfo.width, ginfo.width);
@@ -88,7 +88,7 @@ var xclient = x11.createClient({ debug: true }, function(err, display) {
         var glyphFromCode = [];
         glyphs.forEach(function(g) {
           if (!g.image || (g.image.length == 0)) {
-            g.image = Buffer.alloc(64);
+            g.image = new Buffer(64);
             g.image.fill(0);
             g.width = 8;
             g.height = 8;

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 = Buffer.alloc(256);
+var reversed = new Buffer(256);
 for (var i=0; i < 256; ++i)
 {
     var res = 0;
@@ -42,4 +42,4 @@ module.exports.decodeBuffer = function(buffer)
         data[i] = 255 - reversed[data[i]];
 
     return new Pixmap(header.bpp, header.width, header.height, data);
-}
+}

examples/smoketest/putimage.js

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

examples/smoketest/putimage1.js

@@ -4,7 +4,7 @@ var x11 = require('../../lib');
 var Exposure = x11.eventMask.Exposure;
 var PointerMotion = x11.eventMask.PointerMotion;
 
-var bitmap = Buffer.alloc(128*128*4); // 16384 bits, 2048 bytes bitmap
+var bitmap = new Buffer(128*128*4); // 16384 bits, 2048 bytes bitmap
 for (var i=0; i < bitmap.length; ++i)
 {
     var byteNum = i%4;

examples/tetris.js

@@ -25,7 +25,7 @@ var Buffer = require('buffer').Buffer;
 
 var startpos = [4, 15];
 var cupsize = [10, 20];
-var cup = Buffer.alloc(cupsize[0]*cupsize[1]);
+var cup = new Buffer(cupsize[0]*cupsize[1]);
 var moveInterval;
 
 function clearCup()

examples/vncviewer/d3des.js

@@ -56,8 +56,8 @@ var pc2 = [
 function deskey(key, edf)
 {
 	var i, j, l, m, n;
-        var pc1m = Buffer.alloc(56);
-        var pcr = Buffer.alloc(56);
+        var pc1m = new Buffer(56);
+        var pcr = new Buffer(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 = Buffer.alloc(8);
+    var key = new Buffer(8);
     key.fill(0);
     key.write(password.substring(0,8));
     var in1 = challenge.slice(0,8);
     var in2 = challenge.slice(8,16);
-    var res1 = Buffer.alloc(8);
-    var res2 = Buffer.alloc(8);
+    var res1 = new Buffer(8);
+    var res2 = new Buffer(8);
     deskey(key, EN0);
     des(in1, res1);
     des(in2, res2);
-    var resp = Buffer.alloc(16);
+    var resp = new Buffer(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 = Buffer.from("\000\001\003\005\037\012\011bcdefghijklmnopqrstuvwxyz0123456789")
+//           b = new Buffer("\000\001\003\005\037\012\011bcdefghijklmnopqrstuvwxyz0123456789")
 //    
 //    console.log(hexy.hexy(b))
 //
@@ -258,4 +258,4 @@ console.log(hexy(data, format))
 console.log("doen")
 */
 
-exports.hexy = hexy
+exports.hexy = hexy

examples/vncviewer/rfbclient.js

@@ -400,7 +400,7 @@ RfbClient.prototype.readHextileTile = function(rect, cb)
             });
             return;
         }
-        tile.buffer = Buffer.alloc(tilebuflen);
+        tile.buffer = new Buffer(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 = Buffer.alloc(4);
-            var timeBuf = Buffer.alloc(4);
+            var sizeBuf = new Buffer(4);
+            var timeBuf = new Buffer(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 = Buffer.alloc(padding);
+            var pbuf = new Buffer(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 = Buffer.alloc(16);
+        serv.challenge = new Buffer(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 = Buffer.alloc(length);
+    this.data = new Buffer(length);
     this.received_bytes = 0;
 }
 
@@ -328,7 +328,7 @@ UnpackStream.prototype.pack = function(format, args)
         }
     }
 
-    var buf = Buffer.alloc(packetlength);
+    var buf = new Buffer(packetlength);
     var offset = 0;
     var arg = 0;
     for (var i = 0; i < format.length; ++i)

examples/xpm/node-xpm.js

@@ -95,7 +95,7 @@ PixmapFromFile.prototype.mapColors = function(content,size){
 }
 
 PixmapFromFile.prototype.toBuffer = function (colors,content,size) {
-  var buf = Buffer.alloc(size.width*size.height*4);
+  var buf = new Buffer(size.width*size.height*4);
   var offset = 0, byte,color;
   var copy;
   if( !this.options.format || this.options.format.toUpperCase() === "BGRA"){

lib/auth.js

@@ -50,7 +50,7 @@ function parseXauth( buf )
     return auth;
 }
 
-var homedir = require('os').homedir;
+var homedir = require('os-homedir');
 var path = require('path');
 
 function readXauthority(cb) {

lib/corereqs.js

@@ -217,26 +217,25 @@ function packValueMask(reqname, values)
     {
         var v = reqValueMask[value];
         if (v) {
-            var valueBit = v.mask;
-            if (!valueBit)
-                throw new Error(reqname + ': incorrect value param ' + value);
-            masksList.push(valueBit);
-            bitmask |= valueBit;
+          var valueBit = v.mask;
+          if (!valueBit)
+              throw new Error(reqname + ': incorrect value param ' + value);
+          masksList.push(valueBit);
+          bitmask |= valueBit;
         }
     }
 
     /* numeric sort */
     masksList.sort(function(a, b) {
-        return a - b;
+      return a - b;
     });
 
     var args = [];
-    for (var i=0,length=masksList.length;i<length;i++)
+    for (m in masksList)
     {
-        var value = masksList[i];
-        var valueName = reqValueMaskName[value];
-        format += reqValueMask[valueName].format
-        args.push( values[valueName] );
+       var valueName = reqValueMaskName[masksList[m]];
+       format += reqValueMask[valueName].format
+       args.push( values[valueName] );
     }
     return [format, bitmask, args]
 }
@@ -465,7 +464,7 @@ var templates = {
        function(mode, wid, name, type, units, data)
        {
           var padded4 = (data.length + 3) >> 2;
-          var pad = Buffer.alloc( (padded4<<2) - data.length);
+          var pad = new Buffer( (padded4<<2) - data.length);
           var format = 'CCSLLLCxxxLaa';
           var requestLength = 6 + padded4;
           var dataLenInFormatUnits = data.length / (units >> 3);
@@ -766,9 +765,13 @@ var templates = {
            var vals = packValueMask('CreateGC', values);
            var packetLength = 3 + (values ? vals[2].length : 0);
            var args = [56, packetLength, cid];
-           format += vals[0]
-           args.push(vals[1]);     // values bitmask
-           args = args.concat(vals[2])
+           args.push(vals[0]);     // values bitmask
+           var valArr = vals[1];
+           for (var v in valArr)
+           {
+               format += 'L'; // TODO: we know format string length in advance and += inefficient for string
+               args.push(valArr[v]);
+           }
            return [format, args];
         }
    ],
@@ -851,7 +854,7 @@ var templates = {
           var padded = xutil.padded_length(data.length);
           var reqLen = 6 + padded/4; // (length + 3) >> 2 ???
           var padLength = padded - data.length;
-          var pad = Buffer.alloc(padLength); // TODO: new pack format 'X' - skip amount of bytes supplied in numerical argument
+          var pad = new Buffer(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
@@ -1020,12 +1023,6 @@ var templates = {
            return [ 'CxSssCCxx', [107, 3, timeout, interval, preferBlanking, allowExposures]];
        }
    ],
-   
-   Bell: [
-       function(percent) {
-           return ["CxCs",[108,1]];
-       }
-   ],
 
    ForceScreenSaver: [
        function(activate) {

lib/ext/glx.js

@@ -258,7 +258,7 @@ exports.requireExt = function(display, callback)
         ext.BindTexImage = function(ctx, drawable, buffer, attribs) {
            if (!attribs)
              attribs = [];
-           var data = Buffer.alloc(12 + attribs.length*4);
+           var data = new Buffer(12 + attribs.length*4);
            data.writeUInt32LE(drawable, 0);
            data.writeUInt32LE(buffer, 4);
            data.writeUInt32LE(attribs.length, 8);
@@ -268,7 +268,7 @@ exports.requireExt = function(display, callback)
         }
 
         ext.ReleaseTexImage = function(ctx, drawable, buffer) {
-           var data = Buffer.alloc(8);
+           var data = new Buffer(8);
            data.writeUint32LE(drawable, 0);
            data.writeUint32LE(buffer, 4);
            ext.VendorPrivate(ctx, 1331, data);
@@ -287,7 +287,7 @@ exports.requireExt = function(display, callback)
           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);
+          var pad = new Buffer(padLength);
           pad.fill(0);
           X.pack_stream.write_queue.push(pad);
           X.pack_stream.flush();

lib/ext/glxrender.js

@@ -16,7 +16,7 @@ module.exports = function(GLX, ctx) {
             throw Error('Buffer too big. Make sure you are using RenderLarge for large commands');
 
         currentLength += len;
-        var res = Buffer.alloc(len);
+        var res = Buffer(len);
         res.writeUInt16LE(len, 0);
         res.writeUInt16LE(opcode, 2);
         return res;
@@ -266,7 +266,7 @@ module.exports = function(GLX, ctx) {
           typeSize[constants.BYTE] = 1;
           typeSize[constants.UNSIGNED_BYTE] = 1;
 
-          var res = Buffer.alloc(60 + data.length*typeSize[type]);
+          var res = new Buffer(60 + data.length*typeSize[type]);
           res.writeUInt32LE(res.length, 0);
           res.writeUInt32LE(110, 4);
 

lib/ext/shape.js

@@ -112,31 +112,5 @@ exports.requireExt = function(display, callback)
             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/hexy.js

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

lib/unpackstream.js

@@ -23,7 +23,7 @@ function ReadFixedRequest(length, callback)
 {
     this.length = length;
     this.callback = callback;
-    this.data = Buffer.alloc(length);
+    this.data = new Buffer(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 = Buffer.alloc(len);
+    var buf = new Buffer(len);
     buf.write(str, 'binary');
     this.write_queue.push(buf);
 }
@@ -231,7 +231,7 @@ UnpackStream.prototype.pack = function(format, args)
         }
     }
 
-    var buf = Buffer.alloc(packetlength);
+    var buf = new Buffer(packetlength);
     var offset = 0;
     var arg = 0;
     for (var i = 0; i < format.length; ++i)
@@ -269,14 +269,12 @@ UnpackStream.prototype.pack = function(format, args)
                 buf[offset++] = (n >> 16) & 0xff;
                 buf[offset++] = (n >> 24) & 0xff;
                 break;
-            case 'a':  // string, buffer, or array
+            case 'a':  // string or buffer
                 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

@@ -322,14 +322,7 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw, headerBuf)
         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'
@@ -515,7 +508,7 @@ XClient.prototype.expectReplyHeader = function()
 
                     // raw event 32-bytes packet (primarily for use in SendEvent);
                     // TODO: Event::pack based on event parameters, inverse to unpackEvent
-                    ev.rawData = Buffer.alloc(32);
+                    ev.rawData = new Buffer(32);
                     headerBuf.copy(ev.rawData);
                     buf.copy(ev.rawData, 8);
 

package.json

@@ -12,7 +12,7 @@
     "X"
   ],
   "homepage": "https://github.com/sidorares/node-x11",
-  "version": "2.3.0",
+  "version": "2.2.1",
   "maintainers": [
     {
       "name": "Andrey Sidorov",
@@ -40,15 +40,17 @@
     "node": "*"
   },
   "devDependencies": {
-    "async": "^3.0.1",
-    "mocha": "^7.1.2",
-    "sax": "^1.2.4",
-    "should": "^13.2.1",
-    "sinon": "^7.2.5"
+    "mocha": "*",
+    "should": "*",
+    "sax": "*",
+    "async": "*",
+    "sinon": "*"
   },
   "scripts": {
     "test": "node test-runner.js",
     "prepublish": "npm prune"
   },
-  "dependencies": {}
+  "dependencies": {
+    "os-homedir": "^1.0.1"
+  }
 }

test/atoms-cache.js

@@ -63,7 +63,7 @@ describe('Atoms and atom names cache', function() {
         });
     });
 
-    xit('should be used after the first request for non-std atom_names', function(done) {
+    it('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.resetHistory();
+                self.spy.reset();
                 self.X.InternAtom(true, my_name, function(err, atom) {
                     should.not.exist(err);
                     my_atom.should.equal(atom);

test/change-property.js

@@ -27,7 +27,7 @@ describe('ChangeProperty', function() {
         var self = this;
         this.X.InternAtom(false, TEST_PROPERTY, function(err, atom) {
             should.not.exist(err);
-            var raw = Buffer.alloc(4);
+            var raw = new Buffer(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) {
@@ -47,7 +47,7 @@ describe('ChangeProperty', function() {
         var self = this;
         this.X.InternAtom(false, TEST_PROPERTY, function(err, atom) {
             should.not.exist(err);
-            var raw = Buffer.from(new Array(8));
+            var raw = new Buffer(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);
@@ -69,7 +69,7 @@ describe('ChangeProperty', function() {
         var self = this;
         this.X.InternAtom(false, TEST_PROPERTY, function(err, atom) {
             should.not.exist(err);
-            var raw = Buffer.alloc(0);
+            var raw = new Buffer(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);

test/changeGC.js

@@ -1,54 +0,0 @@
-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

@@ -40,7 +40,7 @@ describe('ClientMessage', function() {
             });
 
             var X = dpy.client;
-            var eventData = Buffer.alloc(32);
+            var eventData = new Buffer(32);
             eventData.writeInt8(33, 0);                          //Event Type 33 = ClientMessage
             eventData.writeInt8(8,  1);                          //Format
             eventData.writeInt32LE(self.wid, 4);                 //Window ID
@@ -67,7 +67,7 @@ describe('ClientMessage', function() {
             });
 
             var X = dpy.client;
-            var eventData = Buffer.alloc(32);
+            var eventData = new Buffer(32);
             eventData.writeInt8(33, 0);                          //Event Type 33 = ClientMessage
             eventData.writeInt8(16,  1);                          //Format
             eventData.writeInt32LE(self.wid, 4);                 //Window ID
@@ -94,7 +94,7 @@ describe('ClientMessage', function() {
             });
 
             var X = dpy.client;
-            var eventData = Buffer.alloc(32);
+            var eventData = new Buffer(32);
             eventData.writeInt8(33, 0);                          //Event Type 33 = ClientMessage
             eventData.writeInt8(32,  1);                         //Format
             eventData.writeInt32LE(self.wid, 4);                 //Window ID

test/core-KillKlient.js

@@ -11,7 +11,7 @@ describe('KillKlient request', function() {
           should.not.exist(err);
           display = dpy;
           X = display.client;
-          var root = display.screen[0].root;
+          root = display.screen[0].root;
           var eventMask = x11.eventMask.SubstructureNotify;
           X.ChangeWindowAttributes(root, { eventMask: eventMask });
           done();