X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=63849189a1788347e3427795e4e5b140599a869c;hp=0fabb3943eabe4d6823d04a07dddc15165070e8d;hb=7ef4ef1fecab7ae0f724e59f7de1315a96822152;hpb=cbd4cb7f8c62b2ba51329a4cb082a96115a7529d diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c index 0fabb39..6384918 100644 --- a/libchimara/chimara-glk.c +++ b/libchimara/chimara-glk.c @@ -1,5 +1,10 @@ /* licensing and copyright information here */ +#include +#include +#include +#include +#include #include #include #include @@ -53,9 +58,7 @@ enum { PROP_0, PROP_INTERACTIVE, PROP_PROTECT, - PROP_DEFAULT_FONT_DESCRIPTION, - PROP_MONOSPACE_FONT_DESCRIPTION, - PROP_SPACING + PROP_SPACING, }; enum { @@ -83,11 +86,10 @@ chimara_glk_init(ChimaraGlk *self) priv->self = self; priv->interactive = TRUE; priv->protect = FALSE; - priv->default_font_desc = pango_font_description_from_string("Serif"); - priv->monospace_font_desc = pango_font_description_from_string("Monospace"); - priv->css_file = "style.css"; priv->default_styles = g_new0(StyleSet,1); priv->current_styles = g_new0(StyleSet,1); + priv->pager_attr_list = pango_attr_list_new(); + priv->final_message = g_strdup("[ The game has finished ]"); priv->running = FALSE; priv->program = NULL; priv->thread = NULL; @@ -97,6 +99,8 @@ chimara_glk_init(ChimaraGlk *self) priv->event_queue_not_full = g_cond_new(); priv->abort_lock = g_mutex_new(); priv->abort_signalled = FALSE; + priv->shutdown_lock = g_mutex_new(); + priv->shutdown_key_pressed = g_cond_new(); priv->arrange_lock = g_mutex_new(); priv->rearranged = g_cond_new(); priv->needs_rearrange = FALSE; @@ -104,16 +108,20 @@ chimara_glk_init(ChimaraGlk *self) priv->char_input_queue = g_async_queue_new(); priv->line_input_queue = g_async_queue_new(); /* Should be g_async_queue_new_full(g_free); but only in GTK >= 2.16 */ + priv->resource_lock = g_mutex_new(); + priv->resource_loaded = g_cond_new(); + priv->resource_info_available = g_cond_new(); + priv->image_cache = NULL; priv->interrupt_handler = NULL; priv->root_window = NULL; priv->fileref_list = NULL; priv->current_stream = NULL; priv->stream_list = NULL; priv->timer_id = 0; - priv->style_initialized = FALSE; - priv->needs_reset = FALSE; priv->in_startup = FALSE; priv->current_dir = NULL; + + style_init(self); } static void @@ -129,12 +137,6 @@ chimara_glk_set_property(GObject *object, guint prop_id, const GValue *value, GP case PROP_PROTECT: chimara_glk_set_protect( glk, g_value_get_boolean(value) ); break; - case PROP_DEFAULT_FONT_DESCRIPTION: - chimara_glk_set_default_font_description( glk, (PangoFontDescription *)g_value_get_pointer(value) ); - break; - case PROP_MONOSPACE_FONT_DESCRIPTION: - chimara_glk_set_monospace_font_description( glk, (PangoFontDescription *)g_value_get_pointer(value) ); - break; case PROP_SPACING: chimara_glk_set_spacing( glk, g_value_get_uint(value) ); break; @@ -156,12 +158,6 @@ chimara_glk_get_property(GObject *object, guint prop_id, GValue *value, GParamSp case PROP_PROTECT: g_value_set_boolean(value, priv->protect); break; - case PROP_DEFAULT_FONT_DESCRIPTION: - g_value_set_pointer(value, priv->default_font_desc); - break; - case PROP_MONOSPACE_FONT_DESCRIPTION: - g_value_set_pointer(value, priv->monospace_font_desc); - break; case PROP_SPACING: g_value_set_uint(value, priv->spacing); break; @@ -170,9 +166,21 @@ chimara_glk_get_property(GObject *object, guint prop_id, GValue *value, GParamSp } } -void -_chimara_glk_free_nonwindow_private_data(ChimaraGlkPrivate *priv) +static void +chimara_glk_finalize(GObject *object) { + ChimaraGlk *self = CHIMARA_GLK(object); + CHIMARA_GLK_USE_PRIVATE(self, priv); + + /* Free widget properties */ + g_free(priv->final_message); + /* Free styles */ + g_hash_table_destroy(priv->default_styles->text_buffer); + g_hash_table_destroy(priv->default_styles->text_grid); + g_hash_table_destroy(priv->current_styles->text_buffer); + g_hash_table_destroy(priv->current_styles->text_grid); + pango_attr_list_unref(priv->pager_attr_list); + /* Free the event queue */ g_mutex_lock(priv->event_lock); g_queue_foreach(priv->event_queue, (GFunc)g_free, NULL); @@ -182,78 +190,38 @@ _chimara_glk_free_nonwindow_private_data(ChimaraGlkPrivate *priv) priv->event_queue = NULL; g_mutex_unlock(priv->event_lock); g_mutex_free(priv->event_lock); - - /* Free the abort signaling mechanism */ + /* Free the abort signaling mechanism */ g_mutex_lock(priv->abort_lock); /* Make sure no other thread is busy with this */ g_mutex_unlock(priv->abort_lock); g_mutex_free(priv->abort_lock); priv->abort_lock = NULL; - - /* Unref input queues */ - g_async_queue_unref(priv->char_input_queue); - g_async_queue_unref(priv->line_input_queue); - - /* Free styles */ - pango_font_description_free(priv->default_font_desc); - pango_font_description_free(priv->monospace_font_desc); - - g_free(priv->current_dir); - g_hash_table_destroy(priv->default_styles->text_buffer); - g_hash_table_destroy(priv->default_styles->text_grid); - g_hash_table_destroy(priv->current_styles->text_buffer); - g_hash_table_destroy(priv->current_styles->text_grid); -} - -/* Internal function: main thread version of destroy_windows_below, only more - DESTRUCTO-MATIC! */ -static void -trash_windows_recursive(ChimaraGlkPrivate *priv, winid_t win) -{ - switch(win->type) - { - case wintype_Blank: - case wintype_TextGrid: - case wintype_TextBuffer: - gtk_widget_unparent(win->frame); - break; - - case wintype_Pair: - trash_windows_recursive(priv, win->window_node->children->data); - trash_windows_recursive(priv, win->window_node->children->next->data); - break; - - default: - ILLEGAL_PARAM("Unknown window type: %u", win->type); - return; - } - trash_stream_thread_independent(priv, win->window_stream); - trash_window_thread_independent(priv, win); -} - -void -_chimara_glk_free_window_private_data(ChimaraGlkPrivate *priv) -{ - /* Destroy the window tree */ - trash_windows_recursive(priv, priv->root_window->data); - g_node_destroy(priv->root_window); - + /* Free the shutdown keypress signaling mechanism */ + g_mutex_lock(priv->shutdown_lock); + g_cond_free(priv->shutdown_key_pressed); + g_mutex_unlock(priv->shutdown_lock); + priv->shutdown_lock = NULL; /* Free the window arrangement signaling */ g_mutex_lock(priv->arrange_lock); g_cond_free(priv->rearranged); g_mutex_unlock(priv->arrange_lock); g_mutex_free(priv->arrange_lock); priv->arrange_lock = NULL; -} - -static void -chimara_glk_finalize(GObject *object) -{ - ChimaraGlk *self = CHIMARA_GLK(object); - CHIMARA_GLK_USE_PRIVATE(self, priv); - _chimara_glk_free_nonwindow_private_data(priv); - _chimara_glk_free_window_private_data(priv); + g_mutex_lock(priv->resource_lock); + g_cond_free(priv->resource_loaded); + g_cond_free(priv->resource_info_available); + g_mutex_unlock(priv->resource_lock); + g_mutex_free(priv->resource_lock); + g_slist_foreach(priv->image_cache, (GFunc)clear_image_cache, NULL); + g_slist_free(priv->image_cache); + /* Unref input queues (this should destroy them since any Glk thread has stopped by now */ + g_async_queue_unref(priv->char_input_queue); + g_async_queue_unref(priv->line_input_queue); + + /* Free other stuff */ + g_free(priv->current_dir); + /* Chain up to parent */ G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object); } @@ -595,19 +563,13 @@ static void chimara_glk_stopped(ChimaraGlk *self) { CHIMARA_GLK_USE_PRIVATE(self, priv); - printf("stopped signal received\n"); priv->running = FALSE; - - /* Free the plugin */ - if( priv->program && !g_module_close(priv->program) ) - g_warning( "Error closing module: %s", g_module_error() ); } static void chimara_glk_started(ChimaraGlk *self) { CHIMARA_GLK_USE_PRIVATE(self, priv); - printf("started signal received\n"); priv->running = TRUE; } @@ -635,9 +597,16 @@ chimara_glk_text_buffer_output(ChimaraGlk *self, guint window_rock, gchar *text) /* Default signal handler */ } -/* G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */ +/* COMPAT: G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */ #ifndef G_PARAM_STATIC_STRINGS + +/* COMPAT: G_PARAM_STATIC_NAME and friends only appeared in GTK 2.8 */ +#if GTK_CHECK_VERSION(2,8,0) #define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) +#else +#define G_PARAM_STATIC_STRINGS (0) +#endif + #endif static void @@ -768,36 +737,6 @@ chimara_glk_class_init(ChimaraGlkClass *klass) FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) ); - /* We can't use G_PARAM_CONSTRUCT on these because then the constructor will - initialize them with NULL */ - /** - * ChimaraGlk:default-font-description: - * - * Pointer to a #PangoFontDescription describing the default proportional - * font, to be used in text buffer windows for example. - * - * Default value: font description created from the string - * Sans - */ - g_object_class_install_property(object_class, PROP_DEFAULT_FONT_DESCRIPTION, - g_param_spec_pointer("default-font-description", _("Default Font"), - _("Font description of the default proportional font"), - G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) ); - - /** - * ChimaraGlk:monospace-font-description: - * - * Pointer to a #PangoFontDescription describing the default monospace font, - * to be used in text grid windows and %style_Preformatted, for example. - * - * Default value: font description created from the string - * Monospace - */ - g_object_class_install_property(object_class, PROP_MONOSPACE_FONT_DESCRIPTION, - g_param_spec_pointer("monospace-font-description", _("Monospace Font"), - _("Font description of the default monospace font"), - G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) ); - /** * ChimaraGlk:spacing: * @@ -860,6 +799,7 @@ chimara_glk_set_interactive(ChimaraGlk *glk, gboolean interactive) ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); priv->interactive = interactive; + g_object_notify(G_OBJECT(glk), "interactive"); } /** @@ -896,6 +836,7 @@ chimara_glk_set_protect(ChimaraGlk *glk, gboolean protect) ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); priv->protect = protect; + g_object_notify(G_OBJECT(glk), "protect"); } /** @@ -917,137 +858,90 @@ chimara_glk_get_protect(ChimaraGlk *glk) } /** - * chimara_glk_set_default_font_description: + * chimara_glk_set_css_to_default: * @glk: a #ChimaraGlk widget - * @font: a #PangoFontDescription * - * Sets @glk's default proportional font. See - * #ChimaraGlk:default-font-description. + * Resets the styles for text buffer and text grid windows to their defaults. + * + * This function is not implemented yet. + * */ -void -chimara_glk_set_default_font_description(ChimaraGlk *glk, PangoFontDescription *font) +void +chimara_glk_set_css_to_default(ChimaraGlk *glk) { - g_return_if_fail(glk || CHIMARA_IS_GLK(glk)); - g_return_if_fail(font); - - ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - pango_font_description_free(priv->default_font_desc); - priv->default_font_desc = pango_font_description_copy(font); - - /* TODO: Apply the font description to all the windows and recalculate the sizes */ + reset_default_styles(glk); } /** - * chimara_glk_set_default_font_string: + * chimara_glk_set_css_from_file: * @glk: a #ChimaraGlk widget - * @font: string representation of a font description + * @filename: path to a CSS file, or %NULL + * @error: location to store a GError, or + * %NULL * - * Sets @glk's default proportional font according to the string @font, which - * must be a string in the form FAMILY-LIST - * [STYLE-OPTIONS] - * [SIZE], such as Charter,Utopia - * Italic 12 or Sans. See - * #ChimaraGlk:default-font-description. - */ -void -chimara_glk_set_default_font_string(ChimaraGlk *glk, const gchar *font) -{ - g_return_if_fail(glk || CHIMARA_IS_GLK(glk)); - g_return_if_fail(font || *font); - - PangoFontDescription *fontdesc = pango_font_description_from_string(font); - g_return_if_fail(fontdesc); - - ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - pango_font_description_free(priv->default_font_desc); - priv->default_font_desc = fontdesc; - - /* TODO: Apply the font description to all the windows and recalculate the sizes */ -} - -/** - * chimara_glk_get_default_font_description: - * @glk: a #ChimaraGlk widget - * - * Returns @glk's default proportional font. + * Sets the styles for text buffer and text grid windows according to the CSS + * file @filename. Note that the styles are set cumulatively on top of whatever + * the styles are at the time this function is called; to reset the styles to + * their defaults, use chimara_glk_set_css_to_default(). * - * Return value: a newly-allocated #PangoFontDescription which must be freed - * using pango_font_description_free(), or %NULL on error. + * Returns: %TRUE on success, %FALSE if an error occurred, in which case @error + * will be set. */ -PangoFontDescription * -chimara_glk_get_default_font_description(ChimaraGlk *glk) +gboolean +chimara_glk_set_css_from_file(ChimaraGlk *glk, const gchar *filename, GError **error) { - g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), NULL); - - ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - return pango_font_description_copy(priv->default_font_desc); -} + g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), FALSE); + g_return_val_if_fail(filename, FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); + + int fd = open(filename, O_RDONLY); + if(fd == -1) { + *error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno), + _("Error opening file \"%s\": %s"), filename, g_strerror(errno)); + return FALSE; + } -/** - * chimara_glk_set_monospace_font_description: - * @glk: a #ChimaraGlk widget - * @font: a #PangoFontDescription - * - * Sets @glk's default monospace font. See - * #ChimaraGlk:monospace-font-description. - */ -void -chimara_glk_set_monospace_font_description(ChimaraGlk *glk, PangoFontDescription *font) -{ - g_return_if_fail(glk || CHIMARA_IS_GLK(glk)); - g_return_if_fail(font); - - ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - pango_font_description_free(priv->monospace_font_desc); - priv->monospace_font_desc = pango_font_description_copy(font); + GScanner *scanner = create_css_file_scanner(); + g_scanner_input_file(scanner, fd); + scanner->input_name = filename; + scan_css_file(scanner, glk); + + /* Set the current style to a copy of the default style */ + /* FIXME this is not correct */ + copy_default_styles_to_current_styles(glk); - /* TODO: Apply the font description to all the windows and recalculate the sizes */ + if(close(fd) == -1) { + *error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno), + _("Error closing file \"%s\": %s"), filename, g_strerror(errno)); + return FALSE; + } + return TRUE; } /** - * chimara_glk_set_monospace_font_string: + * chimara_glk_set_css_from_string: * @glk: a #ChimaraGlk widget - * @font: string representation of a font description + * @filename: a string containing CSS code * - * Sets @glk's default monospace font according to the string @font, which must - * be a string in the form FAMILY-LIST - * [STYLE-OPTIONS] - * [SIZE], such as Courier - * Bold 12 or Monospace. See - * #ChimaraGlk:monospace-font-description. + * Sets the styles for text buffer and text grid windows according to the CSS + * code @css. Note that the styles are set cumulatively on top of whatever the + * styles are at the time this function is called; to reset the styles to their + * defaults, use chimara_glk_set_css_to_default(). */ void -chimara_glk_set_monospace_font_string(ChimaraGlk *glk, const gchar *font) +chimara_glk_set_css_from_string(ChimaraGlk *glk, const gchar *css) { g_return_if_fail(glk || CHIMARA_IS_GLK(glk)); - g_return_if_fail(font || *font); - - PangoFontDescription *fontdesc = pango_font_description_from_string(font); - g_return_if_fail(fontdesc); - - ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - pango_font_description_free(priv->monospace_font_desc); - priv->monospace_font_desc = fontdesc; - - /* TODO: Apply the font description to all the windows and recalculate the sizes */ -} - -/** - * chimara_glk_get_monospace_font_description: - * @glk: a #ChimaraGlk widget - * - * Returns @glk's default monospace font. - * - * Return value: a newly-allocated #PangoFontDescription which must be freed - * using pango_font_description_free(), or %NULL on error. - */ -PangoFontDescription * -chimara_glk_get_monospace_font_description(ChimaraGlk *glk) -{ - g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), NULL); + g_return_if_fail(css || *css); - ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - return pango_font_description_copy(priv->monospace_font_desc); + GScanner *scanner = create_css_file_scanner(); + g_scanner_input_text(scanner, css, strlen(css)); + scanner->input_name = ""; + scan_css_file(scanner, glk); + + /* Set the current style to a copy of the default style */ + /* FIXME this is not correct */ + copy_default_styles_to_current_styles(glk); } /** @@ -1065,6 +959,7 @@ chimara_glk_set_spacing(ChimaraGlk *glk, guint spacing) ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); priv->spacing = spacing; + g_object_notify(G_OBJECT(glk), "spacing"); } /** @@ -1098,6 +993,7 @@ glk_enter(struct StartupData *startup) 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); @@ -1117,15 +1013,15 @@ 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"); - (startup->glk_main)(); - g_signal_emit_by_name(startup->glk_data->self, "stopped"); - /* FIXME: hack. should be done by the signal above but for some reason - * this doesn't work */ - chimara_glk_stopped(startup->glk_data->self); - - g_slice_free(struct StartupData, startup); - return NULL; + glk_main(); + glk_exit(); /* Run shutdown code in glk_exit() even if glk_main() returns normally */ + g_assert_not_reached(); /* because glk_exit() calls g_thread_exit() */ + return NULL; } /** @@ -1153,19 +1049,24 @@ chimara_glk_run(ChimaraGlk *glk, const gchar *plugin, int argc, char *argv[], GE { g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), FALSE); g_return_val_if_fail(plugin, FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); + + if(chimara_glk_get_running(glk)) { + g_set_error(error, CHIMARA_ERROR, CHIMARA_PLUGIN_ALREADY_RUNNING, _("There was already a plugin running.")); + return FALSE; + } ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); - struct StartupData *startup = g_slice_new0(struct StartupData); - /* If anything was left over from the previous run, destroy it */ - if(priv->needs_reset) { - _chimara_glk_free_window_private_data(priv); - priv->needs_reset = FALSE; - chimara_glk_init(glk); - } + /* COMPAT: avoid usage of slices */ + struct StartupData *startup = g_new0(struct StartupData,1); - /* Open the module to run */ 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 */ + if( priv->program && !g_module_close(priv->program) ) + g_warning( "Error closing module :%s", g_module_error() ); + /* Open the module to run */ priv->program = g_module_open(plugin, G_MODULE_BIND_LAZY); if(!priv->program) @@ -1216,7 +1117,6 @@ chimara_glk_stop(ChimaraGlk *glk) g_return_if_fail(glk || CHIMARA_IS_GLK(glk)); CHIMARA_GLK_USE_PRIVATE(glk, priv); - printf("stopping (%d)...\n", priv->running); /* Don't do anything if not running a program */ if(!priv->running) return; @@ -1227,6 +1127,10 @@ chimara_glk_stop(ChimaraGlk *glk) g_mutex_unlock(priv->abort_lock); /* Stop blocking on the event queue condition */ event_throw(glk, evtype_Abort, NULL, 0, 0); + /* Stop blocking on the shutdown key press condition */ + g_mutex_lock(priv->shutdown_lock); + g_cond_signal(priv->shutdown_key_pressed); + g_mutex_unlock(priv->shutdown_lock); } } @@ -1245,7 +1149,10 @@ chimara_glk_wait(ChimaraGlk *glk) /* Don't do anything if not running a program */ if(!priv->running) return; + /* Unlock GDK mutex, because the Glk program might need to use it for shutdown */ + gdk_threads_leave(); g_thread_join(priv->thread); + gdk_threads_enter(); } /**