X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=a1f8f2dee7f245798d70ca979e3e1f2dec385227;hb=e9cfd8d7b3fb7dfa37bd9efd00dbf49d1a32feac;hp=88a05612881da451c5fdb548e449b96c270145f2;hpb=649f028a525fc6703019e8eec7b8eb233993091e;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 88a0561..a1f8f2d 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -51,18 +51,12 @@
  * url="http://www.gnu.org/software/libtool/manual/html_node/Finding-the-dlname.html">
  * Libtool manual</ulink>).
  *
- * You need to initialize multithreading in any program you use a #ChimaraGlk
- * widget in. This means including the following incantation at the beginning
- * of your program:
- * |[
- * if(!g_thread_supported())
- *     g_thread_init(NULL);
- * gdk_threads_init();
- * ]|
- * This initialization must take place <emphasis>before</emphasis> the call to
- * gtk_init(). In addition to this, you must also protect your call to 
- * gtk_main() by calling gdk_threads_enter() right before it, and 
- * gdk_threads_leave() right after it.
+ * You need to initialize GDK threading in any program you use a #ChimaraGlk
+ * widget in.
+ * This means calling gdk_threads_init() at the beginning of your program,
+ * <emphasis>before</emphasis> the call to gtk_init().
+ * In addition to this, you must also protect your call to gtk_main() by calling
+ * gdk_threads_enter() right before it, and gdk_threads_leave() right after it.
  *
  * The following sample program shows how to initialize and construct a simple 
  * GTK window that runs a Glk program:
@@ -79,8 +73,6 @@
  *     gchar *plugin_argv[] = { "plugin.so", "-option" };
  *
  *     /<!---->* Initialize threads and GTK *<!---->/
- *     if(!g_thread_supported())
- *         g_thread_init(NULL);
  *     gdk_threads_init();
  *     gtk_init(&argc, &argv);
  *     
@@ -162,9 +154,8 @@ chimara_glk_init(ChimaraGlk *self)
 	priv->glk_styles = g_new0(StyleSet,1);
 	priv->final_message = g_strdup("[ The game has finished ]");
     priv->event_queue = g_queue_new();
-	priv->char_input_queue = g_async_queue_new();
-	priv->line_input_queue = g_async_queue_new();
-	/* FIXME Should be g_async_queue_new_full(g_free); but only in GTK >= 2.16 */
+	priv->char_input_queue = g_async_queue_new_full(g_free);
+	priv->line_input_queue = g_async_queue_new_full(g_free);
 
 	g_mutex_init(&priv->event_lock);
 	g_mutex_init(&priv->abort_lock);
@@ -630,36 +621,6 @@ chimara_glk_started(ChimaraGlk *self)
 	priv->running = TRUE;
 }
 
-static void
-chimara_glk_waiting(ChimaraGlk *self)
-{
-	/* Default signal handler */
-}
-
-static void
-chimara_glk_char_input(ChimaraGlk *self, guint window_rock, guint keysym)
-{
-	/* Default signal handler */
-}
-
-static void
-chimara_glk_line_input(ChimaraGlk *self, guint window_rock, gchar *text)
-{
-	/* Default signal handler */
-}
-
-static void
-chimara_glk_text_buffer_output(ChimaraGlk *self, guint window_rock, gchar *text)
-{
-	/* Default signal handler */
-}
-
-static void
-chimara_glk_iliad_screen_update(ChimaraGlk *self, gboolean typing)
-{
-	/* Default signal handler */
-}
-
 static void
 chimara_glk_class_init(ChimaraGlkClass *klass)
 {
@@ -683,11 +644,6 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
     /* Signals */
     klass->stopped = chimara_glk_stopped;
     klass->started = chimara_glk_started;
-    klass->waiting = chimara_glk_waiting;
-    klass->char_input = chimara_glk_char_input;
-    klass->line_input = chimara_glk_line_input;
-    klass->text_buffer_output = chimara_glk_text_buffer_output;
-    klass->iliad_screen_update = chimara_glk_iliad_screen_update;
 
     /**
      * ChimaraGlk::stopped:
@@ -1120,15 +1076,16 @@ free_startup_data(struct StartupData *startup)
 	while(i < startup->args.argc)
 		g_free(startup->args.argv[i++]);
 	g_free(startup->args.argv);
+	g_slice_free(struct StartupData, startup);
 }
 
 /* glk_enter() is the actual function called in the new thread in which glk_main() runs.  */
 static gpointer
 glk_enter(struct StartupData *startup)
 {
-	extern GPrivate *glk_data_key;
-	g_private_set(glk_data_key, startup->glk_data);
-	
+	extern GPrivate glk_data_key;
+	g_private_set(&glk_data_key, startup->glk_data);
+
 	/* Acquire the Glk thread's references to the input queues */
 	g_async_queue_ref(startup->glk_data->char_input_queue);
 	g_async_queue_ref(startup->glk_data->line_input_queue);
@@ -1147,10 +1104,9 @@ glk_enter(struct StartupData *startup)
 	
 	/* Run main function */
 	glk_main_t glk_main = startup->glk_main;
-	
-	/* COMPAT: avoid usage of slices */
-	g_free(startup);
-    g_signal_emit_by_name(startup->glk_data->self, "started");
+
+	g_signal_emit_by_name(startup->glk_data->self, "started");
+
 	glk_main();
 	free_startup_data(startup);
 	glk_exit(); /* Run shutdown code in glk_exit() even if glk_main() returns normally */
@@ -1192,9 +1148,8 @@ chimara_glk_run(ChimaraGlk *glk, const gchar *plugin, int argc, char *argv[], GE
     
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
 
-	/* COMPAT: avoid usage of slices */
-	struct StartupData *startup = g_new0(struct StartupData,1);
-	
+	struct StartupData *startup = g_slice_new0(struct StartupData);
+
     g_assert( g_module_supported() );
 	/* If there is already a module loaded, free it first -- you see, we want to
 	 * keep modules loaded as long as possible to avoid crashes in stack unwinding */