projects/chimara/chimara.git
13 years agoFix bug in Frotz option parsing
Philip Chimento [Sat, 5 Feb 2011 01:18:37 +0000 (02:18 +0100)]
Fix bug in Frotz option parsing

The '-i' option was mistakenly instructed to swallow a value.

13 years agoClean up external Blorb file finding code
Philip Chimento [Sat, 5 Feb 2011 00:48:11 +0000 (01:48 +0100)]
Clean up external Blorb file finding code

Moved the code that looks for an external Blorb file to the player, so
the default path can become a setting in the preferences window. Also,
passing an extra file name on the command line when starting the player
also indicates an external resource file.

13 years agoReinstated 'Open Recent' menu
Philip Chimento [Fri, 4 Feb 2011 23:44:31 +0000 (00:44 +0100)]
Reinstated 'Open Recent' menu

And added a configure option, '--disable-recent' to skip it, in order to
work around the GTK Quartz bug on OS X that makes the player crash.

13 years agoRe-added toolbar with menu item to show or hide it
Philip Chimento [Fri, 4 Feb 2011 17:29:25 +0000 (18:29 +0100)]
Re-added toolbar with menu item to show or hide it

13 years agoClean up action group code
Philip Chimento [Fri, 4 Feb 2011 17:13:25 +0000 (18:13 +0100)]
Clean up action group code

13 years agoFix program for GStreamer < 0.10.31
Philip Chimento [Wed, 2 Feb 2011 23:16:27 +0000 (00:16 +0100)]
Fix program for GStreamer < 0.10.31

It seems that gst_is_initialized() wasn't added until version 0.10.31.
And it just so happens that Ubuntu 10.10 has 0.10.30, so compilation
was failing.

13 years agoCheck for GStreamer plugins individually
Philip Chimento [Mon, 31 Jan 2011 00:52:51 +0000 (01:52 +0100)]
Check for GStreamer plugins individually

In configure.ac, check for individual GStreamer plugins, instead of
requiring gstreamer-plugins-bad-0.10.pc. This is because Ubuntu doesn't
have a devel package for gstreamer-plugins-bad, and we don't actually
link against that library - we just dynamically open it.

13 years agoProvide blorb file to interpreter on command line
P. F. Chimento [Sun, 30 Jan 2011 17:49:53 +0000 (18:49 +0100)]
Provide blorb file to interpreter on command line

Apparently both interpreters have the undocumented command line option
of providing an extra file name on the command line, which is the Blorb
resource file. We now take advantage of this.

13 years agoAdded hack for opening external Blorb file
P. F. Chimento [Sun, 30 Jan 2011 17:34:03 +0000 (18:34 +0100)]
Added hack for opening external Blorb file

However, something is preventing it from working with the old Infocom
games.

13 years agoAdded calls to set the preferred interpreter
P. F. Chimento [Sun, 30 Jan 2011 16:40:26 +0000 (17:40 +0100)]
Added calls to set the preferred interpreter

The preferred interpreter can now be set in player/main.c by simply
changing one of the calls to chimara_if_set_preferred_interpreter().

13 years agoMerge branch 'sound'
P. F. Chimento [Sun, 30 Jan 2011 16:10:37 +0000 (17:10 +0100)]
Merge branch 'sound'

Conflicts:
tests/Makefile.am

13 years agoCheck for proper plugins in configure
P. F. Chimento [Sun, 30 Jan 2011 16:02:54 +0000 (17:02 +0100)]
Check for proper plugins in configure

Plugins from gstreamer-plugins-base and gstreamer-plugins-bad are
required for proper sound support.

13 years agoEnabled MOD/S3M/IT/XM support
P. F. Chimento [Sun, 30 Jan 2011 16:01:06 +0000 (17:01 +0100)]
Enabled MOD/S3M/IT/XM support

With this commit, sound support should be finished completely!

13 years agoMerge branch 'master' of github.com:wmvanvliet/Chimara
P. F. Chimento [Sun, 30 Jan 2011 15:41:28 +0000 (16:41 +0100)]
Merge branch 'master' of github.com:wmvanvliet/Chimara

Conflicts:
player/style.css

13 years agoBackground color of windows now changes with garglk_set_reversevideo()
Marijn van Vliet [Sun, 30 Jan 2011 15:36:30 +0000 (16:36 +0100)]
Background color of windows now changes with garglk_set_reversevideo()

13 years agoImplemented sound notification events
P. F. Chimento [Sun, 30 Jan 2011 15:24:05 +0000 (16:24 +0100)]
Implemented sound notification events

Sound notification events now work.

13 years agoFixed memory leak
P. F. Chimento [Sun, 30 Jan 2011 15:05:35 +0000 (16:05 +0100)]
Fixed memory leak

13 years agoImplement alternative resource loading for sound
P. F. Chimento [Sun, 30 Jan 2011 15:02:58 +0000 (16:02 +0100)]
Implement alternative resource loading for sound

Sound resources can now be loaded from an alternative location using the
ChimaraGlk resource loading callback. This is tested in the test
program.

13 years agoOverhauled the whole reverse video thing.
Marijn van Vliet [Sun, 30 Jan 2011 14:44:50 +0000 (15:44 +0100)]
Overhauled the whole reverse video thing.

13 years agoAdded test case for various sound functions
P. F. Chimento [Sun, 30 Jan 2011 14:24:40 +0000 (15:24 +0100)]
Added test case for various sound functions

13 years agoImplemented sound repeats
P. F. Chimento [Sun, 30 Jan 2011 13:40:36 +0000 (14:40 +0100)]
Implemented sound repeats

Now you can request a sound to be played a certain number of times, or
to loop forever.

13 years agoImplemented sound load hints
P. F. Chimento [Sun, 30 Jan 2011 13:17:47 +0000 (14:17 +0100)]
Implemented sound load hints

Sound load hints work, at least for Blorb resources.

13 years agoStop playing old sound when playing new sound
P. F. Chimento [Sun, 30 Jan 2011 12:44:25 +0000 (13:44 +0100)]
Stop playing old sound when playing new sound

Sound playing now stops any previous sound already playing on that sound
channel.

13 years agoSound support working!
P. F. Chimento [Sun, 30 Jan 2011 00:45:59 +0000 (01:45 +0100)]
Sound support working!

Sounds now play as they should.

13 years agoWorking on sound support
P. F. Chimento [Sun, 30 Jan 2011 00:13:23 +0000 (01:13 +0100)]
Working on sound support

Playing sounds more than once now works, but not playing an AIFF sound
after an OGG sound or vice versa.

13 years agoWork on sound support
P. F. Chimento [Sun, 30 Jan 2011 00:00:24 +0000 (01:00 +0100)]
Work on sound support

Now supports playing AIFF and OGG sounds only once.

13 years agoFixes for garglk_set_zcolors()
Marijn van Vliet [Sat, 29 Jan 2011 22:47:05 +0000 (23:47 +0100)]
Fixes for garglk_set_zcolors()

13 years agoChange less-like behavior of pager
P. F. Chimento [Sat, 29 Jan 2011 21:59:47 +0000 (22:59 +0100)]
Change less-like behavior of pager

The behavior of the pager was based on the paging program 'less': the
enter key scrolls down one line (in GTK terms a 'step increment') and
the space bar scrolls down one page. People probably don't want to page
through interactive fiction one line at a time, and so expect the enter
key to scroll down a page. The enter key now does the same as a space
bar. To scroll line by line, use the mouse wheel or the scroll bar
arrows.

13 years agoFinished implementing garglk_set_zcolors()
Marijn van Vliet [Sat, 29 Jan 2011 17:36:08 +0000 (18:36 +0100)]
Finished implementing garglk_set_zcolors()

13 years agoImproved default styles
P. F. Chimento [Sat, 29 Jan 2011 16:33:17 +0000 (17:33 +0100)]
Improved default styles

Defined the default styles so as to be as accommodating as possible to
the largest possible number of games. In particular, games that abuse
the "Header" style to print bold text.

13 years agoMerge branch 'master' of https://github.com/wmvanvliet/Chimara
Marijn van Vliet [Sat, 29 Jan 2011 16:04:08 +0000 (17:04 +0100)]
Merge branch 'master' of https://github.com/wmvanvliet/Chimara

Conflicts:
libchimara/garglk.c

13 years agoBegan garglk_set_zcolors() implementation
Marijn van Vliet [Sat, 29 Jan 2011 16:02:04 +0000 (17:02 +0100)]
Began garglk_set_zcolors() implementation

13 years agoFixed pixbuf ref bug
P. F. Chimento [Sat, 29 Jan 2011 15:46:44 +0000 (16:46 +0100)]
Fixed pixbuf ref bug

Bug introduced by alternative resource loading.

13 years agoMerge branch 'master' of github.com:wmvanvliet/Chimara
P. F. Chimento [Sat, 29 Jan 2011 14:33:39 +0000 (15:33 +0100)]
Merge branch 'master' of github.com:wmvanvliet/Chimara

13 years agoUpdated interpreters
P. F. Chimento [Sat, 29 Jan 2011 14:31:35 +0000 (15:31 +0100)]
Updated interpreters

All bundled interpreters are now current with revision 496 of Gargoyle's
interpreters. Added new Gargoyle extension functions to garglk.c and
garglk.h.

13 years agoMerge branch 'master' of https://github.com/wmvanvliet/Chimara
Marijn van Vliet [Sat, 29 Jan 2011 13:46:04 +0000 (14:46 +0100)]
Merge branch 'master' of https://github.com/wmvanvliet/Chimara

13 years ago * Fixed garglk_set_reversevideo to use the new way styles are handled.
Marijn van Vliet [Sat, 29 Jan 2011 13:43:55 +0000 (14:43 +0100)]
 * Fixed garglk_set_reversevideo to use the new way styles are handled.
 * GtkTextTags are no longer shared between GtkTextBuffers, as this
   is not allowed.

13 years agoWorking on sound
Philip Chimento [Sat, 29 Jan 2011 12:38:52 +0000 (13:38 +0100)]
Working on sound

13 years agoImplemented sound playing with test sound
Philip Chimento [Wed, 19 Jan 2011 18:32:33 +0000 (19:32 +0100)]
Implemented sound playing with test sound

Implemented glk_schannel_play() and glk_schannel_stop() with a 440 Hz
sine wave as a test sound. This sound is played no matter what resource
number you pass to glk_schannel_play() and keeps going until you call
glk_schannel_stop().

13 years agoMerge branch 'master' of github.com:wmvanvliet/Chimara
P. F. Chimento [Sat, 15 Jan 2011 12:10:07 +0000 (13:10 +0100)]
Merge branch 'master' of github.com:wmvanvliet/Chimara

13 years agoGet library to build on Debian stable
P. F. Chimento [Sat, 15 Jan 2011 12:09:08 +0000 (13:09 +0100)]
Get library to build on Debian stable

gio/gio.h isn't included by default in the old version of GLib that is
in the Debian stable distribution.

13 years agoMerge branch 'master' of github.com:wmvanvliet/Chimara
Philip Chimento [Tue, 11 Jan 2011 20:01:41 +0000 (15:01 -0500)]
Merge branch 'master' of github.com:wmvanvliet/Chimara

13 years agoAlso trigger the "command" signal on char input
Philip Chimento [Tue, 11 Jan 2011 07:37:00 +0000 (02:37 -0500)]
Also trigger the "command" signal on char input

Character input should also trigger the ChimaraIF::command signal.

13 years agoFixed issue when setting a 'proportional' style hint.
Marijn van Vliet [Sun, 9 Jan 2011 22:55:31 +0000 (23:55 +0100)]
Fixed issue when setting a 'proportional' style hint.

13 years agoFix ref bug in plugin loader test
Philip Chimento [Wed, 5 Jan 2011 21:49:10 +0000 (16:49 -0500)]
Fix ref bug in plugin loader test

The Chimara widget should have a reference added to it.

13 years agoImplement glk_schannel_set_volume()
Philip Chimento [Wed, 5 Jan 2011 21:55:52 +0000 (16:55 -0500)]
Implement glk_schannel_set_volume()

Implement setting volume on sound channels using the GStreamer "volume"
element.

13 years agoAdd test plugin for sound functions
Philip Chimento [Wed, 5 Jan 2011 21:54:34 +0000 (16:54 -0500)]
Add test plugin for sound functions

Add a test plugin, to be loaded with plugin-loader, for various testing
of sound functions.

13 years agoFix ref bug in plugin loader test
Philip Chimento [Wed, 5 Jan 2011 21:49:10 +0000 (16:49 -0500)]
Fix ref bug in plugin loader test

The Chimara widget should have a reference added to it.

13 years agoFix stylehint size bug
Philip Chimento [Wed, 5 Jan 2011 19:19:50 +0000 (14:19 -0500)]
Fix stylehint size bug

The "size" stylehint should use the GtkTextTag "scale" property, not
the "size" property - this way, the relative size is independent of the
default font size. The bug was that the "size" property should be given
in Pango units, not points, but now the "size" property isn't used at
all.

13 years agoAdd test case for stylehint size bug
Philip Chimento [Wed, 5 Jan 2011 18:36:30 +0000 (13:36 -0500)]
Add test case for stylehint size bug

Setting a "size" stylehint on a style makes any text printed in that
style invisible. This is a test case for that bug.

13 years agoFix #ifdefs
Philip Chimento [Tue, 28 Dec 2010 17:04:58 +0000 (18:04 +0100)]
Fix #ifdefs

13 years agoUse gst_object_unref() instead of g_object_unref()
Philip Chimento [Tue, 28 Dec 2010 17:03:37 +0000 (18:03 +0100)]
Use gst_object_unref() instead of g_object_unref()

13 years agoAdded guards for compiling without GStreamer
Philip Chimento [Tue, 28 Dec 2010 16:53:13 +0000 (17:53 +0100)]
Added guards for compiling without GStreamer

The GStreamer code should be protected everywhere with #ifdef's so that
the library will still build without GStreamer support.

13 years agoImprove error handling
Philip Chimento [Tue, 28 Dec 2010 16:32:15 +0000 (17:32 +0100)]
Improve error handling

Interrupt glk_schannel_create() and print warnings if GStreamer functions
fail

13 years agoStart work on sound capabilities
Philip Chimento [Tue, 28 Dec 2010 13:57:16 +0000 (14:57 +0100)]
Start work on sound capabilities

Compile with GStreamer libraries. Implement creation of Glk sound
channel objects containing GStreamer pipelines.

13 years agoAdded test game for sound
Philip Chimento [Tue, 28 Dec 2010 13:55:16 +0000 (14:55 +0100)]
Added test game for sound

13 years agoFixed some default styling
Marijn van Vliet [Sun, 19 Dec 2010 10:58:46 +0000 (11:58 +0100)]
Fixed some default styling

13 years agoFixed default font retrieval for windows. This caused a minor issue with
Marijn van Vliet [Sat, 18 Dec 2010 23:44:27 +0000 (00:44 +0100)]
Fixed default font retrieval for windows. This caused a minor issue with
textgrid size calcuations.

13 years agoAdded _input_pending functions to docs
P. F. Chimento [Tue, 23 Nov 2010 00:05:02 +0000 (01:05 +0100)]
Added _input_pending functions to docs

Added the chimara_glk_is_{line,char}_input_pending() functions to the
documentation.

13 years agoWrote chimara_glk_set_resource_load_callback()
P. F. Chimento [Tue, 23 Nov 2010 00:01:29 +0000 (01:01 +0100)]
Wrote chimara_glk_set_resource_load_callback()

Added a function for providing an alternate mechanism for loading
resources, as described in the Blorb specification, section 14. This
function allows the host program to specify a callback which the Glk
program will call when a resource is requested and no Blorb resource map
is loaded.

13 years agoFixed threading bug in graphics
P. F. Chimento [Mon, 22 Nov 2010 23:50:26 +0000 (00:50 +0100)]
Fixed threading bug in graphics

flush_window_buffer() requests the GDK lock, but it was called with the
GDK lock already acquired in draw_image_common(). How this managed not
to freeze before, I don't know.

13 years agoFixed minor bug in glk_image_get_info()
P. F. Chimento [Mon, 22 Nov 2010 22:14:19 +0000 (23:14 +0100)]
Fixed minor bug in glk_image_get_info()

13 years agoFix crash when loading resource without a map
P. F. Chimento [Mon, 22 Nov 2010 20:54:41 +0000 (21:54 +0100)]
Fix crash when loading resource without a map

The Glk program now fails gracefully when trying to load an image
resource without having loaded a resource map first: it prints a warning
and doesn't load the image, instead of crashing.

13 years agoAdded API to tell whether forced input is pending
P. F. Chimento [Sun, 21 Nov 2010 01:04:52 +0000 (02:04 +0100)]
Added API to tell whether forced input is pending

Added the functions
  chimara_glk_is_char_input_pending()
  chimara_glk_is_line_input_pending()

13 years agoImplemented interactive mode
P. F. Chimento [Sun, 21 Nov 2010 00:45:21 +0000 (01:45 +0100)]
Implemented interactive mode

The ChimaraGlk:interactive-mode property didn't do anything yet, but it
now disables paging when TRUE. When input scrolls off the screen, the
screen now scrolls down with it.

13 years agoFixed crash in ChimaraIF::command
P. F. Chimento [Fri, 19 Nov 2010 21:58:57 +0000 (22:58 +0100)]
Fixed crash in ChimaraIF::command

Fixed the threading bug in ChimaraIF::command.

13 years agoAdded test case for crash in ChimaraIF::command
P. F. Chimento [Fri, 19 Nov 2010 21:55:32 +0000 (22:55 +0100)]
Added test case for crash in ChimaraIF::command

There is a gdk_threads_enter/leave missing somewhere, because using GTK
calls from the signal handler of the ChimaraIF::command signal causes an
X error.

13 years agoFixed buffers and grids sharing the same styles
P. F. Chimento [Wed, 17 Nov 2010 21:14:06 +0000 (22:14 +0100)]
Fixed buffers and grids sharing the same styles

Two separate text tags should be created, one for text buffers, the
other for grids. Otherwise they share each other's styles (i.e. reverse
video on text grids.)

13 years agoUpdated glulxe's Makefile.am
P. F. Chimento [Wed, 17 Nov 2010 21:13:09 +0000 (22:13 +0100)]
Updated glulxe's Makefile.am

Updated glulxe's Makefile.am, based on glulxe's original Makefile

13 years agoFewer unnecessary recompiles of git
P. F. Chimento [Wed, 17 Nov 2010 21:11:26 +0000 (22:11 +0100)]
Fewer unnecessary recompiles of git

Making the automatically-generated version.h depend on Makefile.am
instead of Makefile prevents git from being fully recompiled every time
configure is run.

13 years agoEdited documentation of ChimaraIF::command signal
P. F. Chimento [Wed, 17 Nov 2010 21:10:13 +0000 (22:10 +0100)]
Edited documentation of ChimaraIF::command signal

The documentation did not mention that the signal can be generated with
the "input" parameter equal to NULL.

13 years agoFixed memory management in styles
P. F. Chimento [Sat, 13 Nov 2010 00:20:21 +0000 (01:20 +0100)]
Fixed memory management in styles

Added a free for the StyleSets that were leaked, and fixed a double
unref of text tags that was causing lots of warnings when closing the
widget. Also added a test case.

13 years agoMerge branch 'master' of github.com:wmvanvliet/Chimara
P. F. Chimento [Sat, 13 Nov 2010 00:08:04 +0000 (01:08 +0100)]
Merge branch 'master' of github.com:wmvanvliet/Chimara

13 years agoFixed example program in documentation
P. F. Chimento [Sat, 13 Nov 2010 00:07:17 +0000 (01:07 +0100)]
Fixed example program in documentation

The example program in ChimaraGlk's documentation had a bug in it.

13 years agoFixed package building on Debian
Philip Chimento [Wed, 10 Nov 2010 19:32:29 +0000 (20:32 +0100)]
Fixed package building on Debian
The chimara-player.install file was misnamed, and I also added a
.gitignore file for the debian/ directory.

13 years agoRemoved old debug message
P. F. Chimento [Wed, 3 Nov 2010 20:31:06 +0000 (21:31 +0100)]
Removed old debug message

13 years agoDon't refer to 'macstyle.css' anymore
P. F. Chimento [Wed, 3 Nov 2010 20:15:30 +0000 (21:15 +0100)]
Don't refer to 'macstyle.css' anymore

We want the default style file to be style.css

13 years agoAdd index to documentation
P. F. Chimento [Wed, 3 Nov 2010 20:14:45 +0000 (21:14 +0100)]
Add index to documentation

I found out that gtk-doc can automatically generate a symbols index for
the documentation. Of course we want that!

13 years agoFixed gtk-doc building for gtk-doc 1.14
P. F. Chimento [Wed, 3 Nov 2010 20:13:34 +0000 (21:13 +0100)]
Fixed gtk-doc building for gtk-doc 1.14

Added a <para> tag, the absence of which caused the documentation build
to fail.

13 years agoAdded xepdmgrclient.[ch] to player/
P. F. Chimento [Wed, 3 Nov 2010 20:11:41 +0000 (21:11 +0100)]
Added xepdmgrclient.[ch] to player/

Otherwise, 'make dist' fails, since not all the files necessary to make
all the possible targets are available.

13 years agoAdded .gitignore files
P. F. Chimento [Wed, 3 Nov 2010 20:08:10 +0000 (21:08 +0100)]
Added .gitignore files

13 years agoFixed ordering of the application of the styles
rodin [Tue, 5 Oct 2010 09:32:50 +0000 (09:32 +0000)]
Fixed ordering of the application of the styles

13 years agoDefined a base style
rodin [Wed, 30 Jun 2010 19:03:06 +0000 (19:03 +0000)]
Defined a base style

13 years agoShowing off dynamic styles: started work on preferences dialog.
rodin [Sun, 23 May 2010 10:48:12 +0000 (10:48 +0000)]
Showing off dynamic styles: started work on preferences dialog.
New appearance cannot be saved or loaded yet.

13 years agoFixing some pager bugs
rodin [Tue, 18 May 2010 14:41:29 +0000 (14:41 +0000)]
Fixing some pager bugs

13 years agoRemoved pager debugging output
rodin [Tue, 18 May 2010 14:09:02 +0000 (14:09 +0000)]
Removed pager debugging output

13 years agoAdded missing buffer flush.
rodin [Tue, 18 May 2010 14:05:28 +0000 (14:05 +0000)]
Added missing buffer flush.

13 years agoBackend support for using dynamic styles. See also Ticket #49.
rodin [Tue, 18 May 2010 13:59:27 +0000 (13:59 +0000)]
Backend support for using dynamic styles. See also Ticket #49.

14 years agoImprovements to the iliad client
rodin [Tue, 11 May 2010 12:06:33 +0000 (12:06 +0000)]
Improvements to the iliad client

14 years agoAdded an icon (Based on a Google image search)
rodin [Tue, 11 May 2010 11:58:36 +0000 (11:58 +0000)]
Added an icon (Based on a Google image search)

14 years agoSome minor cleanup
rodin [Tue, 11 May 2010 10:31:01 +0000 (10:31 +0000)]
Some minor cleanup

14 years agoMore pager improvements. Pager now determines correctly which text is read by the...
rodin [Tue, 11 May 2010 10:30:07 +0000 (10:30 +0000)]
More pager improvements. Pager now determines correctly which text is read by the user and which is not. Pager will automatically scroll past read text.

14 years agoPaging is slowly becoming better, but still susceptible to race conditions
rodin [Tue, 11 May 2010 00:27:59 +0000 (00:27 +0000)]
Paging is slowly becoming better, but still susceptible to race conditions

14 years agoPlaced pager functionality into the idle handler
rodin [Mon, 10 May 2010 20:21:26 +0000 (20:21 +0000)]
Placed pager functionality into the idle handler

14 years agoFixed segfault when requesting non-existant parent window
rodin [Wed, 5 May 2010 13:47:14 +0000 (13:47 +0000)]
Fixed segfault when requesting non-existant parent window

14 years agoDeleted unnecessary code
rodin [Wed, 5 May 2010 12:24:28 +0000 (12:24 +0000)]
Deleted unnecessary code

14 years agoWhen copying default styles to current styles, also take the pager layout into account.
rodin [Wed, 5 May 2010 12:22:46 +0000 (12:22 +0000)]
When copying default styles to current styles, also take the pager layout into account.

14 years agoFixed invalid cast in garglk_set_reversevideo()
rodin [Wed, 5 May 2010 12:06:01 +0000 (12:06 +0000)]
Fixed invalid cast in garglk_set_reversevideo()

14 years agoAuth test 2
rodin [Tue, 4 May 2010 15:32:28 +0000 (15:32 +0000)]
Auth test 2

14 years agoAuth test
rodin [Tue, 4 May 2010 15:32:07 +0000 (15:32 +0000)]
Auth test