1 files changed, 6 insertions, 9 deletions
diff --git a/lib/index.js b/lib/index.js
index d0129ab..a9fb71d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,12 +2,7 @@ const fs = require("fs")
     , util = require("util")
     , EventEmitter = require("events").EventEmitter
     , {eviocgrab, eviocgid} = require("bindings")("ioctl.node")
-    , events = require("./Events")
-    , codes = {
-      EV_KEY : require("./Events/EV_KEY"),
-      EV_ABS : require("./Events/EV_ABS"),
-      EV_SYN : require("./Events/EV_SYN")
-    };
+    , events = require("./events");
 
 const arch = (process.arch.indexOf("64")>=0)?64:32;
 
@@ -38,6 +33,7 @@ Device.prototype.open = function(path) {
 };
 
 Device.prototype.close = function() {
+  this.grabbed = false;
   this.stream.close();
   delete this.stream;
   delete this.fd;
@@ -80,9 +76,10 @@ function parse(buf) {
   e.code = buf.readUInt16LE(offset + 2);
   e.value = buf.readInt32LE(offset + 4);
 
-  if (events[e.type]) e.type = events[e.type];
-  if (codes[e.type] && codes[e.type][e.code])
-    e.code = codes[e.type][e.code];
+  if (events.types[e.type])
+    e.type = events.types[e.type];
+  if (events[e.type] && events[e.type][e.code])
+    e.code = events[e.type][e.code];
 
   return e;
 };