[Tux4kids-commits] r230 - in tuxtype/trunk/tuxtype: . data/themes/euskara data/themes/french data/themes/jamaican data/themes/jamaican/words data/themes/lithuanian data/themes/nederlands data/themes/nynorsk data/themes/russian data/themes/svenska data/themes/swahili
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Fri Sep 7 08:08:52 UTC 2007
Author: dbruce-guest
Date: 2007-09-07 08:08:51 +0000 (Fri, 07 Sep 2007)
New Revision: 230
Removed:
tuxtype/trunk/tuxtype/data/themes/french/images/
Modified:
tuxtype/trunk/tuxtype/alphabet.c
tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
tuxtype/trunk/tuxtype/data/themes/french/Makefile.am
tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am
tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/lithuanian/keyboard.lst
tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am
tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nynorsk/keyboard.lst
tuxtype/trunk/tuxtype/data/themes/russian/keyboard.lst
tuxtype/trunk/tuxtype/data/themes/svenska/keyboard.lst
tuxtype/trunk/tuxtype/data/themes/swahili/keyboard.lst
tuxtype/trunk/tuxtype/funcs.h
tuxtype/trunk/tuxtype/playgame.c
tuxtype/trunk/tuxtype/practice.c
Log:
Update remainder of keyboard.lst files - note that Russian and Greek files are incorrect and these themes don't work
Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/alphabet.c 2007-09-07 08:08:51 UTC (rev 230)
@@ -69,7 +69,7 @@
/* Used for word list functions (see below): */
static int num_words;
static wchar_t word_list[MAX_NUM_WORDS][MAX_WORD_SIZE + 1];
-static wchar_t char_list[MAX_UNICODES]; // List of distinct letters in list
+static wchar_t char_list[MAX_UNICODES]; // List of distinct letters in word list
static int num_chars_used = 0; // Number of different letters in word list
@@ -176,8 +176,8 @@
{
DEBUGCODE
{
- fprintf(stderr, "Adding key: Unicode char = %C, finger = %d\n",
- wide_str[2], wcstol(&wide_str[0], NULL, 0));
+ fprintf(stderr, "Adding key: Unicode char = '%C'\tUnicode value = %d\tfinger = %d\n",
+ wide_str[2], wide_str[2], wcstol(&wide_str[0], NULL, 0));
}
/* Just plug values into array: */
@@ -806,7 +806,7 @@
{
DEBUGCODE
{
- fprintf(stderr, "Creating SDL_Surface for list element %d, char = %lc\n", i, *t);
+ fprintf(stderr, "Creating SDL_Surface for list element %d, char = '%lc', Unicode value = %d\n", i, *t, *t);
}
char_glyphs[j].unicode_value = t[0];
@@ -854,7 +854,7 @@
if (i > num_chars_used)
{
/* Didn't find character: */
- fprintf(stderr, "Could not find glyph for unicode character %lc\n", t);
+ fprintf(stderr, "Could not find glyph for Unicode char '%C', value = %d\n", t, t);
return NULL;
}
@@ -886,8 +886,32 @@
}
+/* Checks to see if all of the glyphs needed by the word list have been */
+/* successfully rendered based on the Unicode values given in keyboard.lst. */
+/* If not, then the list contains characters that will not display and (if */
+/* keyboard.lst is correct) cannot be typed. Most likely, this means that */
+/* keyboard.lst is not correct.
+/* Returns 1 if all needed chars found, 0 otherwise. */
+int CheckNeededGlyphs(void)
+{
+ int i = 0;
+ while ((i < MAX_UNICODES)
+ && (char_list[i] != '\0'))
+ {
+ if (!GetWhiteGlyph(char_list[i]))
+ {
+ fprintf(stderr, "\nCheckNeededGlyphs() - needed char '%C' (Unicode value = %d) not found.\n",
+ char_list[i], char_list[i]);
+ fprintf(stderr, "This probably means that the theme's 'keyboard.lst' file is incorrect or incomplete.\n");
+ return 0;
+ }
+ }
+ LOG("CheckNeededGlyphs() - all chars found.\n");
+ return 0;
+}
+
/****************************************************/
/* */
/* Local ("private") functions: */
Modified: tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in 2007-09-07 08:08:51 UTC (rev 230)
@@ -162,7 +162,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = images words
-EXTRA_DIST = AUTHOR lang.po
+EXTRA_DIST = AUTHOR lang.po keyboard.lst
all: all-recursive
.SUFFIXES:
@@ -476,10 +476,12 @@
$(INSTALL_DATA) $(srcdir)/AUTHOR $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/AUTHOR
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/lang.po
+ $(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/keyboard.lst
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/AUTHOR
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/lang.po
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/keyboard.lst
# 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/trunk/tuxtype/data/themes/french/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.am 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.am 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,6 +1,5 @@
-SUBDIRS = words images
-
+SUBDIRS = words
EXTRA_DIST = lang.po keyboard.lst
Modified: tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.in 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.in 2007-09-07 08:08:51 UTC (rev 230)
@@ -162,7 +162,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = words
-EXTRA_DIST = lang.po
+EXTRA_DIST = lang.po keyboard.lst
all: all-recursive
.SUFFIXES:
@@ -475,9 +475,11 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/lang.po
+ $(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/keyboard.lst
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/lang.po
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/keyboard.lst
# 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/trunk/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in 2007-09-07 08:08:51 UTC (rev 230)
@@ -162,6 +162,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = images words
+EXTRA_DIST = keyboard.lst
all: all-recursive
.SUFFIXES:
@@ -416,7 +417,7 @@
info-am:
-install-data-am:
+install-data-am: install-data-local
install-dvi: install-dvi-recursive
@@ -450,7 +451,7 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-local
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
@@ -459,15 +460,23 @@
all all-am check check-am clean clean-generic ctags \
ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
- tags-recursive uninstall uninstall-am
+ install-am install-data install-data-am install-data-local \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-local
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican
+ $(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/keyboard.lst
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/keyboard.lst
# 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/trunk/tuxtype/data/themes/jamaican/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am 2007-09-07 08:08:51 UTC (rev 230)
@@ -7,9 +7,7 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
$(INSTALL_DATA) $(srcdir)/jam-long.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-long.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
$(INSTALL_DATA) $(srcdir)/jam-med.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-med.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
$(INSTALL_DATA) $(srcdir)/jam-short.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-short.txt
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in 2007-09-07 08:08:51 UTC (rev 230)
@@ -317,9 +317,7 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
$(INSTALL_DATA) $(srcdir)/jam-long.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-long.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
$(INSTALL_DATA) $(srcdir)/jam-med.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-med.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
$(INSTALL_DATA) $(srcdir)/jam-short.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-short.txt
uninstall-local:
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/keyboard.lst 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/keyboard.lst 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,41 +1,76 @@
-0|Aa
-0|Àà
-3|Bb
-2|Cc
-6|Èè
-2|Dd
-2|Ee
-8|Ææ
-9|Ëë
-7|Ff
-3|Gg
-3|Hh
-6|Ii
-9|Áá
-3|Yy
-6|Jj
-6|Kk
-7|Ll
-6|Mm
-6|Nn
-7|Oo
-8|Pp
-9|Qq
-3|Rr
-1|Ss
-3|Ðð
-3|Tt
-6|Uu
-8|Øø
-1|Ûû
-3|Vv
-9|Ww
-9|Xx
-0|Zz
-1|Þþ
-6|„
-7|“
-0|–
+0|A
+0|a
+0|�
+0|�
+3|B
+3|b
+2|C
+2|c
+6|�
+6|�
+2|D
+2|d
+2|E
+2|e
+8|�
+8|�
+9|�
+9|�
+7|F
+7|f
+3|G
+3|g
+3|H
+3|h
+6|I
+6|i
+9|�
+9|�
+3|Y
+3|y
+6|J
+6|j
+6|K
+6|k
+7|L
+7|l
+6|M
+6|m
+6|N
+6|n
+7|O
+7|o
+8|P
+8|p
+9|Q
+9|q
+3|R
+3|r
+1|S
+1|s
+3|�
+3|�
+3|T
+3|t
+6|U
+6|u
+8|�
+8|�
+1|�
+1|�
+3|V
+3|v
+9|W
+9|w
+9|X
+9|x
+0|Z
+0|z
+1|�
+1|�
+6|�
+7|�
+0|�
0|!
0|1
1|-
Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,14 +1,16 @@
SUBDIRS = words
-EXTRA_DIST = lang.po nederlands.txt
+EXTRA_DIST = lang.po keyboard.lst nederlands.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands
$(INSTALL_DATA) $(srcdir)/nederlands.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
+ $(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
+
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in 2007-09-07 08:08:51 UTC (rev 230)
@@ -162,7 +162,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = words
-EXTRA_DIST = lang.po nederlands.txt
+EXTRA_DIST = lang.po keyboard.lst nederlands.txt
all: all-recursive
.SUFFIXES:
@@ -474,12 +474,13 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands
$(INSTALL_DATA) $(srcdir)/nederlands.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
+ $(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
# 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/trunk/tuxtype/data/themes/nynorsk/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/keyboard.lst 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/keyboard.lst 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,75 +1,75 @@
-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
-9|ÆÆ
-9|ææ
-9|ØØ
-9|øø
-9|Ã…Ã…
-9|åå
-5|
-0|!!
-0|@@
-0|##
-0|11
-0|22
-0|33
-0|44
-0|55
-0|66
-0|77
-0|88
-0|99
-0|00
-7|,,
-8|..
-9|;;
+0|A
+0|a
+3|B
+3|b
+2|C
+2|c
+2|D
+2|d
+2|E
+2|e
+3|F
+3|f
+3|G
+3|g
+6|H
+6|h
+7|I
+7|i
+6|J
+6|j
+7|K
+7|k
+8|L
+8|l
+6|M
+6|m
+6|N
+6|n
+8|O
+8|o
+9|P
+9|p
+0|Q
+0|q
+3|R
+3|r
+1|S
+1|s
+3|T
+3|t
+6|U
+6|u
+3|V
+3|v
+1|W
+1|w
+1|X
+1|x
+6|Y
+6|y
+0|Z
+0|z
+9|Æ
+9|æ
+9|Ø
+9|ø
+9|Ã…
+9|Ã¥
+5|
+0|!
+0|@
+0|#
+0|1
+0|2
+0|3
+0|4
+0|5
+0|6
+0|7
+0|8
+0|9
+0|0
+7|,
+8|.
+9|;
Modified: tuxtype/trunk/tuxtype/data/themes/russian/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/keyboard.lst 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/russian/keyboard.lst 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,102 +1,134 @@
-3|áÁ
-7|âÂ
-2|÷×
-6|çÇ
-8|äÄ
-3|åÅ
-8|öÖ
-9|úÚ
-6|éÉ
-0|êÊ
-3|ëË
-7|ìÌ
-3|íÍ
-6|îÎ
-6|ïÏ
-3|ðÐ
-6|òÒ
-3|óÓ
-6|ôÔ
-2|õÕ
-0|æÆ
-9|èÈ
-1|ãÃ
-1|þÞ
-7|ûÛ
-8|ýÝ
-9|ÿß
-1|ùÙ
-6|øØ
-9|üÜ
-9|àÀ
-0|ñÑ
+3|�
+3|�
+7|�
+7|�
+2|�
+2|�
+6|�
+6|�
+8|�
+8|�
+3|�
+3|�
+8|�
+8|�
+9|�
+9|�
+6|�
+6|�
+0|�
+0|�
+3|�
+3|�
+7|�
+7|�
+3|�
+3|�
+6|�
+6|�
+6|�
+6|�
+3|�
+3|�
+6|�
+6|�
+3|�
+3|�
+6|�
+6|�
+2|�
+2|�
+0|�
+0|�
+9|�
+9|�
+1|�
+1|�
+1|�
+1|�
+7|�
+7|�
+8|�
+8|�
+9|�
+9|�
+1|�
+1|�
+6|�
+6|�
+9|�
+9|�
+9|�
+9|�
+0|�
+0|�
-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|@@
-0|##
-0|11
-0|22
-0|33
-0|44
-0|55
-0|66
-0|77
-0|88
-0|99
-0|00
-7|,,
-8|..
-9|;;
+0|A
+0|a
+3|B
+3|b
+2|C
+2|c
+2|D
+2|d
+2|E
+2|e
+3|F
+3|f
+3|G
+3|g
+6|H
+6|h
+7|I
+7|i
+6|J
+6|j
+7|K
+7|k
+8|L
+8|l
+6|M
+6|m
+6|N
+6|n
+8|O
+8|o
+9|P
+9|p
+0|Q
+0|q
+3|R
+3|r
+1|S
+1|s
+3|T
+3|t
+6|U
+6|u
+3|V
+3|v
+1|W
+1|w
+1|X
+1|x
+6|Y
+6|y
+0|Z
+0|z
+5|
+0|!
+0|@
+0|#
+0|1
+0|2
+0|3
+0|4
+0|5
+0|6
+0|7
+0|8
+0|9
+0|0
+7|,
+8|.
+9|;
Modified: tuxtype/trunk/tuxtype/data/themes/svenska/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/keyboard.lst 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/keyboard.lst 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,29 +1,58 @@
-0|Aa
-3|Bb
-2|Cc
-2|Dd
-2|Ee
-3|Ff
-3|Gg
-6|Hh
-7|Ii
-6|Jj
-7|Kk
-8|Ll
-6|Mm
-6|Nn
-8|Oo
-9|Pp
-0|Qq
-3|Rr
-1|Ss
-3|Tt
-6|Uu
-3|Vv
-1|Ww
-1|Xx
-6|Yy
-0|Zz
-9|Åå
-9|Ää
-9|Öö
+0|A
+0|a
+3|B
+3|b
+2|C
+2|c
+2|D
+2|d
+2|E
+2|e
+3|F
+3|f
+3|G
+3|g
+6|H
+6|h
+7|I
+7|i
+6|J
+6|j
+7|K
+7|k
+8|L
+8|l
+6|M
+6|m
+6|N
+6|n
+8|O
+8|o
+9|P
+9|p
+0|Q
+0|q
+3|R
+3|r
+1|S
+1|s
+3|T
+3|t
+6|U
+6|u
+3|V
+3|v
+1|W
+1|w
+1|X
+1|x
+6|Y
+6|y
+0|Z
+0|z
+9|�
+9|�
+9|�
+9|�
+9|�
+9|�
Modified: tuxtype/trunk/tuxtype/data/themes/swahili/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/keyboard.lst 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/keyboard.lst 2007-09-07 08:08:51 UTC (rev 230)
@@ -1,27 +1,54 @@
-0|Aa
-3|Bb
-3|Cc
-2|Dd
-2|Ee
-3|Ff
-3|Gg
-6|Hh
-7|Ii
-6|Jj
-7|Kk
-8|Ll
-6|Mm
-6|Nn
-8|Oo
-9|Pp
-0|Qq
-3|Rr
-1|Ss
-3|Tt
-6|Uu
-3|Vv
-1|Ww
-1|Xx
-6|Yy
-0|Zz
-9|Ññ
+0|A
+0|a
+3|B
+3|b
+3|C
+3|c
+2|D
+2|d
+2|E
+2|e
+3|F
+3|f
+3|G
+3|g
+6|H
+6|h
+7|I
+7|i
+6|J
+6|j
+7|K
+7|k
+8|L
+8|l
+6|M
+6|m
+6|N
+6|n
+8|O
+8|o
+9|P
+9|p
+0|Q
+0|q
+3|R
+3|r
+1|S
+1|s
+3|T
+3|t
+6|U
+6|u
+3|V
+3|v
+1|W
+1|w
+1|X
+1|x
+6|Y
+6|y
+0|Z
+0|z
+9|�
+9|�
Modified: tuxtype/trunk/tuxtype/funcs.h
===================================================================
--- tuxtype/trunk/tuxtype/funcs.h 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/funcs.h 2007-09-07 08:08:51 UTC (rev 230)
@@ -34,6 +34,7 @@
#endif
/* (still in alphabet.c:) */
+int CheckNeededGlyphs(void);
void ClearWordList(void);
int ConvertFromUTF8(wchar_t* wide_word, const char* UTF8_word);
void FreeLetters(void);
Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/playgame.c 2007-09-07 08:08:51 UTC (rev 230)
@@ -70,7 +70,7 @@
int oldlives, int fish_left, int oldfish_left);
static void DrawFish(int which);
static void DrawNumbers(int num, int x, int y, int places);
-static int DrawObject(SDL_Surface* sprite, int x, int y);
+static int DrawObject(SDL_Surface* surf, int x, int y);
static int DrawSprite(sprite* gfx, int x, int y);
static void EraseNumbers(int num, int x, int y, int places);
static int EraseObject(SDL_Surface* sprite, int x, int y);
@@ -139,6 +139,17 @@
LoadOthers();
RenderLetters(font);
+ /* Make sure everything in the word list is "typable" according to the current */
+ /* theme's keyboard.lst: */
+ if (!CheckNeededGlyphs())
+ {
+ fprintf(stderr, "PlayCascade() - did not find all needed characters in theme's "
+ "keyboard.lst file - returning to menu!\n\n\n");
+ return 0;
+ }
+
+
+
LOG( " starting game \n ");
while (still_playing) {
Modified: tuxtype/trunk/tuxtype/practice.c
===================================================================
--- tuxtype/trunk/tuxtype/practice.c 2007-09-06 10:58:23 UTC (rev 229)
+++ tuxtype/trunk/tuxtype/practice.c 2007-09-07 08:08:51 UTC (rev 230)
@@ -289,7 +289,7 @@
hands = LoadImage("hands/hands.png", IMG_ALPHA);
bg = LoadImage("main_bkg.png", IMG_ALPHA);
wrong = LoadSound("tock.wav");
- font = LoadFont(settings.theme_font_name, 32);
+ font = LoadFont(settings.theme_font_name, 30);
for (i = 0; i < 10; i++)
{
More information about the Tux4kids-commits
mailing list