* 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:
* 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);
*
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);
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)
{
/* 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:
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
/**
* ChimaraGlk::char-input:
- * @glk: The widget that received the signal
+ * @self: The widget that received the signal
* @window_rock: The rock value of the window that received character input
* (see <link linkend="chimara-Rocks">Rocks</link>)
- * @keysym: The key that was typed, in the form of a key symbol from
+ * @window_id_string: A string value uniquely identifying the window that
+ * received character input
+ * @keysym: The key that was typed, in the form of a key symbol from
* <filename class="headerfile">gdk/gdkkeysyms.h</filename>
- *
+ *
* Emitted when a Glk window receives character input.
+ * The @window_rock can be used to identify the window.
+ * However, rock values in Glk are allowed to be identical for different
+ * windows, so Chimara also provides a string value with which the window
+ * can be uniquely identified.
*/
chimara_glk_signals[CHAR_INPUT] = g_signal_new("char-input",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, char_input), NULL, NULL,
- _chimara_marshal_VOID__UINT_UINT,
- G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+ _chimara_marshal_VOID__UINT_STRING_UINT,
+ G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT);
/**
* ChimaraGlk::line-input:
- * @glk: The widget that received the signal
+ * @self: The widget that received the signal
* @window_rock: The rock value of the window that received line input (see
* <link linkend="chimara-Rocks">Rocks</link>)
+ * @window_id_string: A string value uniquely identifying the window that
+ * received the input
* @text: The text that was typed
- *
+ *
* Emitted when a Glk window receives line input.
+ * The @window_rock can be used to identify the window.
+ * However, rock values in Glk are allowed to be identical for different
+ * windows, so Chimara also provides a string value with which the window
+ * can be uniquely identified.
*/
chimara_glk_signals[LINE_INPUT] = g_signal_new("line-input",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, line_input), NULL, NULL,
- _chimara_marshal_VOID__UINT_STRING,
- G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+ _chimara_marshal_VOID__UINT_STRING_STRING,
+ G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
/**
* ChimaraGlk::text-buffer-output:
- * @glk: The widget that received the signal
+ * @self: The widget that received the signal
* @window_rock: The rock value of the window that was printed to (see <link
* linkend="chimara-Rocks">Rocks</link>)
- *
+ * @window_id_string: A string value uniquely identifying the window that
+ * was printed to
+ *
* Emitted when text is printed to a text buffer window.
+ * The @window_rock can be used to identify the window.
+ * However, rock values in Glk are allowed to be identical for different
+ * windows, so Chimara also provides a string value with which the window
+ * can be uniquely identified.
*/
chimara_glk_signals[TEXT_BUFFER_OUTPUT] = g_signal_new("text-buffer-output",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, text_buffer_output), NULL, NULL,
- _chimara_marshal_VOID__UINT_STRING,
- G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+ _chimara_marshal_VOID__UINT_STRING_STRING,
+ G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
/**
* ChimaraGlk::iliad-screen-update:
* @self: The widget that received the signal
while(i < startup->args.argc)
g_free(startup->args.argv[i++]);
g_free(startup->args.argv);
- g_free(startup);
+ g_slice_free(struct StartupData, startup);
}
/* glk_enter() is the actual function called in the new thread in which
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);
/* Run main function */
glk_main_t glk_main = startup->glk_main;
- /* COMPAT: avoid usage of slices */
g_signal_emit_by_name(startup->glk_data->self, "started");
glk_main();
free_startup_data(startup);
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 */
/* Set the program name */
priv->program_name = g_path_get_basename(plugin);
g_object_notify(G_OBJECT(glk), "program-name");
-
+
+ /* Set Glk styles to defaults */
+ style_reset_glk(glk);
+
/* Run in a separate thread */
- priv->thread = g_thread_create((GThreadFunc)glk_enter, startup, TRUE, error);
-
+ priv->thread = g_thread_try_new("glk", (GThreadFunc)glk_enter, startup, error);
+
return !(priv->thread == NULL);
}
CHIMARA_GLK_USE_PRIVATE(glk, priv);
if( priv->program && !g_module_close(priv->program) )
g_warning( "Error closing module :%s", g_module_error() );
+ priv->program = NULL;
}
/**
projects / projects / chimara / chimara.git / blobdiff