Refactorings

examples/berries.js

@@ -1,6 +1,6 @@
 var pitft = require("../pitft");
 
-var fb = new pitft.FrameBuffer("/dev/fb1");
+var fb = pitft("/dev/fb1");
 fb.clear();
 
 var xMax = fb.size().width;

examples/circles.js

@@ -1,6 +1,6 @@
 var pitft = require("../pitft");
 
-var fb = new pitft.FrameBuffer("/dev/fb1");
+var fb = pitft("/dev/fb1");
 fb.clear();
 
 var xMax = fb.size().width;

examples/clock.js

@@ -1,6 +1,6 @@
 var pitft = require("../pitft");
 
-var fb = new pitft.FrameBuffer("/dev/fb1", true);
+var fb = pitft("/dev/fb1", true);
 fb.clear();
 
 var xMax = fb.size().width;

examples/lines.js

@@ -1,6 +1,7 @@
 var pitft = require("../pitft");
 
-var fb = new pitft.FrameBuffer("/dev/fb1");
+var fb = pitft("/dev/fb1");
+
 fb.clear();
 
 var xMax = fb.size().width;

examples/rectangles.js

@@ -1,6 +1,6 @@
 var pitft = require("../pitft");
 
-var fb = new pitft.FrameBuffer("/dev/fb1");
+var fb = pitft("/dev/fb1");
 fb.clear();
 
 var xMax = fb.size().width;

examples/text.js

@@ -1,7 +1,6 @@
 var pitft = require("../pitft");
 
-var fb = new pitft.FrameBuffer("/dev/fb1");
-
+var fb = pitft("/dev/fb1");
 fb.clear();
 
 var xMax = fb.size().width;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pitft",
-  "description": "A C++ extension for node.js that gives javascript access to the PiTFT framebuffer",
-  "version": "0.0.7",
+  "description": "A NodeJS module that gives you access to the PiTFT framebuffer",
+  "version": "0.0.8",
   "main": "pitft.js",
   "author": "Werner Vesteraas <[email protected]>",
   "license": {

src/framebuffer.cc

@@ -2,13 +2,12 @@
 
 using namespace v8;
 
-Persistent<FunctionTemplate> FrameBuffer::constructor;
+Persistent<Function> FrameBuffer::constructor;
 
-void FrameBuffer::Init(Handle<Object> exports) {
+void FrameBuffer::Init() {
     NanScope();
 
     Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(FrameBuffer::New);
-    NanAssignPersistent(constructor, ctor);
     ctor->InstanceTemplate()->SetInternalFieldCount(1);
     ctor->SetClassName(NanNew("FrameBuffer"));
 
@@ -25,7 +24,17 @@ void FrameBuffer::Init(Handle<Object> exports) {
     NODE_SET_PROTOTYPE_METHOD(ctor, "text", Text);
     NODE_SET_PROTOTYPE_METHOD(ctor, "image", Image);
 
-    exports->Set(NanNew("FrameBuffer"), ctor->GetFunction());
+    constructor = Persistent<Function>::New(ctor->GetFunction());
+}
+
+NAN_METHOD(FrameBuffer::NewInstance) {
+  HandleScope scope;
+
+  const unsigned argc = 2;
+  Handle<Value> argv[2] = { args[0], args[1] };
+  Local<Object> instance = constructor->NewInstance(argc, argv);
+
+  NanReturnValue(instance);
 }
 
 NAN_METHOD(FrameBuffer::New) {
@@ -84,9 +93,11 @@ NAN_METHOD(FrameBuffer::Blit) {
 
     FrameBuffer *obj = ObjectWrap::Unwrap<FrameBuffer>(args.Holder());
 
-    cairo_t *cr = cairo_create (obj->screenSurface);
-    cairo_set_source_surface (cr, obj->bufferSurface, 0, 0);
-    cairo_paint (cr);
+    if (obj->drawToBuffer) {
+        cairo_t *cr = cairo_create (obj->screenSurface);
+        cairo_set_source_surface (cr, obj->bufferSurface, 0, 0);
+        cairo_paint (cr);
+    }
 
     NanReturnUndefined();
 }

src/framebuffer.h

@@ -20,8 +20,9 @@ using namespace node;
 
 class FrameBuffer : public node::ObjectWrap {
     public:
-        static Persistent<FunctionTemplate> constructor;
-        static void Init(Handle<Object> exports);
+        static Persistent<Function> constructor;
+        static void Init();
+        static NAN_METHOD(NewInstance);
         static NAN_METHOD(New);
         static NAN_METHOD(Size);
         static NAN_METHOD(Data);

src/pitft.cc

@@ -3,8 +3,17 @@
 
 using namespace v8;
 
-void InitAll(Handle<Object> exports) {
-    FrameBuffer::Init(exports);
+NAN_METHOD(CreateObject) {
+  NanScope();
+
+  NanReturnValue(FrameBuffer::NewInstance(args));
+}
+
+void InitAll(Handle<Object> exports, Handle<Object> module) {
+    FrameBuffer::Init();
+
+    module->Set(String::NewSymbol("exports"),
+      FunctionTemplate::New(CreateObject)->GetFunction());
 }
 
 NODE_MODULE(pitft, InitAll)