setTimeout and setInterval for macos

Author: mischnic

binding.gyp

@@ -44,7 +44,7 @@
 					"sources": [
 						"<!@(ls -1 src/*.cc)",
 						"<!@(ls -1 src/UiArea/*.cc)",
-						"src/arch/darwin/libui_loop.mm"
+						"<!@(ls -1 src/arch/darwin/*.mm)"
 					],
 					"xcode_settings": {
 						"OTHER_LDFLAGS": [

package.json

@@ -34,7 +34,7 @@
 		"build": "node-gyp configure build",
 		"clean": "rm -rf build; rm -rf node_modules;",
 		"precommit": "check-clang-format \"'npm run lint'\"",
-		"lint": "clang-format -i --glob='{src/**/*.{h,cc},index.js,examples/**/*.js}'"
+		"lint": "clang-format -i --glob='{src/**/*.{h,cc,mm},index.js,examples/**/*.js}'"
 	},
 	"keywords": [
 		"libui",

src/arch/darwin/libui_loop.mm

@@ -2,48 +2,48 @@
 #include "../../includes/event-loop.h"
 
 int uiLoopWakeup() {
-  [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
-                                      location:NSZeroPoint
-                                 modifierFlags:0
-                                     timestamp:0.0
-                                  windowNumber:0
-                                       context:nil
-                                       subtype:0
-                                         data1:0
-                                         data2:0]
-           atStart:NO];
-  // give main thread some time to react
-  usleep(50 * 1000);
-  return 0;
+	[NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+										location:NSZeroPoint
+								   modifierFlags:0
+									   timestamp:0.0
+									windowNumber:0
+										 context:nil
+										 subtype:0
+										   data1:0
+										   data2:0]
+			 atStart:NO];
+	// give main thread some time to react
+	usleep(50 * 1000);
+	return 0;
 }
 
 int uiEventsPending() {
-  NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-                                      untilDate:[NSDate distantPast]
-                                         inMode:NSDefaultRunLoopMode
-                                        dequeue:NO];
-  return nil != event;
+	NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
+										untilDate:[NSDate distantPast]
+										   inMode:NSDefaultRunLoopMode
+										  dequeue:NO];
+	return nil != event;
 }
 
-int waitForNodeEvents(uv_loop_t* loop, int timeout) {
-  int nodeBackendFd = uv_backend_fd(loop);
-  if (nodeBackendFd == -1) {
-    fprintf(stderr, "Invalid node backend fd.\n");
-    return 0;
-  }
+int waitForNodeEvents(uv_loop_t *loop, int timeout) {
+	int nodeBackendFd = uv_backend_fd(loop);
+	if (nodeBackendFd == -1) {
+		fprintf(stderr, "Invalid node backend fd.\n");
+		return 0;
+	}
 
-  struct kevent event;
-  struct timespec ts;
-  ts.tv_sec = timeout / 1000;
-  ts.tv_nsec = (timeout % 1000) * 1000000;
-  
-  int ret = kevent(nodeBackendFd, NULL, 0, &event, 1, &ts);
-  
-  struct heap* timer_heap = (struct heap*)&loop->timer_heap;
-  struct heap_node* timer_node = timer_heap->min;
-  if (timer_node != NULL) {
-    return 1;
-  }
-  
-  return ret;
+	struct kevent event;
+	struct timespec ts;
+	ts.tv_sec = timeout / 1000;
+	ts.tv_nsec = (timeout % 1000) * 1000000;
+
+	int ret = kevent(nodeBackendFd, NULL, 0, &event, 1, &ts);
+
+	struct heap *timer_heap = (struct heap *)&loop->timer_heap;
+	struct heap_node *timer_node = timer_heap->min;
+	if (timer_node != NULL) {
+		return 1;
+	}
+
+	return ret;
 }

src/arch/darwin/timer.mm

@@ -0,0 +1,71 @@
+#include "../../includes/event-loop-darwin.h"
+#include "nbind/api.h"
+
+class TimeoutHandle {
+  public:
+	NSTimer *handle;
+	nbind::cbFunction *callbackJs;
+	bool destroyed;
+
+	TimeoutHandle(nbind::cbFunction *callbackJs) {
+		this->callbackJs = callbackJs;
+		this->destroyed = false;
+	}
+
+	void destroy() {
+		if (this->destroyed) {
+			return;
+		}
+
+		delete this->callbackJs;
+		this->destroyed = true;
+	}
+};
+
+#define CALL_JSCB(timeoutHandle) (*(timeoutHandle->callbackJs))()
+
+TimeoutHandle *setTimeout(nbind::cbFunction &cb, unsigned int timeout) {
+	nbind::cbFunction *callbackJs = new nbind::cbFunction(cb);
+	TimeoutHandle *timeoutHandle = new TimeoutHandle(callbackJs);
+	timeoutHandle->handle =
+		[NSTimer scheduledTimerWithTimeInterval:timeout / 1000.0
+										repeats:NO
+										  block:^(NSTimer *timer) {
+											CALL_JSCB(timeoutHandle);
+											timeoutHandle->destroy();
+										  }];
+	return timeoutHandle;
+}
+
+void clearTimeout(TimeoutHandle *timeoutHandle) {
+	[timeoutHandle->handle invalidate];
+	timeoutHandle->destroy();
+}
+
+TimeoutHandle *setInterval(nbind::cbFunction &cb, unsigned int timeout) {
+	nbind::cbFunction *callbackJs = new nbind::cbFunction(cb);
+	TimeoutHandle *timeoutHandle = new TimeoutHandle(callbackJs);
+	timeoutHandle->handle =
+		[NSTimer scheduledTimerWithTimeInterval:timeout / 1000.0
+										repeats:YES
+										  block:^(NSTimer *timer) {
+											CALL_JSCB(timeoutHandle);
+										  }];
+	return timeoutHandle;
+}
+
+void clearInterval(TimeoutHandle *timeoutHandle) {
+	[timeoutHandle->handle invalidate];
+	timeoutHandle->destroy();
+}
+
+#include "nbind/nbind.h"
+
+NBIND_GLOBAL() {
+	function(setTimeout);
+	function(clearTimeout);
+	function(setInterval);
+	function(clearInterval);
+}
+
+NBIND_CLASS(TimeoutHandle) {}