X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fplayer.c;h=10f45d53c4b724145163f66ea91c93e302d74553;hb=6fd0347f330cb24ef6145662023053a1c0f81a64;hp=19cbe453063980b1a1ba387220dd1e391f1d69c3;hpb=84814759ceb7dc7a97a3a73b6e365a5ca67d4ef8;p=projects%2Fchimara%2Fchimara.git diff --git a/player/player.c b/player/player.c index 19cbe45..10f45d5 100644 --- a/player/player.c +++ b/player/player.c @@ -1,10 +1,43 @@ +/* + * Copyright (C) 2008, 2009, 2010, 2011 Philip Chimento and Marijn van Vliet. + * All rights reserved. + * + * Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither of the names Philip Chimento or Marijn van Vliet, nor the name of + * any other contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include #include #include +#include #include #include #include "player.h" -#include "error.h" #include "app.h" +#include "error.h" #include "util.h" typedef struct _ChimaraPlayerPrivate { @@ -36,15 +69,28 @@ change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window) g_free(title); } +static void +on_css_changed(GSettings *prefs_settings, char *key, ChimaraPlayer *self) +{ + char *user_css; + g_settings_get(prefs_settings, "css-file", "ms", &user_css); + if(user_css) { + if(!chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), user_css, NULL)) { + /* If the setting didn't point to a CSS file, fail silently and + null the setting */ + g_settings_set(prefs_settings, "css-file", "ms", NULL); + } + g_free(user_css); + } +} + static void chimara_player_dispose(GObject *object) { ChimaraPlayer *self = CHIMARA_PLAYER(object); if(chimara_glk_get_running(CHIMARA_GLK(self->glk))) { chimara_glk_stop(CHIMARA_GLK(self->glk)); - g_printerr("Stopping...\n"); chimara_glk_wait(CHIMARA_GLK(self->glk)); - g_printerr("Done Waiting\n"); } /* Chain up */ @@ -54,7 +100,6 @@ chimara_player_dispose(GObject *object) static void chimara_player_finalize(GObject *object) { - g_printerr("Unreffing\n"); g_object_unref(CHIMARA_PLAYER(object)->glk); /* Chain up */ @@ -66,14 +111,8 @@ chimara_player_class_init(ChimaraPlayerClass *klass) { /* Override methods of parent classes */ GObjectClass *object_class = G_OBJECT_CLASS(klass); - //object_class->set_property = chimara_if_set_property; - //object_class->get_property = chimara_if_get_property; object_class->dispose = chimara_player_dispose; object_class->finalize = chimara_player_finalize; - - /* Signals */ - - /* Properties */ /* Private data */ g_type_class_add_private(klass, sizeof(ChimaraPlayerPrivate)); @@ -106,18 +145,22 @@ chimara_player_init(ChimaraPlayer *self) new window to the "show-toolbar-default" setting, but bind the setting one-way only - we don't want toolbars to disappear suddenly */ GtkToggleAction *toolbar_action = GTK_TOGGLE_ACTION(load_object(builder, "toolbar")); - //gtk_toggle_action_set_active(toolbar_action, g_settings_get_boolean(state_settings, "show-toolbar-default")); - //g_settings_bind(state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET); + gtk_toggle_action_set_active(toolbar_action, g_settings_get_boolean(theapp->state_settings, "show-toolbar-default")); + g_settings_bind(theapp->state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET); self->glk = chimara_if_new(); g_object_set(self->glk, "ignore-errors", TRUE, /*"interpreter-number", CHIMARA_IF_ZMACHINE_TANDY_COLOR,*/ NULL); + + /* Set the CSS styles for the interpreter */ char *default_css = get_data_file_path("style.css"); if( !chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), default_css, &error) ) { - error_dialog(self, error, "Couldn't open default CSS file: "); + error_dialog(GTK_WINDOW(self), error, "Couldn't open default CSS file: "); } + g_free(default_css); + on_css_changed(theapp->prefs_settings, "css-file", self); /* DON'T UNCOMMENT THIS your eyes will burn but it is a good test of programmatically altering just one style @@ -150,6 +193,7 @@ chimara_player_init(ChimaraPlayer *self) gtk_builder_connect_signals(builder, self); g_signal_connect(self->glk, "notify::program-name", G_CALLBACK(change_window_title), self); g_signal_connect(self->glk, "notify::story-name", G_CALLBACK(change_window_title), self); + g_signal_connect(theapp->prefs_settings, "changed::css-file", G_CALLBACK(on_css_changed), self); g_object_unref(builder); g_object_unref(uimanager); @@ -165,6 +209,13 @@ chimara_player_new(void) NULL)); } +void +chimara_player_set_user_css_file(ChimaraPlayer *self, const char *filename) +{ + chimara_glk_set_css_to_default(CHIMARA_GLK(self->glk)); + chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), filename, NULL); +} + /* GLADE CALLBACKS */ #if 0