[project @ 2006-03-09 20:14:13 by dsilvers]

Added schedule support to the GTK port

svn path=/import/netsurf/; revision=2116

gtk/gtk_gui.c

@@ -226,10 +226,6 @@ void gui_401login_open(struct browser_window *bw, struct content *c,
 void gui_cert_verify(struct browser_window *bw, struct content *c,
 		const struct ssl_cert_info *certs, unsigned long num) {}
 
-void schedule(int t, void (*callback)(void *p), void *p) {}
-void schedule_remove(void (*callback)(void *p), void *p) {}
-void schedule_run(void) {}
-
 void global_history_add(struct url_content *data) {}
 
 utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len,

gtk/gtk_schedule.c

@@ -0,0 +1,73 @@
+/*
+ * This file is part of NetSurf, http://netsurf.sourceforge.net/
+ * Licensed under the GNU General Public License,
+ *                http://www.opensource.org/licenses/gpl-license
+ * Copyright 2006 Daniel Silverstone <dsilvers@digital-scurf.org>
+ */
+
+#include <glib.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "netsurf/desktop/browser.h"
+
+typedef struct {
+	void (*callback)(void *);
+	void *p;
+	int die;
+} _nsgtkcallback;
+
+static GList *callbacks;
+
+static gboolean ns_generic_gtk_callback(gpointer data)
+{
+	_nsgtkcallback *cb = (_nsgtkcallback*)(data);
+	if(cb->die) {
+		/* We got removed before we got fired off */
+		fprintf(stderr, "Callback %p(%p) died before run\n",
+				cb->callback, cb->p);
+		free(cb);
+		return FALSE;
+	}
+	fprintf(stderr, "Calling %p(%p)\n", cb->callback, cb->p);
+	cb->callback(cb->p);
+	callbacks = g_list_remove(callbacks, cb);
+	free(cb);
+	return FALSE;
+}
+
+void schedule_remove(void (*callback)(void *p), void *p) 
+{
+	_nsgtkcallback *cb;
+        GList *l;
+	l = callbacks;
+	while(l) {
+		cb = (_nsgtkcallback*)(l->data);
+		if(cb->callback == callback && cb->p == p) {
+			l = callbacks = g_list_remove(callbacks, cb);
+			cb->die = 1;
+			fprintf(stderr, "Callback %p(%p) scheduled for removal\n",
+					cb->callback, cb->p);
+
+		} else
+			l = g_list_next(l);
+	}
+}
+
+void schedule(int t, void (*callback)(void *p), void *p) 
+{
+	_nsgtkcallback *cb = (_nsgtkcallback*)malloc(sizeof(_nsgtkcallback));
+	schedule_remove(callback, p);
+	cb->callback = callback;
+	cb->p = p;
+	cb->die = 0;
+	callbacks = g_list_prepend(callbacks, cb);
+	g_timeout_add(t * 10, ns_generic_gtk_callback, cb);
+	fprintf(stderr, "Scheduled a callback to %p(%p) for %d CS\n", callback, p, t);
+}
+
+void schedule_run(void) 
+{
+	/* Nothing to do, the running is done via the gtk mainloop of joy */
+}
+

makefile

@@ -65,6 +65,7 @@ OBJECTS_GTK += filetyped.o					# debug/
 OBJECTS_GTK += browser.o netsurf.o selection.o textinput.o \
 	version.o						# desktop/
 OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
+        gtk_schedule.o \
 	gtk_plotters.o gtk_treeview.o gtk_window.o		# gtk/