Use libui timer instead of own

Author: mischnic

index.js

@@ -50,27 +50,41 @@ function startLoop() {
 	asyncHook.enable();
 
 	setTimeoutNode = global.setTimeout;
-
-	global.setTimeout = function(cb, t) {
+	global.setTimeout = function(cb, timeout) {
+		const timeoutHandle = {running: true};
 		const args = Array.prototype.slice.call(arguments, 2);
-		return binding.lib.setTimeout(function() {
-			cb.apply(null, args);
-		}, t);
-	};
+		binding.lib.Ui.startTimer(timeout, function() {
+			if (timeoutHandle.running) {
+				cb.apply(null, args);
+			}
+			return false;
+		});
+		return timeoutHandle;
+	}
 
 	clearTimeoutNode = global.clearTimeout;
-	global.clearTimeout = binding.lib.clearTimeout;
+	global.clearTimeout = function(timeoutHandle) {
+		timeoutHandle.running = false;
+	}
 
 	setIntervalNode = global.setInterval;
-	global.setInterval = function(cb, t) {
+	global.setInterval = function(cb, timeout) {
+		const timeoutHandle = {running: true};
 		const args = Array.prototype.slice.call(arguments, 2);
-		return binding.lib.setInterval(function() {
-			cb.apply(null, args);
-		}, t);
-	};
+		binding.lib.Ui.startTimer(timeout, function() {
+			if (timeoutHandle.running) {
+				cb.apply(null, args);
+				return true;
+			}
+			return false;
+		});
+		return timeoutHandle;
+	}
 
 	clearIntervalNode = global.clearInterval;
-	global.clearInterval = binding.lib.clearInterval;
+	global.clearInterval = function(timeoutHandle) {
+		timeoutHandle.running = false;
+	}
 }
 
 // This is called when a new async handle

src/Ui.cc

@@ -10,6 +10,11 @@ static int onShouldQuit_cb(void *data) {
 	return 0;
 }
 
+static int uiTimer_cb(void *data) {
+	nbind::cbFunction *cb = (nbind::cbFunction *)data;
+	return cb->call<int>();
+}
+
 struct Ui {
 	static void main() {
 		uiMain();
@@ -40,6 +45,11 @@ struct Ui {
 			uiFreeInitError(err);
 		}
 	}
+
+	static void startTimer(int ms, nbind::cbFunction &cb) {
+		nbind::cbFunction *callbackJs = new nbind::cbFunction(cb);
+		uiTimer(ms, uiTimer_cb, callbackJs);
+	}
 };
 
 NBIND_CLASS(Ui) {
@@ -49,4 +59,5 @@ NBIND_CLASS(Ui) {
 	method(mainStep);
 	method(mainSteps);
 	method(onShouldQuit);
+	method(startTimer);
 }