* Use .tar.gz for iliad packaging

 * Close keyboard after shutdown of iliad client

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@242 ddfedd41-794f-dd11-ae45-00112f111e67

diff --git a/iliad/create_iliad_package.sh b/iliad/create_iliad_package.sh
index 8342cb44f355f22e19854f82d9963ba52dcda82b..18a5f7c1d69e4c0ea21c902c52e9033c9017a01c 100755 (executable)
--- a/iliad/create_iliad_package.sh
+++ b/iliad/create_iliad_package.sh
@@ -24,10 +24,10 @@ cp ../interpreters/glulxe/.libs/glulxe.so Chimara/interpreters/
 cp ../interpreters/nitfol/.libs/nitfol.so Chimara/interpreters/
 
 # Games
-cp ../tests/anchor.z8 iliad/Chimara/games/
-cp ../tests/CoSv3.blb iliad/Chimara/games/
+cp ../tests/anchor.z8 Chimara/games/
+cp ../tests/CoSv3.blb Chimara/games/
 
 # Create zip file
-zip -r chimara-${VERSION}.zip Chimara
+tar czvf chimara-${VERSION}.tar.gz Chimara
 
-echo "Iliad package created: chimara-${VERSION}.zip"
+echo "Iliad package created: chimara-${VERSION}.tar.gz"

diff --git a/iliad/run.sh b/iliad/run.sh
index a8a4551ba6a9ed59ae0ca867f1baca510d208c74..fe44afa7154cf1a7cd1d6e35c3d14da6d2956890 100755 (executable)
--- a/iliad/run.sh
+++ b/iliad/run.sh
@@ -5,4 +5,4 @@ cd $scriptdir
 cd chimara
 export HOME=`pwd`
 #./xepdmgr :0 ./iliad ../games/anchor.z8
-./iliad ../games/anchor.z8
+./chimara ../games/anchor.z8

diff --git a/player/iliad.c b/player/iliad.c
index 6433e827e5a8c3ef9d77a723b1903ac659edffd3..ac1460adf0d612456558211cdfe67729f9add2f5 100644 (file)
--- a/player/iliad.c
+++ b/player/iliad.c
@@ -125,7 +125,7 @@ create_window(void)
 }
 
 static void
-iliad_popup_keyboard()
+iliad_init_toolbar()
 {
        erIpcStartClient(ER_TOOLBAR_CHANNEL, &ertoolbarChannel);
        tbSelectIconSet(ertoolbarChannel, ER_PDF_VIEWER_UA_ID);
@@ -140,6 +140,16 @@ iliad_popup_keyboard()
        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[])
 {
@@ -170,7 +180,7 @@ main(int argc, char *argv[])
        }
        //chimara_glk_run( CHIMARA_GLK(glk), ".libs/multiwin.so", argc, argv, NULL);
        
-       iliad_popup_keyboard();
+       iliad_init_toolbar();
 
        gdk_threads_enter();
        gtk_main();
@@ -179,5 +189,7 @@ main(int argc, char *argv[])
        chimara_glk_stop(CHIMARA_GLK(glk));
        chimara_glk_wait(CHIMARA_GLK(glk));
 
+       iliad_clear_toolbar();
+
        return 0;
 }