From 360ed50c1626727eaf4a7219f9d7cfab085bb8f2 Mon Sep 17 00:00:00 2001 From: Marijn van Vliet Date: Mon, 19 Apr 2010 19:55:12 +0000 Subject: [PATCH] * 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 --- iliad/create_iliad_package.sh | 8 ++++---- iliad/run.sh | 2 +- player/iliad.c | 16 ++++++++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/iliad/create_iliad_package.sh b/iliad/create_iliad_package.sh index 8342cb4..18a5f7c 100755 --- 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 a8a4551..fe44afa 100755 --- 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 6433e82..ac1460a 100644 --- 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; } -- 2.30.2