WIP: Introduce eslint, and conform to its recommended rule set

.eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+    "env": {
+        "node": true,
+        "commonjs": true,
+        "es2021": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 12
+    },
+    "rules": {
+        // Allow unused function arguments with names beginning in an
+        // underscore, to document that is _could_ be used.
+        "no-unused-vars": ['error', { argsIgnorePattern: '^_' } ],
+    },
+};

lib/auth.js

@@ -63,7 +63,7 @@ function readXauthority(cb) {
       filename = process.env.XAUTHORITY || path.join(homedir(), 'Xauthority');
       fs.readFile(filename, function (err, data) {
         if (err.code == 'ENOENT') {
-          cb(null, null);
+          cb(null, data);
         } else {
           cb(err);
         }

lib/corereqs.js

@@ -2,7 +2,7 @@
 // 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 hexy = require('./hexy').hexy;
 
 var valueMask = {
     CreateWindow: {
@@ -166,27 +166,27 @@ var valueMask = {
         mask: 0x000001,
         format: 'sxx'
       },
-    	y                       : {
+      y                       : {
         mask: 0x000002,
         format: 'sxx'
       },
-    	width                   : {
+      width                   : {
         mask: 0x000004,
         format: 'Sxx'
       },
-    	height                  : {
+      height                  : {
         mask: 0x000008,
         format: 'Sxx'
       },
-    	borderWidth             : {
+      borderWidth             : {
         mask: 0x000010,
         format: 'Sxx'
       },
-    	sibling                 : {
+      sibling                 : {
         mask: 0x000020,
         format: 'L'
       },
-    	stackMode               : {
+      stackMode               : {
         mask: 0x000040,
         format: 'Cxxx'
       }
@@ -233,7 +233,7 @@ function packValueMask(reqname, values)
     var args = [];
     for (var i=0,length=masksList.length;i<length;i++)
     {
-        var value = masksList[i];
+        let value = masksList[i];
         var valueName = reqValueMaskName[value];
         format += reqValueMask[valueName].format
         args.push( values[valueName] );
@@ -735,13 +735,13 @@ var templates = {
 
    CreateCursor: [
        function(cid, source, mask, foreRGB, backRGB, x, y) {
-          foreR = foreRGB.R
-          foreG = foreRGB.G
-          foreB = foreRGB.B
+          const foreR = foreRGB.R
+          const foreG = foreRGB.G
+          const foreB = foreRGB.B
 
-          backR = backRGB.R
-          backG = backRGB.G
-          backB = backRGB.B
+          const backR = backRGB.R
+          const backG = backRGB.G
+          const backB = backRGB.B
           return [ 'CxSLLLSSSSSSSS', [93, 8, cid, source, mask, foreR, foreG, foreB, backR, backG, backB, x, y] ];
        }
    ],
@@ -881,7 +881,7 @@ var templates = {
           var numItems = items.length;
           var reqLen = 16;
           var args = [74, 0, drawable, gc, x, y];
-          for (var i=0; i < numItems; ++i)
+          for (let i=0; i < numItems; ++i)
           {
               var it = items[i];
               if (typeof it == 'string')
@@ -901,7 +901,7 @@ var templates = {
           var padLen = len4*4 - reqLen;
           args[1] = len4; // set request length to calculated value
           var pad = '';
-          for (var i=0; i < padLen; ++i)
+          for (let i=0; i < padLen; ++i)
              pad += String.fromCharCode(0);
           format += 'a';
           args.push(pad);
@@ -921,7 +921,7 @@ var templates = {
        [ 'CxSLSSSxx', [84, 4] ], // params: colormap, red, green, blue
 
        function(buf) {
-	   var res = buf.unpack('SSSxL');
+       var res = buf.unpack('SSSxL');
            var color = {};
            color.red   = res[0];
            color.blue  = res[1];
@@ -938,7 +938,7 @@ var templates = {
        },
 
        function(buf) {
-	   var res = buf.unpack('CCCC');
+       var res = buf.unpack('CCCC');
            var ext = {};
            ext.present = res[0];
            ext.majorOpcode = res[1];
@@ -990,23 +990,23 @@ var templates = {
    ],
 
         // todo: move up to keep reque
-	GetGeometry: [
-		function(drawable){
-			return ['CxSL', [14, 2, drawable]]
-		},
-		function(buff, depth)
-		{
-			var res = buff.unpack('LssSSSx');
-			var ext = {};
-			ext.windowid = res[0]
-			ext.xPos = res[1];
-			ext.yPos = res[2];
-			ext.width = res[3];
-			ext.height = res[4];
-			ext.borderWidth = res[5];
-			ext.depth = depth;
-			return ext;
-		}
+    GetGeometry: [
+        function(drawable){
+            return ['CxSL', [14, 2, drawable]]
+        },
+        function(buff, depth)
+        {
+            var res = buff.unpack('LssSSSx');
+            var ext = {};
+            ext.windowid = res[0]
+            ext.xPos = res[1];
+            ext.yPos = res[2];
+            ext.width = res[3];
+            ext.height = res[4];
+            ext.borderWidth = res[5];
+            ext.depth = depth;
+            return ext;
+        }
    ],
 
    KillClient: [
@@ -1023,7 +1023,7 @@ var templates = {
 
    Bell: [
        function(percent) {
-           return ["CxCs",[108,1]];
+           return ["CCS",[104, percent, 1]];
        }
    ],
 

lib/ext/apple-wm.js

@@ -2,7 +2,6 @@
 // http://opensource.apple.com/source/X11server/X11server-106.3/Xquartz/xorg-server-1.10.2/hw/xquartz/applewm.c
 // /usr/X11/include/X11/extensions/applewm.h
 
-var x11 = require('..');
 var xutil = require('../xutil');
 // TODO: move to templates
 
@@ -31,7 +30,7 @@ exports.requireExt = function(display, callback)
             X.seq_num++;
             X.pack_stream.pack('CCS', [ext.majorOpcode, 0, 1]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
+                function(buf, _opt) {
                     var res = buf.unpack('SSL');
                     return res;
                 },
@@ -51,7 +50,7 @@ exports.requireExt = function(display, callback)
             X.seq_num++;
             X.pack_stream.pack('CCSSSSSSSSSSS', [ext.majorOpcode, 1, 6, frame_class, frame_rect, ix, iy, iw, ih, ox, oy, ow, oh, cb]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
+                function(buf, _opt) {
                     var res = buf.unpack('SSSS');
                     return {
                         x: res[0],
@@ -70,7 +69,7 @@ exports.requireExt = function(display, callback)
             X.seq_num++;
             X.pack_stream.pack('CCSSxxSSSSSSSSSS', [ext.majorOpcode, 2, 7, frame_class, px, py, ix, iy, iw, ih, ox, oy, ow, oh]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
+                function(buf, _opt) {
                     var res = buf.unpack('L');
                     return res[0];
                 },
@@ -184,13 +183,14 @@ exports.requireExt = function(display, callback)
 
         // shortcut is single-byte ASCII (optional, 0=no shortcut)
         // items example: [ 'item1', 'some item', ['C', 'item with C shortcut'] ]
-        ext.SetWindowMenu = function(items)
+        ext.SetWindowMenu = function(_items)
         {
-           var reqlen = 8;
-           var extlength = 0;
-           items.forEach(function(i) {
+           // TODO
+           //var reqlen = 8;
+           //var extlength = 0;
+           //items.forEach(function(i) {
 
-           });
+           //});
         }
 
         // https://developer.apple.com

lib/ext/composite.js

@@ -24,7 +24,7 @@ exports.requireExt = function(display, callback)
 
         ext.Redirect = {
             Automatic: 0,
-	    Manual: 1
+        Manual: 1
         };
 
         ext.QueryVersion = function(clientMaj, clientMin, callback)

lib/ext/damage.js

@@ -1,6 +1,5 @@
 // http://www.x.org/releases/X11R7.6/doc/damageproto/damageproto.txt
 
-var x11 = require('..');
 // TODO: move to templates
 
 exports.requireExt = function(display, callback)
@@ -11,9 +10,9 @@ exports.requireExt = function(display, callback)
         if (!ext.present)
             return callback(new Error('extension not available'));
 
-        ext.ReportLevel	= {
+        ext.ReportLevel = {
             RawRectangles: 0,
-	    DeltaRectangles: 1,
+        DeltaRectangles: 1,
             BoundingBox: 2,
             NonEmpty: 3
         };
@@ -23,7 +22,7 @@ exports.requireExt = function(display, callback)
             X.seq_num++;
             X.pack_stream.pack('CCSLL', [ext.majorOpcode, 0, 3, clientMaj, clientMin]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
+                function(buf, _opt) {
                     var res = buf.unpack('LL');
                     return res;
                 },

lib/ext/glx.js

@@ -297,27 +297,27 @@ exports.requireExt = function(display, callback)
             return require('./glxrender')(this, ctx);
         }
 
-	var errors = [
-	  "context",
-	  "contect state",
-	  "drawable",
-	  "pixmap",
-	  "context tag",
-	  "current window",
-	  "Render request",
-	  "RenderLarge request",
-	  "(unsupported) VendorPrivate request",
-	  "FB config",
-	  "pbuffer",
-	  "current drawable",
-	  "window"
+        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;
-	  };
-	});
+        errors.forEach(function(message, code) {
+            X.errorParsers[ext.firstError + code] = function(err) {
+                err.message = "GLX: Bad " + message;
+            };
+        });
 
         callback(null, ext);
     });

lib/ext/randr.js

@@ -1,6 +1,5 @@
 // http://www.x.org/releases/X11R7.6/doc/randrproto/randrproto.txt
 
-var x11 = require('..');
 // TODO: move to templates
 
 exports.requireExt = function(display, callback)
@@ -19,7 +18,7 @@ exports.requireExt = function(display, callback)
             X.seq_num++;
             X.pack_stream.pack('CCSLL', [ext.majorOpcode, 0, 3, clientMaj, clientMin]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
+                function(buf, _opt) {
                     var res = buf.unpack('LL');
                     return res;
                 },
@@ -88,7 +87,6 @@ exports.requireExt = function(display, callback)
                     }
                 },
                 function(err, res) {
-                    var err;
                     if (res.status !== 0) {
                         err = new Error('SetScreenConfig error');
                         err.code = res.status;
@@ -113,7 +111,7 @@ exports.requireExt = function(display, callback)
             X.pack_stream.pack('CCSL', [ext.majorOpcode, 5, 2, win]);
             X.replies[X.seq_num] = [
                 function(buf, opt) {
-                    var i, j;
+                    var i;
                     var res = buf.unpack('LLLSSSSSS');
                     var info = {
                         rotations : opt,
@@ -157,7 +155,7 @@ exports.requireExt = function(display, callback)
             X.seq_num ++;
             X.pack_stream.pack('CCSL', [ext.majorOpcode, 8, 2, win]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
+                function(buf, _opt) {
                     var i;
                     var pos = 0;
                     var res = buf.unpack('LLSSSSxxxxxxxx');
@@ -175,7 +173,7 @@ exports.requireExt = function(display, callback)
                     resources.outputs = buf.unpack(format, pos);
                     pos +=  res[3] << 2;
                     format = Array(res[4] + 1).join('LSSLSSSSSSSSL');
-                    res_modes = buf.unpack(format, pos);
+                    const res_modes = buf.unpack(format, pos);
                     pos +=  res[4] << 5;
                     for (i = 0; i < res[4]; i+= 13) {
                         resources.modeinfos.push({
@@ -209,8 +207,7 @@ exports.requireExt = function(display, callback)
             X.seq_num ++;
             X.pack_stream.pack('CCSLL', [ext.majorOpcode, 9, 3, output, ts ]);
             X.replies[X.seq_num] = [
-                function(buf, opt) {
-                    var i;
+                function(buf, _opt) {
                     var pos = 0;
                     var res = buf.unpack('LLLLCCSSSSS');
                     var info = {
@@ -233,7 +230,7 @@ exports.requireExt = function(display, callback)
                     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');
+                    info.name = buf.slice(pos, pos + res[10]).toString('binary');
                     return info;
                 },
                 cb