Commit e6928592 authored by David Bruce's avatar David Bruce

move of SDL_ttf and SDL_Pango-specific code into SDL_extras.c/h - in progress



git-svn-id: svn://svn.debian.org/svn/tux4kids/tuxtype/trunk@920 47d30e19-490b-0410-9d18-e851f4e465b3
parent d3bfff2d
......@@ -37,8 +37,8 @@ target_triplet = @target@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/tuxtype.spec.in $(top_srcdir)/configure \
$(top_srcdir)/intl/Makefile.in \
$(srcdir)/tuxtype.spec.in $(srcdir)/tuxtype_preview.spec.in \
$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
$(top_srcdir)/nsis/tuxtype.nsi.in ABOUT-NLS AUTHORS COPYING \
ChangeLog INSTALL TODO config.guess config.rpath config.sub \
depcomp install-sh missing mkinstalldirs
......@@ -66,7 +66,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = tuxtype.spec intl/Makefile nsis/tuxtype.nsi
CONFIG_CLEAN_FILES = tuxtype.spec tuxtype_preview.spec intl/Makefile \
nsis/tuxtype.nsi
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
......@@ -315,6 +316,8 @@ distclean-hdr:
-rm -f config.h stamp-h1
tuxtype.spec: $(top_builddir)/config.status $(srcdir)/tuxtype.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
tuxtype_preview.spec: $(top_builddir)/config.status $(srcdir)/tuxtype_preview.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
nsis/tuxtype.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxtype.nsi.in
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.4.preview.
# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.4.
#
# Report bugs to <tux4kids-tuxtype-dev@lists.alioth.debian.org>.
#
......@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Tux Typing'
PACKAGE_TARNAME='tuxtype'
PACKAGE_VERSION='1.7.4.preview'
PACKAGE_STRING='Tux Typing 1.7.4.preview'
PACKAGE_VERSION='1.7.4'
PACKAGE_STRING='Tux Typing 1.7.4'
PACKAGE_BUGREPORT='tux4kids-tuxtype-dev@lists.alioth.debian.org'
ac_unique_file="src/playgame.c"
......@@ -1286,7 +1286,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Tux Typing 1.7.4.preview to adapt to many kinds of systems.
\`configure' configures Tux Typing 1.7.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1357,7 +1357,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Tux Typing 1.7.4.preview:";;
short | recursive ) echo "Configuration of Tux Typing 1.7.4:";;
esac
cat <<\_ACEOF
......@@ -1469,7 +1469,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Tux Typing configure 1.7.4.preview
Tux Typing configure 1.7.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1483,7 +1483,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Tux Typing $as_me 1.7.4.preview, which was
It was created by Tux Typing $as_me 1.7.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2307,7 +2307,7 @@ fi
# Define the identity of the package.
PACKAGE='tuxtype'
VERSION='1.7.4.preview'
VERSION='1.7.4'
cat >>confdefs.h <<_ACEOF
......@@ -17754,7 +17754,7 @@ fi
# Create Makefiles
# ---------------------------------------------------------------
ac_config_files="$ac_config_files Makefile tuxtype.spec data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/hands/Makefile data/images/icons/Makefile data/images/keyboard/Makefile data/images/menu/Makefile data/images/status/Makefile data/images/tux/Makefile data/scripts/Makefile data/sounds/Makefile data/themes/Makefile data/themes/armenian/Makefile data/themes/armenian/images/Makefile data/themes/assamese/Makefile data/themes/assamese/words/Makefile data/themes/bokmal/Makefile data/themes/bokmal/words/Makefile data/themes/bokmal/images/Makefile data/themes/bokmal/images/status/Makefile data/themes/brazilian-portuguese/Makefile data/themes/brazilian-portuguese/images/Makefile data/themes/brazilian-portuguese/words/Makefile data/themes/catalan/Makefile data/themes/catalan/words/Makefile data/themes/czech/Makefile data/themes/czech/words/Makefile data/themes/dansk/Makefile data/themes/dansk/sounds/Makefile data/themes/dansk/words/Makefile data/themes/deutsch/Makefile data/themes/deutsch/words/Makefile data/themes/espanol/Makefile data/themes/espanol/images/Makefile data/themes/espanol/words/Makefile data/themes/euskara/Makefile data/themes/euskara/images/Makefile data/themes/euskara/words/Makefile data/themes/french/Makefile data/themes/french/words/Makefile data/themes/greek/Makefile data/themes/greek/words/Makefile data/themes/gujarati/Makefile data/themes/gujarati/words/Makefile data/themes/hindi/Makefile data/themes/hindi/words/Makefile data/themes/italian/Makefile data/themes/italian/images/Makefile data/themes/italian/words/Makefile data/themes/jamaican/Makefile data/themes/jamaican/images/Makefile data/themes/jamaican/words/Makefile data/themes/kannada/Makefile data/themes/kannada/words/Makefile data/themes/lithuanian/Makefile data/themes/lithuanian/images/Makefile data/themes/lithuanian/images/status/Makefile data/themes/lithuanian/sounds/Makefile data/themes/lithuanian/words/Makefile data/themes/malayalam/Makefile data/themes/malayalam/images/Makefile data/themes/malayalam/images/status/Makefile data/themes/malayalam/images/keyboard/Makefile data/themes/malayalam/scripts/Makefile data/themes/malayalam/words/Makefile data/themes/nederlands/Makefile data/themes/nederlands/words/Makefile data/themes/nepali/Makefile data/themes/nepali/words/Makefile data/themes/nynorsk/Makefile data/themes/nynorsk/images/Makefile data/themes/nynorsk/images/status/Makefile data/themes/nynorsk/words/Makefile data/themes/oriya/Makefile data/themes/oriya/words/Makefile data/themes/punjabi/Makefile data/themes/punjabi/words/Makefile data/themes/russian/Makefile data/themes/russian/images/Makefile data/themes/russian/images/status/Makefile data/themes/russian/words/Makefile data/themes/svenska/Makefile data/themes/svenska/words/Makefile data/themes/swahili/Makefile data/themes/swahili/words/Makefile data/themes/tamil/Makefile data/themes/tamil/words/Makefile data/themes/telugu/Makefile data/themes/telugu/words/Makefile data/themes/wolof/Makefile data/themes/wolof/images/Makefile data/themes/wolof/words/Makefile data/words/Makefile doc/Makefile doc/en/Makefile intl/Makefile po/Makefile.in nsis/tuxtype.nsi src/Makefile"
ac_config_files="$ac_config_files Makefile tuxtype.spec tuxtype_preview.spec data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/hands/Makefile data/images/icons/Makefile data/images/keyboard/Makefile data/images/menu/Makefile data/images/status/Makefile data/images/tux/Makefile data/scripts/Makefile data/sounds/Makefile data/themes/Makefile data/themes/armenian/Makefile data/themes/armenian/images/Makefile data/themes/assamese/Makefile data/themes/assamese/words/Makefile data/themes/bokmal/Makefile data/themes/bokmal/words/Makefile data/themes/bokmal/images/Makefile data/themes/bokmal/images/status/Makefile data/themes/brazilian-portuguese/Makefile data/themes/brazilian-portuguese/images/Makefile data/themes/brazilian-portuguese/words/Makefile data/themes/catalan/Makefile data/themes/catalan/words/Makefile data/themes/czech/Makefile data/themes/czech/words/Makefile data/themes/dansk/Makefile data/themes/dansk/sounds/Makefile data/themes/dansk/words/Makefile data/themes/deutsch/Makefile data/themes/deutsch/words/Makefile data/themes/espanol/Makefile data/themes/espanol/images/Makefile data/themes/espanol/words/Makefile data/themes/euskara/Makefile data/themes/euskara/images/Makefile data/themes/euskara/words/Makefile data/themes/french/Makefile data/themes/french/words/Makefile data/themes/greek/Makefile data/themes/greek/words/Makefile data/themes/gujarati/Makefile data/themes/gujarati/words/Makefile data/themes/hindi/Makefile data/themes/hindi/words/Makefile data/themes/italian/Makefile data/themes/italian/images/Makefile data/themes/italian/words/Makefile data/themes/jamaican/Makefile data/themes/jamaican/images/Makefile data/themes/jamaican/words/Makefile data/themes/kannada/Makefile data/themes/kannada/words/Makefile data/themes/lithuanian/Makefile data/themes/lithuanian/images/Makefile data/themes/lithuanian/images/status/Makefile data/themes/lithuanian/sounds/Makefile data/themes/lithuanian/words/Makefile data/themes/malayalam/Makefile data/themes/malayalam/images/Makefile data/themes/malayalam/images/status/Makefile data/themes/malayalam/images/keyboard/Makefile data/themes/malayalam/scripts/Makefile data/themes/malayalam/words/Makefile data/themes/nederlands/Makefile data/themes/nederlands/words/Makefile data/themes/nepali/Makefile data/themes/nepali/words/Makefile data/themes/nynorsk/Makefile data/themes/nynorsk/images/Makefile data/themes/nynorsk/images/status/Makefile data/themes/nynorsk/words/Makefile data/themes/oriya/Makefile data/themes/oriya/words/Makefile data/themes/punjabi/Makefile data/themes/punjabi/words/Makefile data/themes/russian/Makefile data/themes/russian/images/Makefile data/themes/russian/images/status/Makefile data/themes/russian/words/Makefile data/themes/svenska/Makefile data/themes/svenska/words/Makefile data/themes/swahili/Makefile data/themes/swahili/words/Makefile data/themes/tamil/Makefile data/themes/tamil/words/Makefile data/themes/telugu/Makefile data/themes/telugu/words/Makefile data/themes/wolof/Makefile data/themes/wolof/images/Makefile data/themes/wolof/words/Makefile data/words/Makefile doc/Makefile doc/en/Makefile intl/Makefile po/Makefile.in nsis/tuxtype.nsi src/Makefile"
##tuxtype.spec])
......@@ -18189,7 +18189,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Tux Typing $as_me 1.7.4.preview, which was
This file was extended by Tux Typing $as_me 1.7.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18242,7 +18242,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
Tux Typing config.status 1.7.4.preview
Tux Typing config.status 1.7.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......@@ -18368,6 +18368,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"tuxtype.spec") CONFIG_FILES="$CONFIG_FILES tuxtype.spec" ;;
"tuxtype_preview.spec") CONFIG_FILES="$CONFIG_FILES tuxtype_preview.spec" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES data/fonts/Makefile" ;;
"data/images/Makefile") CONFIG_FILES="$CONFIG_FILES data/images/Makefile" ;;
......
# Process this file with autoconf to produce a configure script.
AC_INIT([Tux Typing],[1.7.4.preview],[tux4kids-tuxtype-dev@lists.alioth.debian.org],[tuxtype])
AC_INIT([Tux Typing],[1.7.4],[tux4kids-tuxtype-dev@lists.alioth.debian.org],[tuxtype])
AC_CONFIG_SRCDIR([src/playgame.c])
AC_PREREQ(2.61)
......@@ -193,6 +193,7 @@ AC_PATH_PROG(NSIS, makensis, [], [$PATH])
AC_CONFIG_FILES([Makefile
tuxtype.spec
tuxtype_preview.spec
data/Makefile
data/fonts/Makefile
data/images/Makefile
......
-Clean up this TODO and reflect the current status!
Updated 03 Mar 2009
-Replace the five remaining files which are non-free accoring to
Debians Free Software Guidelines with free ones. click.wav and
kmus(1-4).wav are only free for non-commercial use.
-check that SVN is free of generated files. create release-script,
keep release tarballs (after augen.sh is run) in SVN?
-Test it under MacOSX and windows
-make the code use UTF8 internally
-fix the font handling issues
-Clean up code! (Someone beat it severely with the "oogly stick"!)
o SOUND: I think the way laser.c handles sound playing should
be adopted by the rest of the app (via a function so we don't have
all these "if (sys_sound)" all over the place
--- MAKE THE RUN SOUND NOT HAPPEN IF IT DOESN'T NEED TO!!!
& STOP IT ONCE IT IS DONE!
Briefly, here is what we are thinking of for GSoC 2009:
o COMET ZAP: clean up the way text is generated... right now
it is being generated every time! -- plus maybe switch to the
AA text
Tuxtype:
- svg support
- sound support for text (have program pronounce words to be typed)
- improved font handling
- addition of user-specific search path for word and phrase lists, so people can add their own content more readily.
- config/admin tool using gui toolkit (e.g. Qt4 but could be something else)
--- idea: once the player gets "done" with a wave, they can
continue playing on the wave until they are ready
to move on. They do so by hitting a key
(ENTER/SPACE ??) which causes TUX to destroy all
comets at once!
o OBJECTs: ClearObject, EraseObject, ... needs to be reworked.
while these are "objects", I think we should retitle these
sprites, as clearobject, eraseobject does not do what one
might think (removing from memory)... Plus we can probably
simplify the "realeraseobject" vs. "eraseobject"
Tuxmath:
- svg support
- improved font handling
- config/admin tool using gui toolkit (e.g. Qt4 but could be something else)
- LAN multiplayer mode - need refactoring into client/server architecture (could be applied to tuxtype also).
o LOCALE: gettext & locales... enough said
As you can see, the ideas are similar for both programs.
o MAKE STUFF: Cal is working on it for *nix. We need to make
sure we can build for others (win, mac).
Apart from GSoC, both programs need ongoing code cleanup, especially tuxtype. Also, tuxtype could benefit greatly at this point from a refresh of things other than the C code itself - high-resolution backgrounds, completion of rest of menu sprite icons, more word lists and phrase files, etc.
o THEMES: after gettext is set up, a way to specify font,
fontsize, and other graphical options for the theme...
(on top of the already supported images)
--- Currently when we are loading a image, it will first
search through all the theme paths, and then it will
search through all the default paths, which is nice
except when the theme has "icons" for the menu. Then
the program will try to load as many icons and since
a theme may use fewer images than the default images,
the theme will have EXTRA frames that shouldn't be
included!
o INPUT: can TT2 determine if the user presses "fancy" latin
characters such as n~, ... I don't know... a way to test
exists now though :)
o TRANSLATION: once we have gettext working, TT2 will be less
of a moving target for translators...
o Tux Recommend: add tux giving friendly reminders about proper
hand location, erogomics, ...
The following is a mail with a list of ideas, this is not really a todo (yet).
-Replace the five remaining files which are non-free accoring to
Debians Free Software Guidelines with free ones. click.wav and
kmus(1-4).wav are only free for non-commercial use.
From: Steve McCuen <smccuen.tux@gmail.com>
To: tuxmath-devel@lists.sourceforge.net
Date: Wed, 16 May 2007 20:25:15 -0700
Message-Id: <1179372315.31920.15.camel@mccuen01.mccuenlabs.net>
Subject: [Tuxmath-devel] tuxtype: feature request list, for comment
-check that SVN is free of generated files. create release-script,
This is the list of requests that came from students using tuxtype. In
looking at the list, some are very possible to do.
* More kinds of games
* Some suggested maybe a racing game
* Some suggested pinball typing the right letters would make the
flippers work
* Space wars, and battle games with space ships
* Different background music
* Different colors
* Different backgrounds
* Practice typing letter groups (finger exercises like Mavis)
* In fish arcade, when you type the letter it highlights in Red, which
is hard to see.
* Too much repetition within the games there are
* More short words, and generally more variety in words and letters
* High score list
* More diversity in difficulty, not just speeding up
* Bonus points, and get more weapons, and rebuild cities
* More then just comets that come down
* Younger grades suggested the following:
* Fish Cascade to go slower
* Say the letter as they come down
* Not only saying the words, make the words tell a story
* Stops when you miss a letter and gives you a chance to get it right.
* More levels in Fish Cascade and Comet Zap
* Ability to choose whether one comet will destroy a city, or several
* Levels to be longer and harder before switching
* In Space Cadet, get points for hitting target, and takes away if you
miss, and if a city is destroyed it doesn't take away points.
* More shields
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-22 12:36+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan@redhat.com>\n"
"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2007-11-10 16:36+0100\n"
"Last-Translator: JardaK <krejci@zstenis.com>\n"
"Language-Team: czech <cs@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2003-05-08 17:58+0200\n"
"Last-Translator: Nikolai Beier <beier@ofir.dk>\n"
"Language-Team: Danish\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2003-06-14 19:00+0000\n"
"Last-Translator: Andreas Ramm <ace1@gmx.net>\n"
"Language-Team: German\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: tuxtype 1.7.4.preview\n"
"Project-Id-Version: tuxtype 1.7.4\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"PO-Revision-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2009-02-23 08:14-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
......
......@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: tuxtype 1.7.4.preview\n"
"Project-Id-Version: tuxtype 1.7.4\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"PO-Revision-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2009-02-23 08:14-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2007-09-16 19:00+0000\n"
"Last-Translator: Amaya Rodrigo <amaya@debian.org>\n"
"Language-Team: Spanish\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2009-02-04 14:55+0100\n"
"Last-Translator: Loïc Martin <loic.martin3@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-28 16:17+0530\n"
"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
"Language-Team: Gujarati\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-28 16:08+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
"Language-Team: Hindi <hindi.sf.net>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-27 13:58+0530\n"
"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
"Language-Team: Kannada <en@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas@ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
......
No preview for this file type
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2005-10-20 21:24+0200\n"
"Last-Translator: Trond Mæhlum <trondm@skolelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2005-02-12 13:13+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-27 17:56+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
"Language-Team: Oriya\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2007-02-07 16:08+0000\n"
"Last-Translator: Hudson G M Figueredo <kynder@pquilinux.org>\n"
"Language-Team: <pt@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype2\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-12-02 19:51+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-22 12:41+0530\n"
"Last-Translator: Felix I <ifelix25@gmail.com>, 2008\n"
"Language-Team: <en@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-08-28 17:58+0530\n"
"Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
"Language-Team: Telugu <en@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2008-12-11 15:08+0200\n"
"Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
......
......@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: tuxtype 1.7.4.preview\n"
"Project-Id-Version: tuxtype 1.7.4\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-02-20 13:01-0600\n"
"POT-Creation-Date: 2009-02-23 08:14-0600\n"
"PO-Revision-Date: 2007-09-25 09:50-0000\n"
"Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet@anafa."
"org>\n"
......
This diff is collapsed.
......@@ -49,11 +49,16 @@ void ResetDPI(void);
/* These functions are the only code in the program that directly use SDL_Pango */
/* If SDL_Pango not available, they fall back to SDL_ttf or do nothing, */
/* as appropriate. */
SDL_Surface* BlackOutline(const char *t, const TTF_Font* font, const SDL_Color* c);
SDL_Surface* BlackOutline_Unicode(const Uint16* t, const TTF_Font* font, const SDL_Color* c);
SDL_Surface* BlackOutline_w(const wchar_t* t, const TTF_Font* font, const SDL_Color* c, int size);
void init_SDLPango_Context();
void free_SDLPango_Context();
SDL_Surface* BlackOutline(const char* t, int font_size, const SDL_Color* c);
SDL_Surface* BlackOutline_w(const wchar_t* t, int font_size, const SDL_Color* c, int length);
void reset_DPI_SDLPango_Context(float dpi_x, float dpi_y);
/*Text rendering functions: */
int Setup_SDL_Text(void);
void Cleanup_SDL_Text(void);
//SDL_Surface* BlackOutline(const char* t, int size, SDL_Color* c);
//SDL_Surface* SimpleText(const char *t, int size, SDL_Color* col);
//SDL_Surface* SimpleTextWithOffset(const char *t, int size, SDL_Color* col, int *glyph_offset);
#endif
......@@ -613,17 +613,11 @@ int GenerateWordList(const char* wordFn)
/* This version creates the letters using TTF_RenderUNICODE_Blended */
int RenderLetters(const TTF_Font* letter_font)
int RenderLetters(int font_size)
{
Uint16 t[2];
wchar_t t[2];
int i, j; /* i is chars attempted, j is chars actually rendered. */
if (!letter_font)
{
fprintf(stderr, "RenderLetters() - invalid TTF_Font* argument!\n");
return 0;
}
i = j = num_chars_used = 0;
t[1] = '\0';
......@@ -640,8 +634,8 @@ int RenderLetters(const TTF_Font* letter_font)
}
char_glyphs[j].unicode_value = t[0];
char_glyphs[j].white_glyph = BlackOutline_Unicode(t, letter_font, &white);
char_glyphs[j].red_glyph = BlackOutline_Unicode(t, letter_font, &red);
char_glyphs[j].white_glyph = BlackOutline_w(t, font_size, &white, 1);
char_glyphs[j].red_glyph = BlackOutline_w(t, font_size, &red, 1);
j++;
num_chars_used++;
......
......@@ -39,7 +39,7 @@ SDL_Surface* GetWhiteGlyph(wchar_t t);
SDL_Surface* GetRedGlyph(wchar_t t);
int LoadKeyboard(void);
int GetFinger(int i);
int RenderLetters(const TTF_Font* letter_font);
int RenderLetters(int font_size);
int GetIndex(wchar_t uni_char);
void GetKeyShift(int index, char *buf);
int GetShift(int i);
......
......@@ -116,8 +116,10 @@ typedef struct game_option_type{
/* Default values for game_option_type struct */
/* They can be changed in the struct to other values at run-time */
#define DEFAULT_MENU_FONT "AndikaDesRevG.ttf"
#define DEFAULT_FONT_NAME "AndikaDesRevG.ttf"
#define DEFAULT_GAME_FONT "AndikaDesRevG.ttf"
#define DEFAULT_MENU_FONT_SIZE 20
#define GAME_FONT_SIZE 20
#define DEFAULT_LOCALE "en_US.UTF-8"
#define DEFAULT_USE_ENGLISH 1
#define DEFAULT_FULLSCREEN 1
......@@ -177,8 +179,6 @@ typedef struct {
#define MENU_FONT_SIZE 20
#define GAME_FONT_SIZE 20
/* Limits on word list size, word length, and on the number of distinct characters */
/* that can be present within a word list: */
......
......@@ -38,7 +38,6 @@ static sprite* shield = NULL;
static SDL_Surface* images[NUM_IMAGES] = {NULL};
static Mix_Chunk* sounds[NUM_SOUNDS] = {NULL};
static Mix_Music* musics[NUM_MUSICS] = {NULL};
static TTF_Font* font = NULL;
static int wave, speed, score, pre_wave_score, num_attackers, distanceMoved;
static wchar_t ans[NUM_ANS];
......@@ -706,8 +705,7 @@ static void laser_load_data(void)
/* Create the SDL_Surfaces for all of the characters */
/* used in the word list: */
font = LoadFont(settings.theme_font_name, COMET_ZAP_FONT_SIZE);
RenderLetters(font);
RenderLetters(COMET_ZAP_FONT_SIZE);
/* Load images: */
for (i = 0; i < NUM_IMAGES; i++)
......@@ -744,11 +742,6 @@ static void laser_unload_data(void) {
FreeSprite(shield);
shield = NULL;
// PauseUnloadMedia();
TTF_CloseFont(font);
font = NULL;
}
......
......@@ -169,11 +169,11 @@ TTF_Font* LoadFont(const char* font_name, int font_size )
/* We could not find desired font. If we were looking for something other */
/* than default (Andika) font, print warning and try to load default font: */
if (strncmp(font_name, DEFAULT_MENU_FONT, FNLEN ) != 0)
if (strncmp(font_name, DEFAULT_FONT_NAME, FNLEN ) != 0)
{
fprintf(stderr, "Warning - could not load desired font: %s\n", font_name);
fprintf(stderr, "Trying to load default instead: %s\n", DEFAULT_MENU_FONT);
return LoadFont(DEFAULT_MENU_FONT, font_size);
fprintf(stderr, "Trying to load default instead: %s\n", DEFAULT_FONT_NAME);
return LoadFont(DEFAULT_FONT_NAME, font_size);
}
else /* Default failed also - bummer! */
{
......
......@@ -161,10 +161,6 @@ int main(int argc, char *argv[])
LibInit(lib_flags); /* calls SDL_Init(), TTF_Init(), some other settings */
GraphicsInit(); /* calls SDL_SetVideoMode(), a few others */
/* Initialize SDL_Pango, if we are using it. Note that our wrapper function */
/* being called here is just a no-op if SDL_Pango not enabled. */
init_SDLPango_Context();
if (settings.sys_sound)
{
Mix_VolumeMusic(settings.mus_volume);
......
......@@ -31,7 +31,7 @@ game_option_type settings;
/* Simply stick all the default values into the settings struct: */
void Opts_Initialize(void)