simplify the timer

eyelash · Feb 17, 2024 · 75e262b · 75e262b
1 parent 1c4eb1e
commit 75e262b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/gral.h b/gral.h
@@ -157,7 +157,7 @@ void gral_window_show_open_file_dialog(struct gral_window *window, void (*callba
 void gral_window_show_save_file_dialog(struct gral_window *window, void (*callback)(char const *file, void *user_data), void *user_data);
 void gral_window_clipboard_copy(struct gral_window *window, char const *text);
 void gral_window_clipboard_paste(struct gral_window *window, void (*callback)(char const *text, void *user_data), void *user_data);
-struct gral_timer *gral_window_create_timer(struct gral_window *window, int milliseconds, int (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data);
+struct gral_timer *gral_window_create_timer(struct gral_window *window, int milliseconds, void (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data);
 void gral_window_delete_timer(struct gral_window *window, struct gral_timer *timer);
 void gral_window_run_on_main_thread(struct gral_window *window, void (*callback)(void *user_data), void *user_data);
 

diff --git a/gral_linux.c b/gral_linux.c
@@ -639,21 +639,22 @@ void gral_window_clipboard_paste(struct gral_window *window, void (*callback)(ch
 }
 
 typedef struct {
-	int (*callback)(void *user_data);
+	void (*callback)(void *user_data);
 	void (*destroy)(void *user_data);
 	void *user_data;
 } TimerCallbackData;
 static gboolean timer_callback(gpointer user_data) {
 	TimerCallbackData *callback_data = user_data;
-	return callback_data->callback(callback_data->user_data);
+	callback_data->callback(callback_data->user_data);
+	return G_SOURCE_CONTINUE;
 }
 static void timer_destroy(gpointer user_data) {
 	TimerCallbackData *callback_data = user_data;
 	callback_data->destroy(callback_data->user_data);
 	g_slice_free(TimerCallbackData, callback_data);
 }
 
-struct gral_timer *gral_window_create_timer(struct gral_window *window, int milliseconds, int (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data) {
+struct gral_timer *gral_window_create_timer(struct gral_window *window, int milliseconds, void (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data) {
 	TimerCallbackData *callback_data = g_slice_new(TimerCallbackData);
 	callback_data->callback = callback;
 	callback_data->destroy = destroy;

diff --git a/gral_macos.m b/gral_macos.m
@@ -669,23 +669,21 @@ void gral_window_clipboard_paste(struct gral_window *window, void (*callback)(ch
 
 @interface TimerCallbackObject: NSObject {
 @public
-	int (*callback)(void *user_data);
+	void (*callback)(void *user_data);
 	void (*destroy)(void *user_data);
 	void *user_data;
 }
 @end
 @implementation TimerCallbackObject
 - (void)invoke:(NSTimer *)timer {
-	if (!callback(user_data)) {
-		[timer invalidate];
-	}
+	callback(user_data);
 }
 - (void)dealloc {
 	destroy(user_data);
 	[super dealloc];
 }
 @end
-struct gral_timer *gral_window_create_timer(struct gral_window *window, int milliseconds, int (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data) {
+struct gral_timer *gral_window_create_timer(struct gral_window *window, int milliseconds, void (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data) {
 	TimerCallbackObject *callback_object = [[TimerCallbackObject alloc] init];
 	callback_object->callback = callback;
 	callback_object->destroy = destroy;

diff --git a/gral_windows.cpp b/gral_windows.cpp
@@ -201,7 +201,7 @@ struct WindowData {
 };
 
 struct gral_timer {
-	int (*callback)(void *user_data);
+	void (*callback)(void *user_data);
 	void (*destroy)(void *user_data);
 	void *user_data;
 };
@@ -462,11 +462,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	case WM_TIMER:
 		{
 			gral_timer *timer = (gral_timer *)wParam;
-			if (!timer->callback(timer->user_data)) {
-				KillTimer(hwnd, (UINT_PTR)timer);
-				timer->destroy(timer->user_data);
-				delete timer;
-			}
+			timer->callback(timer->user_data);
 			return 0;
 		}
 	case WM_SIZE:
@@ -1069,7 +1065,7 @@ void gral_window_clipboard_paste(gral_window *window, void (*callback)(char cons
 	CloseClipboard();
 }
 
-gral_timer *gral_window_create_timer(gral_window *window, int milliseconds, int (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data) {
+gral_timer *gral_window_create_timer(gral_window *window, int milliseconds, void (*callback)(void *user_data), void (*destroy)(void *user_data), void *user_data) {
 	gral_timer *timer = new gral_timer();
 	timer->callback = callback;
 	timer->destroy = destroy;