From: Philip Chimento Date: Sat, 15 Sep 2012 15:46:59 +0000 (+0200) Subject: Remove Iliad code from codebase X-Git-Tag: v0.9~13^2 X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=044af5b603b590e5cbc9e916786d6c3fb835b38e Remove Iliad code from codebase The iRex Iliad is, unfortunately, obsolete, and the company that made it is bankrupt. So it is not supported anymore. --- diff --git a/Makefile.am b/Makefile.am index 352b3d3..d0d290d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,7 @@ ## Process this file with automake to produce Makefile.in ## Created by Anjuta -if TARGET_ILIAD -SUBDIRS = libchimara interpreters player po -else SUBDIRS = libchimara interpreters player tests docs po -endif chimaradocdir = $(datadir)/doc/chimara dist_chimaradoc_DATA = \ diff --git a/configure.ac b/configure.ac index c0f5e90..391b91f 100644 --- a/configure.ac +++ b/configure.ac @@ -75,14 +75,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) GOBJECT_INTROSPECTION_CHECK([0.6.7]) -### ILIAD ##################################################################### -AC_ARG_ENABLE([iliad], - [AS_HELP_STRING([--enable-iliad=@<:@yes/no@:>@], - [Compiles Chimara for the iLiad @<:@default=no@:>@])], - [], - [enable_iliad=no]) -AM_CONDITIONAL(TARGET_ILIAD, $TEST "x$enable_iliad" = xyes) - ### RPM CONFIGURATION ########################################################## # --enable-rpm requires rpm and rpmbuild AC_PATH_PROG([RPMBUILD], [rpmbuild], [notfound]) diff --git a/iliad/chimara.png b/iliad/chimara.png deleted file mode 100644 index 05b3cd9..0000000 Binary files a/iliad/chimara.png and /dev/null differ diff --git a/iliad/create_iliad_package.sh b/iliad/create_iliad_package.sh deleted file mode 100755 index 18a5f7c..0000000 --- a/iliad/create_iliad_package.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -VERSION=0.9 - -mkdir -p Chimara/chimara -mkdir -p Chimara/interpreters -mkdir -p Chimara/games - -# Iliad specific files -cp manifest.xml Chimara/manifest.xml -cp iliad_refresh.conf Chimara/iliad_refresh.conf -cp run.sh Chimara/run.sh -cp style.css Chimara/chimara/style.css -cp chimara.png Chimara/chimara.png - -# Chimara lib and player -cp ../libchimara/.libs/libchimara.so.0 Chimara/chimara/ -cp ../player/.libs/chimara_iliad Chimara/chimara/chimara - -# Interpreters -cp ../interpreters/frotz/.libs/frotz.so Chimara/interpreters/ -cp ../interpreters/git/.libs/git.so Chimara/interpreters/ -cp ../interpreters/glulxe/.libs/glulxe.so Chimara/interpreters/ -cp ../interpreters/nitfol/.libs/nitfol.so Chimara/interpreters/ - -# Games -cp ../tests/anchor.z8 Chimara/games/ -cp ../tests/CoSv3.blb Chimara/games/ - -# Create zip file -tar czvf chimara-${VERSION}.tar.gz Chimara - -echo "Iliad package created: chimara-${VERSION}.tar.gz" diff --git a/iliad/iliad_refresh.conf b/iliad/iliad_refresh.conf deleted file mode 100755 index 79a8829..0000000 --- a/iliad/iliad_refresh.conf +++ /dev/null @@ -1 +0,0 @@ -Typing 100 diff --git a/iliad/manifest.xml b/iliad/manifest.xml deleted file mode 100755 index 64da7e7..0000000 --- a/iliad/manifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Chimara - Interactive Fiction Player - 2009-11-17T15:00:00 - - - - - - run.sh - chimara.png - 000 - 2457600 - - - diff --git a/iliad/run.sh b/iliad/run.sh deleted file mode 100755 index fe44afa..0000000 --- a/iliad/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -export DISPLAY=:0 -export LD_LIBRARY_PATH=. -export scriptdir=`/usr/bin/dirname $0` -cd $scriptdir -cd chimara -export HOME=`pwd` -#./xepdmgr :0 ./iliad ../games/anchor.z8 -./chimara ../games/anchor.z8 diff --git a/iliad/style.css b/iliad/style.css deleted file mode 100644 index 7f0d1fc..0000000 --- a/iliad/style.css +++ /dev/null @@ -1,81 +0,0 @@ -/* Possible windows: - * grid - * buffer - * - * Possible selectors: - * normal - * emphasized - * preformatted - * header - * subheader - * alert - * note - * block-quote - * input - * user1 - * user2 - * hyperlink - * - * Possible style hints: - * font-family (string) - * font-size (float) - * font-weight (normal/bold) - * font-style (normal/italic) - * color (#hex-value) - * background-color (#hex-value) - * text-align (left/right/center) - */ -grid.normal { - font-size: 10; -} - -grid.user1 { - color: #303030; - background-color: #ffffff; -} - -buffer.normal { - font-size: 10; -} - -buffer.header { - font-size: 14; - font-weight: bold; - text-align: center; -} - -buffer.subheader { - font-size: 12; - font-weight: bold; -} - -buffer.alert { - color: #aa0000; - font-weight: bold; -} - -buffer.note { - color: #aaaa00; - font-weight: bold; -} - -buffer.block-quote { - text-align: center; - font-style: italic; -} - -buffer.input { - color: #0000aa; - font-style: italic; -} - -buffer.user1 { -} - -buffer.user2 { -} - -buffer.pager { - color: #ffffff; - background-color: #303030; -} diff --git a/interpreters/frotz/Makefile.am b/interpreters/frotz/Makefile.am index 16c91a6..fa0f0b1 100644 --- a/interpreters/frotz/Makefile.am +++ b/interpreters/frotz/Makefile.am @@ -3,15 +3,7 @@ frotz_la_SOURCES = buffer.c err.c fastmem.c files.c input.c main.c math.c \ object.c process.c quetzal.c random.c redirect.c sound.c stream.c table.c \ text.c variable.c glkscreen.c glkmisc.c frotz.h glkfrotz.h glkio.h frotz_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara - -if TARGET_ILIAD -no_pointer_sign = -else -no_pointer_sign = -Wno-pointer-sign -endif - -frotz_la_CFLAGS = $(no_pointer_sign) $(AM_CFLAGS) - +frotz_la_CFLAGS = -Wno-pointer-sign $(AM_CFLAGS) frotz_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) frotzdocdir = $(datadir)/doc/$(PACKAGE)/frotz diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am index 81c5bc7..efb023d 100644 --- a/libchimara/Makefile.am +++ b/libchimara/Makefile.am @@ -4,12 +4,6 @@ AM_CFLAGS = -Wall lib_LTLIBRARIES = libchimara.la -if TARGET_ILIAD -pluginpath = "../interpreters" -else -pluginpath = $(pkglibdir) -endif - libchimara_la_SOURCES = \ abort.c abort.h \ case.c \ @@ -45,7 +39,7 @@ libchimara_la_SOURCES = \ libchimara_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Chimara\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ - -DPLUGINDIR=\""$(pluginpath)"\" \ + -DPLUGINDIR=\""$(pkglibdir)"\" \ -DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \ -I$(top_srcdir) libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS) diff --git a/player/Makefile.am b/player/Makefile.am index e7aee92..6ef3b76 100644 --- a/player/Makefile.am +++ b/player/Makefile.am @@ -3,16 +3,6 @@ AM_CPPFLAGS = -I$(top_srcdir) PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$" -if TARGET_ILIAD - -chimara_iliad_SOURCES = iliad.c xepdmgrclient.c xepdmgrclient.h -chimara_iliad_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS) -chimara_iliad_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la - -bin_PROGRAMS = chimara_iliad - -else - dist_pkgdata_DATA = chimara.ui chimara.menus style.css bin_PROGRAMS = chimara @@ -27,8 +17,6 @@ chimara_LDADD = @PLAYER_LIBS@ $(top_builddir)/libchimara/libchimara.la gsettings_SCHEMAS = org.chimara-if.gschema.xml @GSETTINGS_RULES@ -endif - CLEANFILES = config.pyc DISTCLEANFILES = config.py diff --git a/player/iliad.c b/player/iliad.c deleted file mode 100644 index abb2ad1..0000000 --- a/player/iliad.c +++ /dev/null @@ -1,227 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ -/* - * iliad.c - * Copyright (C) Philip en Marijn 2008 <> - * - * iliad.c is free software copyrighted by Philip en Marijn. - * - * 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 the name ``Philip en Marijn'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * main.c IS PROVIDED BY Philip en Marijn ``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 Philip en Marijn OR ANY OTHER 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 -#include - -#include "error.h" -#include -#include - -/* Iliad includes */ -#include -#include -#include -#include -/*#include "xepdmgrclient.h"*/ - - -/* Global pointers to widgets */ -GtkWidget *window = NULL; -GtkWidget *glk = NULL; - -/* Display manager */ -/* sEpd *epd = NULL;*/ - -static erClientChannel_t erbusyChannel; -static erClientChannel_t ertoolbarChannel; - -static void -on_started(ChimaraGlk *glk) -{ - g_printerr("Started!\n"); -} - -static void -on_stopped(ChimaraGlk *glk) -{ - g_printerr("Stopped!\n"); -} - -static void -on_restore() -{ - chimara_glk_feed_line_input( CHIMARA_GLK(glk), "restore" ); -} - -static void -on_save() -{ - chimara_glk_feed_line_input( CHIMARA_GLK(glk), "save" ); -} - -gboolean -update_screen(gpointer data) -{ - printf("Update screen from idle handler\n"); - dmDisplay(dmCmdPriorNormal, dmQFull); - - return FALSE; -} - -static void -on_iliad_screen_update(ChimaraGlk *glk, gboolean typing) -{ - printf("Update screen\n"); - g_idle_add_full(G_PRIORITY_DEFAULT_IDLE+100, update_screen, NULL, NULL); -} - - -static void -create_window(void) -{ - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - glk = chimara_if_new(); - //chimara_if_set_preferred_interpreter( CHIMARA_IF(glk), CHIMARA_IF_FORMAT_Z8, CHIMARA_IF_INTERPRETER_NITFOL); - - gtk_widget_set_size_request(window, 800, 800); - g_object_set(glk, - "border-width", 6, - "spacing", 6, - "ignore-errors", TRUE, - "style-sheet", "style.css", - NULL); - - g_signal_connect(glk, "started", G_CALLBACK(on_started), NULL); - g_signal_connect(glk, "stopped", G_CALLBACK(on_stopped), NULL); - g_signal_connect(glk, "iliad-screen-update", G_CALLBACK(on_iliad_screen_update), NULL); - - GtkWidget *vbox = gtk_vbox_new(FALSE, 0); - GtkWidget *toolbar = gtk_toolbar_new(); - - GtkToolItem *restore_button = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN); - g_signal_connect(restore_button, "clicked", G_CALLBACK(on_restore), NULL); - gtk_toolbar_insert( GTK_TOOLBAR(toolbar), restore_button, 0 ); - - GtkToolItem *save_button = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE); - g_signal_connect(save_button, "clicked", G_CALLBACK(on_save), NULL); - gtk_toolbar_insert( GTK_TOOLBAR(toolbar), save_button, 0 ); - - GtkToolItem *quit_button = gtk_tool_button_new_from_stock(GTK_STOCK_QUIT); - g_signal_connect(quit_button, "clicked", G_CALLBACK(gtk_main_quit), NULL); - gtk_toolbar_insert( GTK_TOOLBAR(toolbar), quit_button, 0 ); - - GtkWidget *spacer = gtk_vbox_new(FALSE, 0); - gtk_widget_set_size_request(spacer, -1, 250); - - gtk_box_pack_start( GTK_BOX(vbox), toolbar, FALSE, FALSE, 0 ); - gtk_box_pack_start( GTK_BOX(vbox), glk, TRUE, TRUE, 0 ); - gtk_box_pack_end( GTK_BOX(vbox), spacer, FALSE, FALSE, 0 ); - - gtk_container_add( GTK_CONTAINER(window), vbox ); -} - -static void -iliad_init_toolbar() -{ - erIpcStartClient(ER_TOOLBAR_CHANNEL, &ertoolbarChannel); - tbSelectIconSet(ertoolbarChannel, ER_PDF_VIEWER_UA_ID); - tbClearIconSet(ertoolbarChannel, ER_PDF_VIEWER_UA_ID); - - // Turn off trashcan - tbAppendPlatformIcon( ertoolbarChannel, ER_PDF_VIEWER_UA_ID, iconID_trashcan, -1); - tbSetStatePlatformIcon(ertoolbarChannel, ER_PDF_VIEWER_UA_ID, iconID_trashcan, iconState_grey ); - - // Enable then pop up keyboard - tbAppendPlatformIcon( ertoolbarChannel, ER_PDF_VIEWER_UA_ID, iconID_keyboard, -1); - tbSetStatePlatformIcon(ertoolbarChannel, ER_PDF_VIEWER_UA_ID, iconID_keyboard, iconState_selected); -} - -static void -iliad_clear_toolbar() -{ - // Turn on trashcan - tbSetStatePlatformIcon(ertoolbarChannel, ER_PDF_VIEWER_UA_ID, iconID_trashcan, iconState_normal ); - - // Disable the keyboard - tbSetStatePlatformIcon(ertoolbarChannel, ER_PDF_VIEWER_UA_ID, iconID_keyboard, iconState_normal); -} - -int -main(int argc, char *argv[]) -{ - GError *error = NULL; - -#ifdef ENABLE_NLS - bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); -#endif - - /* Setup connection to display manager deamon */ - /* - if( (epd = EpdInit(NULL)) == NULL ) { - g_critical("Could not connect to xepdmgr server\n"); - return 1; - } - EpdRefreshAuto(epd, 0); - */ - - if( !g_thread_supported() ) - g_thread_init(NULL); - gdk_threads_init(); - gtk_init(&argc, &argv); - - create_window(); - gtk_widget_show_all(window); - - if(argc < 2) { - g_printerr("Must provide a game file\n"); - return 1; - } - - if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) { - g_printerr("Error starting Glk library: %s\n", error->message); - return 1; - } - //chimara_glk_run( CHIMARA_GLK(glk), ".libs/multiwin.so", argc, argv, NULL); - - iliad_init_toolbar(); - - gdk_threads_enter(); - gtk_main(); - gdk_threads_leave(); - - chimara_glk_stop(CHIMARA_GLK(glk)); - chimara_glk_wait(CHIMARA_GLK(glk)); - - iliad_clear_toolbar(); - - return 0; -} diff --git a/player/xepdmgrclient.c b/player/xepdmgrclient.c deleted file mode 100644 index e69de29..0000000 diff --git a/player/xepdmgrclient.h b/player/xepdmgrclient.h deleted file mode 100644 index e69de29..0000000