[Tux4kids-commits] r189 - in tuxtype/branches/tuxtype-indic: . tuxtype tuxtype/data tuxtype/data/fonts tuxtype/data/themes
mobin-guest at alioth.debian.org
mobin-guest at alioth.debian.org
Wed Jul 18 20:37:16 UTC 2007
Author: mobin-guest
Date: 2007-07-18 20:37:16 +0000 (Wed, 18 Jul 2007)
New Revision: 189
Modified:
tuxtype/branches/tuxtype-indic/Makefile
tuxtype/branches/tuxtype-indic/config.status
tuxtype/branches/tuxtype-indic/configure
tuxtype/branches/tuxtype-indic/configure.ac
tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c
tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile
tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.am
tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/keyboard.lst
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.am
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/globals.h
tuxtype/branches/tuxtype-indic/tuxtype/laser.c
tuxtype/branches/tuxtype-indic/tuxtype/loaders.c
tuxtype/branches/tuxtype-indic/tuxtype/playgame.c
tuxtype/branches/tuxtype-indic/tuxtype/practice.c
tuxtype/branches/tuxtype-indic/tuxtype/setup.c
tuxtype/branches/tuxtype-indic/tuxtype/theme.c
Log:
Enabled Malayalam Language support and Pango
Modified: tuxtype/branches/tuxtype-indic/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/Makefile 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/Makefile 2007-07-18 20:37:16 UTC (rev 189)
@@ -29,9 +29,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -74,17 +74,17 @@
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
-AWK = mawk
-CC = i586-mingw32msvc-gcc
+ACLOCAL = ${SHELL} /root/Desktop/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /root/Desktop/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/Desktop/tuxtype-indic/missing --run automake-1.10
+AWK = gawk
+CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -92,70 +92,70 @@
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT =
GREP = /bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS =
LIBOBJS =
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDLPango -lSDL_mixer
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/Desktop/tuxtype-indic/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
-NSIS = /usr/bin/makensis
-NSI_DLL_DIR = /home/dbruce/tuxtype_dll
+NSIS = no
+NSI_DLL_DIR = /root/tuxtype_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxtype
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
PATH_SEPARATOR = :
SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SET_MAKE =
SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC =
+STRIP =
+VERSION = 1.5.10
+WINDRES =
+abs_builddir = /root/Desktop/tuxtype-indic
+abs_srcdir = /root/Desktop/tuxtype-indic
+abs_top_builddir = /root/Desktop/tuxtype-indic
+abs_top_srcdir = /root/Desktop/tuxtype-indic
+ac_ct_CC = gcc
am__include = include
am__leading_dot = .
am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias =
+build_cpu = x86_64
build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias =
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /root/Desktop/tuxtype-indic/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -164,23 +164,23 @@
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias =
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
top_builddir = .
top_srcdir = .
# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
-MAKENSIS = /usr/bin/makensis
+MAKENSIS = no
SUBDIRS = tuxtype
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
Modified: tuxtype/branches/tuxtype-indic/config.status
===================================================================
--- tuxtype/branches/tuxtype-indic/config.status 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/config.status 2007-07-18 20:37:16 UTC (rev 189)
@@ -301,7 +301,7 @@
"
# Files that config.status was made for.
-config_files=" Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec nsis/tuxtype.nsi"
+config_files=" Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec nsis/tuxtype.nsi"
config_headers=" config.h"
config_commands=" depfiles"
@@ -334,14 +334,14 @@
ac_cs_version="\
tuxtype config.status 1.5.9
-configured by configure, generated by GNU Autoconf 2.61,
- with options \"'--cache-file=cross-config.cache' '--target=i586-mingw32msvc' '--host=i586-mingw32msvc' '--build=i386-linux' '--prefix=/usr/local/cross-tools/i586-mingw32msvc' '--with-sdl-prefix' 'build_alias=i386-linux' 'host_alias=i586-mingw32msvc' 'target_alias=i586-mingw32msvc' 'LDFLAGS=-L/usr/local/cross-tools/i586-mingw32msvc/lib' 'CPPFLAGS=-I/usr/local/cross-tools/i586-mingw32msvc/include'\"
+configured by ./configure, generated by GNU Autoconf 2.61,
+ with options \"--prefix /usr/local\"
Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/home/dbruce/tux4kids/tuxtype/trunk'
+ac_pwd='/root/Desktop/tuxtype-indic'
srcdir='.'
INSTALL='/usr/bin/install -c'
MKDIR_P='/bin/mkdir -p'
@@ -410,10 +410,10 @@
fi
if $ac_cs_recheck; then
- echo "running CONFIG_SHELL=/bin/sh /bin/sh configure " '--cache-file=cross-config.cache' '--target=i586-mingw32msvc' '--host=i586-mingw32msvc' '--build=i386-linux' '--prefix=/usr/local/cross-tools/i586-mingw32msvc' '--with-sdl-prefix' 'build_alias=i386-linux' 'host_alias=i586-mingw32msvc' 'target_alias=i586-mingw32msvc' 'LDFLAGS=-L/usr/local/cross-tools/i586-mingw32msvc/lib' 'CPPFLAGS=-I/usr/local/cross-tools/i586-mingw32msvc/include' $ac_configure_extra_args " --no-create --no-recursion" >&6
+ echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " --prefix /usr/local $ac_configure_extra_args " --no-create --no-recursion" >&6
CONFIG_SHELL=/bin/sh
export CONFIG_SHELL
- exec /bin/sh "configure" '--cache-file=cross-config.cache' '--target=i586-mingw32msvc' '--host=i586-mingw32msvc' '--build=i386-linux' '--prefix=/usr/local/cross-tools/i586-mingw32msvc' '--with-sdl-prefix' 'build_alias=i386-linux' 'host_alias=i586-mingw32msvc' 'target_alias=i586-mingw32msvc' 'LDFLAGS=-L/usr/local/cross-tools/i586-mingw32msvc/lib' 'CPPFLAGS=-I/usr/local/cross-tools/i586-mingw32msvc/include' $ac_configure_extra_args --no-create --no-recursion
+ exec /bin/sh "./configure" --prefix /usr/local $ac_configure_extra_args --no-create --no-recursion
fi
exec 5>>config.log
@@ -489,6 +489,12 @@
"tuxtype/data/themes/lithuanian/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/images/status/Makefile" ;;
"tuxtype/data/themes/lithuanian/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/sounds/Makefile" ;;
"tuxtype/data/themes/lithuanian/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/words/Makefile" ;;
+
+ "tuxtype/data/themes/malayalam/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/Makefile" ;;
+ "tuxtype/data/themes/malayalam/images/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/Makefile" ;;
+ "tuxtype/data/themes/malayalam/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/status/Makefile" ;;
+ "tuxtype/data/themes/malayalam/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/words/Makefile" ;;
+
"tuxtype/data/themes/nederlands/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/Makefile" ;;
"tuxtype/data/themes/nederlands/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/words/Makefile" ;;
"tuxtype/data/themes/nynorsk/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nynorsk/Makefile" ;;
@@ -573,8 +579,8 @@
s, at PACKAGE_STRING@,|#_!!_#|tuxtype 1.5.9,g
s, at PACKAGE_BUGREPORT@,|#_!!_#|tuxmath-devel@|#_!!_#|lists.sourceforge.net,g
s, at exec_prefix@,|#_!!_#|${prefix},g
-s, at prefix@,|#_!!_#|/usr/local/cross-tools/i586-mingw32msvc,g
-s, at program_transform_name@,|#_!!_#|s\&^\&i586-mingw32msvc-\&,g
+s, at prefix@,|#_!!_#|/usr/local,g
+s, at program_transform_name@,|#_!!_#|s\,x\,x\,,g
s, at bindir@,|#_!!_#|${exec_prefix}/bin,g
s, at sbindir@,|#_!!_#|${exec_prefix}/sbin,g
s, at libexecdir@,|#_!!_#|${exec_prefix}/libexec,g
@@ -598,22 +604,22 @@
s, at ECHO_C@,|#_!!_#|,g
s, at ECHO_N@,|#_!!_#|-n,g
s, at ECHO_T@,|#_!!_#|,g
-s, at LIBS@,|#_!!_#|-lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lgw32c -luuid -lole32 -lwsock32 -mwindows,g
-s, at build_alias@,|#_!!_#|i386-linux,g
-s, at host_alias@,|#_!!_#|i586-mingw32msvc,g
-s, at target_alias@,|#_!!_#|i586-mingw32msvc,g
-s, at build@,|#_!!_#|i386-pc-linux-gnu,g
-s, at build_cpu@,|#_!!_#|i386,g
-s, at build_vendor@,|#_!!_#|pc,g
+s, at LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer ,g
+s, at build_alias@,|#_!!_#|,g
+s, at host_alias@,|#_!!_#|,g
+s, at target_alias@,|#_!!_#|,g
+s, at build@,|#_!!_#|x86_64-unknown-linux-gnu,g
+s, at build_cpu@,|#_!!_#|x86_64,g
+s, at build_vendor@,|#_!!_#|unknown,g
s, at build_os@,|#_!!_#|linux-gnu,g
-s, at host@,|#_!!_#|i586-pc-mingw32msvc,g
-s, at host_cpu@,|#_!!_#|i586,g
-s, at host_vendor@,|#_!!_#|pc,g
-s, at host_os@,|#_!!_#|mingw32msvc,g
-s, at target@,|#_!!_#|i586-pc-mingw32msvc,g
-s, at target_cpu@,|#_!!_#|i586,g
-s, at target_vendor@,|#_!!_#|pc,g
-s, at target_os@,|#_!!_#|mingw32msvc,g
+s, at host@,|#_!!_#|x86_64-unknown-linux-gnu,g
+s, at host_cpu@,|#_!!_#|x86_64,g
+s, at host_vendor@,|#_!!_#|unknown,g
+s, at host_os@,|#_!!_#|linux-gnu,g
+s, at target@,|#_!!_#|x86_64-unknown-linux-gnu,g
+s, at target_cpu@,|#_!!_#|x86_64,g
+s, at target_vendor@,|#_!!_#|unknown,g
+s, at target_os@,|#_!!_#|linux-gnu,g
s, at INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g
s, at INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g
s, at INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g
@@ -621,27 +627,27 @@
s, at CYGPATH_W@,|#_!!_#|echo,g
s, at PACKAGE@,|#_!!_#|tuxtype,g
s, at VERSION@,|#_!!_#|1.5.9,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|$(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh,g
-s, at STRIP@,|#_!!_#|i586-mingw32msvc-strip,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /root/Desktop/tuxtype-indic/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /root/Desktop/tuxtype-indic/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /root/Desktop/tuxtype-indic/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /root/Desktop/tuxtype-indic/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /root/Desktop/tuxtype-indic/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /root/Desktop/tuxtype-indic/install-sh,g
+s, at STRIP@,|#_!!_#|,g
s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
s, at mkdir_p@,|#_!!_#|/bin/mkdir -p,g
-s, at AWK@,|#_!!_#|mawk,g
+s, at AWK@,|#_!!_#|gawk,g
s, at SET_MAKE@,|#_!!_#|,g
s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /root/Desktop/tuxtype-indic/missing --run tar,g
s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
-s, at CC@,|#_!!_#|i586-mingw32msvc-gcc,g
-s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__,g
-s, at LDFLAGS@,|#_!!_#|-L/usr/local/cross-tools/i586-mingw32msvc/lib,g
-s, at CPPFLAGS@,|#_!!_#|-I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\\"$(prefix)\\",g
-s, at ac_ct_CC@,|#_!!_#|,g
-s, at EXEEXT@,|#_!!_#|.exe,g
+s, at CC@,|#_!!_#|gcc,g
+s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
+s, at LDFLAGS@,|#_!!_#|,g
+s, at CPPFLAGS@,|#_!!_#| -DDATA_PREFIX=\\"$(prefix)\\",g
+s, at ac_ct_CC@,|#_!!_#|gcc,g
+s, at EXEEXT@,|#_!!_#|,g
s, at OBJEXT@,|#_!!_#|o,g
s, at DEPDIR@,|#_!!_#|.deps,g
s, at am__include@,|#_!!_#|include,g
@@ -656,10 +662,10 @@
s, at SDL_CONFIG@,|#_!!_#|/usr/bin/sdl-config,g
s, at SDL_CFLAGS@,|#_!!_#|-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
s, at SDL_LIBS@,|#_!!_#|-L/usr/lib -lSDL,g
-s, at BUILD_MINGW32_TRUE@,|#_!!_#|,g
-s, at BUILD_MINGW32_FALSE@,|#_!!_#|#,g
-s, at WINDRES@,|#_!!_#|/usr/bin/i586-mingw32msvc-windres,g
-s, at CPP@,|#_!!_#|i586-mingw32msvc-gcc -E,g
+s, at BUILD_MINGW32_TRUE@,|#_!!_#|#,g
+s, at BUILD_MINGW32_FALSE@,|#_!!_#|,g
+s, at WINDRES@,|#_!!_#|,g
+s, at CPP@,|#_!!_#|gcc -E,g
s, at GREP@,|#_!!_#|/bin/grep,g
s, at EGREP@,|#_!!_#|/bin/grep -E,g
CEOF
@@ -668,8 +674,8 @@
s, at NSI_INSTALL_DIR@,|#_!!_#|mingw32,g
s, at NSI_BUILD_TRUE@,|#_!!_#|,g
s, at NSI_BUILD_FALSE@,|#_!!_#|#,g
-s, at NSI_DLL_DIR@,|#_!!_#|/home/dbruce/tuxtype_dll,g
-s, at NSIS@,|#_!!_#|/usr/bin/makensis,g
+s, at NSI_DLL_DIR@,|#_!!_#|/root/tuxtype_dll,g
+s, at NSIS@,|#_!!_#|no,g
s, at LIBOBJS@,|#_!!_#|,g
s, at LTLIBOBJS@,|#_!!_#|,g
:end
@@ -939,7 +945,6 @@
s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_MIXER\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_TTF\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBSDL_IMAGE\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*BUILD_MINGW32\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*STDC_HEADERS\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_TYPES_H\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_STAT_H\)[ (].*,\1define\2 1 ,
Modified: tuxtype/branches/tuxtype-indic/configure
===================================================================
--- tuxtype/branches/tuxtype-indic/configure 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/configure 2007-07-18 20:37:16 UTC (rev 189)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tuxtype 1.5.9.
+# Generated by GNU Autoconf 2.61 for tuxtype 1.5.10.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='tuxtype'
PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.5.9'
-PACKAGE_STRING='tuxtype 1.5.9'
+PACKAGE_VERSION='1.5.10'
+PACKAGE_STRING='tuxtype 1.5.10'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="tuxtype/funcs.h"
@@ -1232,7 +1232,7 @@
# 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 tuxtype 1.5.9 to adapt to many kinds of systems.
+\`configure' configures tuxtype 1.5.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tuxtype 1.5.9:";;
+ short | recursive ) echo "Configuration of tuxtype 1.5.10:";;
esac
cat <<\_ACEOF
@@ -1397,7 +1397,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tuxtype configure 1.5.9
+tuxtype configure 1.5.10
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1411,7 +1411,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tuxtype $as_me 1.5.9, which was
+It was created by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2229,7 +2229,7 @@
# Define the identity of the package.
PACKAGE=tuxtype
- VERSION=1.5.9
+ VERSION=1.5.10
cat >>confdefs.h <<_ACEOF
@@ -4060,6 +4060,81 @@
fi
+{ echo "$as_me:$LINENO: checking for SDLPango_Init in -lSDL_Pango" >&5
+echo $ECHO_N "checking for SDLPango_Init in -lSDL_Pango... $ECHO_C" >&6; }
+if test "${ac_cv_lib_SDLPango_Init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSDL_Pango $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SDLPango_Init ();
+int
+main ()
+{
+return SDLPango_Init ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_SDLPango_Init=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_SDLPango_Init=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDLPango_Init" >&5
+echo "${ECHO_T}$ac_cv_lib_SDLPango_Init" >&6; }
+if test $ac_cv_lib_SDLPango_Init = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSDL_PANGO 1
+_ACEOF
+
+ LIBS="-lSDL_Pango $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: SDL_Pango not found http://www.libsdl.org/projects/SDL_Pango" >&5
+echo "$as_me: error: SDL_Pango not found http://www.libsdl.org/projects/SDL_Pango" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
{ echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6; }
if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then
@@ -5790,7 +5865,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tuxtype $as_me 1.5.9, which was
+This file was extended by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5843,7 +5918,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tuxtype config.status 1.5.9
+tuxtype config.status 1.5.10
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: tuxtype/branches/tuxtype-indic/configure.ac
===================================================================
--- tuxtype/branches/tuxtype-indic/configure.ac 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/configure.ac 2007-07-18 20:37:16 UTC (rev 189)
@@ -139,6 +139,10 @@
tuxtype/data/themes/lithuanian/images/status/Makefile
tuxtype/data/themes/lithuanian/sounds/Makefile
tuxtype/data/themes/lithuanian/words/Makefile
+tuxtype/data/themes/malayalam/Makefile
+tuxtype/data/themes/malayalam/images/Makefile
+tuxtype/data/themes/malayalam/images/status/Makefile
+tuxtype/data/themes/malayalam/words/Makefile
tuxtype/data/themes/nederlands/Makefile
tuxtype/data/themes/nederlands/words/Makefile
tuxtype/data/themes/nynorsk/Makefile
Modified: tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in 2007-07-18 20:37:16 UTC (rev 189)
@@ -242,9 +242,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/Makefile
+ $(AUTOMAKE) --foreign tuxtype/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -19,9 +19,17 @@
/* Needed to convert UTF-8 under Windows because we don't have glibc: */
#include "ConvertUTF.h"
+/* Needed to handle rendering issues */
+#include <SDL/SDL_Pango.h>
+
#include "globals.h"
#include "funcs.h"
+
+/* Create a context which contains Pango objects.*/
+SDLPango_Context *context;
+
+
/* the colors we use throughout the game */
SDL_Color black;
@@ -96,7 +104,7 @@
ALPHABET[(int)wide_str[j]] = 1; // first character is default
for (i++; i<wcslen(wide_str); i++)
- KEYMAP[(int)wide_str[i]] = wide_str[j];
+ wide_str[i] = wide_str[j];
/* set the fingers for this letter */
@@ -123,7 +131,27 @@
fprintf( stderr, "Error finding file for keyboard setup!\n" );
}
+/*Convert SDL_Colour to SDLPango_Matrix*/
+SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color *cl)
+{
+ SDLPango_Matrix *colour;
+ colour=malloc(sizeof(SDLPango_Matrix));
+ int k;
+ for(k=0;k<4;k++){
+ (*colour).m[0][k]=(*cl).r;
+ (*colour).m[1][k]=(*cl).g;
+ (*colour).m[2][k]=(*cl).b;
+ }
+ (*colour).m[3][0]=0;
+ (*colour).m[3][1]=255;
+ (*colour).m[3][2]=0;
+ (*colour).m[3][3]=0;
+
+ return colour;
+}
+
+
SDL_Surface* BlackOutline(const unsigned char *t, TTF_Font *font, const SDL_Color *c)
{
SDL_Surface* out = NULL;
@@ -133,14 +161,29 @@
SDL_Rect dstrect;
Uint32 color_key;
+ /* To covert SDL_Colour to SDLPango_Matrix */
+ SDLPango_Matrix *colour;
+
if (!t || !font || !c)
{
fprintf(stderr, "BlackOutline(): invalid ptr parameter, returning.");
return NULL;
}
- black_letters = TTF_RenderUTF8_Blended(font, t, black);
+ colour=SDL_Colour_to_SDLPango_Matrix(c);
+
+ /* Create the context */
+ context = SDLPango_CreateContext();
+ SDLPango_SetDpi(context, 125.0, 125.0);
+ /* Set the color */
+ SDLPango_SetDefaultColor(context, MATRIX_TRANSPARENT_BACK_BLACK_LETTER );
+ SDLPango_SetBaseDirection(context, SDLPANGO_DIRECTION_LTR);
+ /* Set text to context */
+ SDLPango_SetMarkup(context,t, -1);
+
+ black_letters = SDLPango_CreateSurfaceDraw(context);
+
if (!black_letters)
{
fprintf (stderr, "Warning - BlackOutline() could not create image for %s\n", t);
@@ -152,6 +195,10 @@
(black_letters->h) + 5,
32,
rmask, gmask, bmask, amask);
+
+ /* Draw text on a existing surface */
+ SDLPango_Draw(context, bg, 0, 0);
+
/* Use color key for eventual transparency: */
color_key = SDL_MapRGB(bg->format, 10, 10, 10);
SDL_FillRect(bg, NULL, color_key);
@@ -169,7 +216,8 @@
SDL_FreeSurface(black_letters);
/* --- Put the color version of the text on top! --- */
- white_letters = TTF_RenderUTF8_Blended(font, t, *c);
+ SDLPango_SetDefaultColor(context, colour);
+ white_letters = SDLPango_CreateSurfaceDraw(context);
dstrect.x = 1;
dstrect.y = 1;
SDL_BlitSurface(white_letters, NULL, bg, &dstrect);
@@ -334,13 +382,15 @@
*/
void UseAlphabet(void)
{
- int i;
+ int i,l;
+ char fn[256];
+ wchar_t wide_str[255];
LOG("Entering UseAlphabet()\n");
num_words = 0;
/* This totally mucks up i18n abilities :( */
- for (i=65; i<90; i++)
+/* for (i=65; i<90; i++)
{
if (ALPHABET[i]) {
word_list[num_words][0] = (unsigned char)i;
@@ -349,6 +399,37 @@
DEBUGCODE { fprintf(stderr, "Adding %c\n", (unsigned char)i); }
}
+ }*/
+
+ /* Read the characters from Keyboard.lst file to get i18n abilities*/
+ for (l=useEnglish; l<2; l++) {
+ sprintf( fn , "%s/keyboard.lst", realPath[l]);
+ if ( CheckFile(fn) ) {
+ unsigned char str[255];
+ FILE *f;
+ int i,j;
+ f = fopen( fn, "r" );
+ if (f == NULL)
+ continue;
+ do {
+ fscanf( f, "%[^\n]\n", str);
+ for (j = 0; j < strlen(str); j++)
+ {
+ if (str[j] == '\n' || str[j] == '\r')
+ str[j] = '\0';
+ }
+ if (strlen(str) > 3) {
+ /* format is: FINGER(s)|Char(s) Upper/Lower */
+ /* advance past the fingers */
+ for (i=0; i<strlen(str) && str[i] != '|'; i++);
+ i++; // pass the '|'
+ convert_from_UTF8(word_list[num_words], str+i);
+ word_list[num_words][1]='\0';
+ num_words++;
+ }
+ } while (!feof(f));
+ break;
+ }
}
/* Make sure list is terminated with null character */
word_list[num_words][0] = '\0';
@@ -723,8 +804,8 @@
for(i = 0; i < 256; i++)
{
- fprintf(stderr, "i = %d\t(int)KEYMAP[i] = %d\tKEYMAP[i] = %lc\t",
- i, KEYMAP[i], KEYMAP[i]);
+ fprintf(stderr, "i = %d\t(int)i = %d\ti = %lc\t",
+ i, i, i);
if(isupper(i) && !islower(i))
fprintf(stderr, "Upper\n");
if(!isupper(i) && islower(i))
@@ -784,8 +865,7 @@
ALPHABET[i]=0;
for (j=0; j<10; j++)
FINGER[i][j]=0;
- KEYMAP[i]=i;
- }
+ }
}
/* This function just tidies up all the ptr args needed for */
/* ConvertUTF8toUTF32() from Unicode, Inc. into a neat wrapper. */
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in 2007-07-18 20:37:16 UTC (rev 189)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile 2007-07-18 20:37:16 UTC (rev 189)
@@ -29,9 +29,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
subdir = tuxtype/data/fonts
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,17 +45,17 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
-AWK = mawk
-CC = i586-mingw32msvc-gcc
+ACLOCAL = ${SHELL} /root/Desktop/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /root/Desktop/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/Desktop/tuxtype-indic/missing --run automake-1.10
+AWK = gawk
+CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -63,70 +63,70 @@
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT =
GREP = /bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS =
LIBOBJS =
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/Desktop/tuxtype-indic/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
-NSIS = /usr/bin/makensis
-NSI_DLL_DIR = /home/dbruce/tuxtype_dll
+NSIS = no
+NSI_DLL_DIR = /root/tuxtype_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxtype
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
PATH_SEPARATOR = :
SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SET_MAKE =
SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/fonts
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/fonts
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC =
+STRIP =
+VERSION = 1.5.10
+WINDRES =
+abs_builddir = /root/Desktop/tuxtype-indic/tuxtype/data/fonts
+abs_srcdir = /root/Desktop/tuxtype-indic/tuxtype/data/fonts
+abs_top_builddir = /root/Desktop/tuxtype-indic
+abs_top_srcdir = /root/Desktop/tuxtype-indic
+ac_ct_CC = gcc
am__include = include
am__leading_dot = .
am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias =
+build_cpu = x86_64
build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias =
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /root/Desktop/tuxtype-indic/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -135,21 +135,21 @@
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias =
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
top_builddir = ../../..
top_srcdir = ../../..
-EXTRA_DIST = AndikaDesRevG.ttf
+EXTRA_DIST = Rachana_g01.ttf
all: all-am
.SUFFIXES:
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/fonts/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/fonts/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/fonts/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/fonts/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -313,10 +313,10 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
- $(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+ $(INSTALL_DATA) $(srcdir)/Rachana_g01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndikaDesRevG.ttf
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_g01.ttf
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.am
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.am 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.am 2007-07-18 20:37:16 UTC (rev 189)
@@ -1,8 +1,8 @@
-EXTRA_DIST = AndikaDesRevG.ttf
+EXTRA_DIST = Rachana_g01.ttf
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
- $(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+ $(INSTALL_DATA) $(srcdir)/Rachana_g01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndikaDesRevG.ttf
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_g01.ttf
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in 2007-07-18 20:37:16 UTC (rev 189)
@@ -149,7 +149,7 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = AndikaDesRevG.ttf
+EXTRA_DIST = Rachana_g01.ttf
all: all-am
.SUFFIXES:
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/fonts/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/fonts/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/fonts/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/fonts/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -313,10 +313,10 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
- $(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+ $(INSTALL_DATA) $(srcdir)/Rachana_g01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndikaDesRevG.ttf
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_g01.ttf
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/keyboard.lst
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/keyboard.lst 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/keyboard.lst 2007-07-18 20:37:16 UTC (rev 189)
@@ -1,55 +1,29 @@
0|AA
-0|aa
3|BB
-3|bb
2|CC
-2|cc
2|DD
-2|dd
2|EE
-2|ee
3|FF
-3|ff
3|GG
-3|gg
6|HH
-6|hh
7|II
-7|ii
6|JJ
-6|jj
7|KK
-7|kk
8|LL
-8|ll
6|MM
-6|mm
6|NN
-6|nn
8|OO
-8|oo
9|PP
-9|pp
0|QQ
-0|qq
3|RR
-3|rr
1|SS
-1|ss
3|TT
-3|tt
6|UU
-6|uu
3|VV
-3|vv
1|WW
-1|ww
1|XX
-1|xx
6|YY
-6|yy
0|ZZ
-0|zz
5|
0|!!
0|@@
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.am
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.am 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.am 2007-07-18 20:37:16 UTC (rev 189)
@@ -12,6 +12,7 @@
italian\
jamaican\
lithuanian\
+malayalam\
nederlands\
nynorsk\
russian\
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in 2007-07-18 20:37:16 UTC (rev 189)
@@ -174,6 +174,7 @@
italian\
jamaican\
lithuanian\
+malayalam\
nederlands\
nynorsk\
russian\
@@ -193,9 +194,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/globals.h
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/globals.h 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/globals.h 2007-07-18 20:37:16 UTC (rev 189)
@@ -47,10 +47,10 @@
#include "../config.h"
-#include "SDL.h"
-#include "SDL_image.h"
-#include "SDL_mixer.h"
-#include "SDL_ttf.h"
+#include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_mixer.h>
+#include <SDL/SDL_ttf.h>
#endif // __GLOBALS_H__
@@ -110,10 +110,10 @@
#define amask 0xff000000
#endif
-#define menu_font "AndikaDesRevG.ttf" /*"AndikaDesRevA.ttf" GenAI102.ttf or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */ /* was menu.ttf */
+#define menu_font "Rachana_g01.ttf" /* "AndikaDesRevG.ttf" "AndikaDesRevA.ttf" GenAI102.ttf or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */ /* was menu.ttf */
#define menu_font_size 20
-#define ttf_font "AndikaDesRevG.ttf" /*AndikaDesRevA.ttf" GenAI102.ttf or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */ /* was letters.ttf */
+#define ttf_font "Rachana_g01.ttf" /* "AndikaDesRevG.ttf" AndikaDesRevA.ttf" GenAI102.ttf or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */ /* was letters.ttf */
#define ttf_font_size 20
/* Limits on word list size, word length, and on the number of distinct characters */
@@ -168,7 +168,7 @@
extern SDL_Surface *letters[255];
extern wchar_t ALPHABET[256];
-extern wchar_t KEYMAP[256];
+
extern unsigned char FINGER[256][10];
extern int ALPHABET_SIZE;
Modified: tuxtype/branches/tuxtype-indic/tuxtype/laser.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/laser.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/laser.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -190,14 +190,14 @@
// tux_pressing ++;
// }
- key_unicode = event.key.keysym.unicode & 0xff;
+ key_unicode = event.key.keysym.unicode;
DEBUGCODE
{
fprintf(stderr,
- "key_unicode = %d\tKEYMAP[key_unicode] = %c\n",
+ "key_unicode = %d\tkey_unicode = %c\n",
key_unicode,
- KEYMAP[key_unicode]);
+ key_unicode);
}
/* For now, tuxtype is case-insensitive for input, */
@@ -211,12 +211,12 @@
DEBUGCODE
{
fprintf(stderr,
- "key_unicode = %d\tKEYMAP[key_unicode] = %c\n",
+ "key_unicode = %d\tkey_unicode = %c\n",
key_unicode,
- KEYMAP[key_unicode]);
+ key_unicode);
}
/* Now update with case-folded value: */
- ans[ans_num++] = KEYMAP[key_unicode];
+ ans[ans_num++] = key_unicode;
}
}
@@ -235,7 +235,7 @@
if (comets[i].alive
&& comets[i].shootable
&& comets[i].expl == 0
- && KEYMAP[comets[i].ch] == ans[ans_num -1 ]
+ && comets[i].ch == ans[ans_num -1 ]
&& comets[i].y > lowest_y)
{
lowest = i;
Modified: tuxtype/branches/tuxtype-indic/tuxtype/loaders.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/loaders.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/loaders.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -80,8 +80,8 @@
sprintf( fn, "%s/lang.po", realPath[0]);
/* FIXME should have program try to setlocale() to lang-specific locale - */
- /* for now, at least get a default UTF-8 encoding set: */
- if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
+ /* for now, at least get ALL UTF-8 encoding set: */
+ if (!setlocale(LC_ALL, ""))
fprintf(stderr, "Cannot support UTF-8, ASCII-only words will be used\n");
/* This function confusingly returns 0 if successful! */
Modified: tuxtype/branches/tuxtype-indic/tuxtype/playgame.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/playgame.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/playgame.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -254,14 +254,14 @@
// UpdateTux(KEYMAP[(event.key.keysym.unicode & 0xff)], fishies, frame);
// }
- key_unicode = event.key.keysym.unicode & 0xff;
+ key_unicode = event.key.keysym.unicode;
/* For now, tuxtype is case-insensitive for input, */
/* with only uppercase for answers: */
DEBUGCODE
{
fprintf(stderr,
- "\nkey_unicode = %d\twchar_t = %lc\tKEYMAP[key_unicode] = %c\n",
- key_unicode, key_unicode, KEYMAP[key_unicode]);
+ "\nkey_unicode = %d\twchar_t = %lc\tkey_unicode = %c\n",
+ key_unicode, key_unicode, key_unicode);
}
if (key_unicode >= 97 && key_unicode <= 122)
@@ -273,12 +273,12 @@
DEBUGCODE
{
fprintf(stderr,
- "key_unicode = %d\twchar_t = %lc\tKEYMAP[key_unicode] = %c\n\n",
- key_unicode, key_unicode, KEYMAP[key_unicode]);
+ "key_unicode = %d\twchar_t = %lc\tkey_unicode = %c\n\n",
+ key_unicode, key_unicode, key_unicode);
}
/* Now update with case-folded value: */
- UpdateTux(KEYMAP[key_unicode], fishies, frame);
+ UpdateTux(key_unicode, fishies, frame);
}
/* --- fishy updates --- */
@@ -636,7 +636,7 @@
return 0;
for (i=0; i < wcslen(fish_object[f].word); i++)
- if (KEYMAP[fish_object[f].word[i]] != KEYMAP[tux_object.word[tux_object.wordlen - wcslen(fish_object[f].word)+i]])
+ if (fish_object[f].word[i] != tux_object.word[tux_object.wordlen - wcslen(fish_object[f].word)+i])
return 0;
return 1;
@@ -1418,7 +1418,7 @@
int k;
for (k = 0; k < tux_object.wordlen - j; k++)
{
- if (KEYMAP[fish_object[which].word[k]] != KEYMAP[tux_object.word[j+k]])
+ if (fish_object[which].word[k] != tux_object.word[j+k])
k = 100000;
}
Modified: tuxtype/branches/tuxtype-indic/tuxtype/practice.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/practice.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/practice.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -131,14 +131,14 @@
//practice next phase in list
//a=a;
} else {
- if (ALPHABET[KEYMAP[event.key.keysym.unicode]] && pphrase[c]==(char)event.key.keysym.unicode){
+ if (ALPHABET[event.key.keysym.unicode] && pphrase[c]==(char)event.key.keysym.unicode){
state=0;
dst2.x=40;
dst4.x=480;
SDL_BlitSurface(bkg, &dst3, screen, &dst2);
SDL_BlitSurface(bkg, &dst5, screen, &dst4);
SDL_Flip(screen);
- SDL_BlitSurface(letters[KEYMAP[event.key.keysym.unicode]], NULL, screen, &dst);
+ SDL_BlitSurface(letters[event.key.keysym.unicode], NULL, screen, &dst);
for (z=0;z<strlen(keytime);z++){
SDL_BlitSurface(letters[(int)keytime[z]], NULL, screen, &dst2);
dst2.x = dst2.x + letters[(int)keytime[z]]->w-2;
@@ -147,7 +147,7 @@
SDL_BlitSurface(letters[(int)totaltime[z]], NULL, screen, &dst4);
dst4.x = dst4.x + letters[(int)totaltime[z]]->w-2;
}
- dst.x = (dst.x + letters[KEYMAP[event.key.keysym.unicode]]->w) - 5;
+ dst.x = (dst.x + letters[event.key.keysym.unicode]->w) - 5;
if (c==(strlen(pphrase)-1)){
print_at("Great!",6 ,275 ,200);
SDL_Flip(screen);
Modified: tuxtype/branches/tuxtype-indic/tuxtype/setup.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/setup.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/setup.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -120,6 +120,13 @@
atexit(TTF_Quit);
+ LOG( "-about to init SDLPango\n" );
+
+ if (SDLPango_Init() < 0) {
+ fprintf( stderr, "Couldn't initialize SDLPango\n" );
+ exit(2);
+ }
+
SDL_EnableKeyRepeat( 0, SDL_DEFAULT_REPEAT_INTERVAL );
/* Need this to get Unicode values from keysyms: */
SDL_EnableUNICODE(1);
Modified: tuxtype/branches/tuxtype-indic/tuxtype/theme.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/theme.c 2007-07-07 20:05:34 UTC (rev 188)
+++ tuxtype/branches/tuxtype-indic/tuxtype/theme.c 2007-07-18 20:37:16 UTC (rev 189)
@@ -30,7 +30,6 @@
SDL_Surface *letters[255] = { NULL };
wchar_t ALPHABET[256];
-wchar_t KEYMAP[256];
unsigned char FINGER[256][10];
int ALPHABET_SIZE;
unsigned char realPath[2][FNLEN];
More information about the Tux4kids-commits
mailing list