Merge branch 'master' of https://github.com/sidorares/node-x11

roadmap.txt

@@ -7,6 +7,8 @@
 3.5) XRender examples, FreeType or Xft wrapper (native module? ffi? https://github.com/rbranson/node-ffi/ http://www.freetype.org/freetype2/docs/tutorial/step1.html example)
 
 4) tool to automatically generate requests from xcb xml description http://xcb.freedesktop.org/XmlXcb/ http://cgit.freedesktop.org/xcb/proto/tree/src?id=HEAD
+( https://github.com/CrypticSwarm/XCBJS )
+
 + 5) authorisation
 6) examples: js implementation for basic X utilities: xev, xeyes, xclock, xclip, xauth, xkill, xlsatoms, glxgears etc.
 7) vnc client using https://github.com/substack/node-rfb

test/getkeyboardmapping.js

@@ -1,23 +1,22 @@
 var x11 = require('../lib/x11');
 
-var xclient = x11.createClient();
 var ks = x11.keySyms;
 var ks2Name = {};
 for (var key in ks)
     ks2Name[ ks[key] ] = key;
 var kk2Name = {};
 
-xclient.on('connect', function(display) {
-    var X = this;
+x11.createClient(function(display) {
+    var X = display.client;
     var min = display.min_keycode;
     var max = display.max_keycode;
     X.GetKeyboardMapping(min, max-min, function(list) {
-	for (i in list)
+	for (var i=0; i < list.length; ++i)
         {
+            var name = kk2Name[i+min] = [];
             var sublist = list[i];
-            kk2Name[i] = [];
-            for (j in sublist)
-                kk2Name[i].push(ks2Name[sublist[j]]);
+            for (var j =0; j < sublist.length; ++j)
+		name.push(ks2Name[sublist[j]]);
         }
 
         var root = display.screen[0].root;