[Tux4kids-commits] r599 - in tuxtype/branches/soc3: . data data/images/keyboard src
sreyas-guest at alioth.debian.org
sreyas-guest at alioth.debian.org
Sat Aug 9 16:22:37 UTC 2008
Author: sreyas-guest
Date: 2008-08-09 16:22:36 +0000 (Sat, 09 Aug 2008)
New Revision: 599
Added:
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A00.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A01.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A02.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A03.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A04.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A05.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A06.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A07.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A08.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A09.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A10.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A11.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A12.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_A13.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B00.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B01.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B02.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B03.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B04.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B05.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B06.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B07.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B08.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B09.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B10.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B11.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B12.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_B13.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C00.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C01.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C02.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C03.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C04.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C05.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C06.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C07.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C08.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C09.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C10.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C11.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C12.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_C13.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D00.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D01.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D02.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D03.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D04.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D05.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D06.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D07.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D08.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D09.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D10.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D11.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_D12.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E00.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E01.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E02.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E03.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E04.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E05.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E06.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_E07.png
tuxtype/branches/soc3/data/images/keyboard/keyboardN_None.png
tuxtype/branches/soc3/data/images/keyboard/keyboard_NA01.png
Modified:
tuxtype/branches/soc3/ChangeLog
tuxtype/branches/soc3/data/Makefile.am
tuxtype/branches/soc3/data/images/keyboard/keyboard_E03.png
tuxtype/branches/soc3/src/alphabet.c
tuxtype/branches/soc3/src/funcs.h
tuxtype/branches/soc3/src/practice.c
tuxtype/branches/soc3/src/titlescreen.c
Log:
Wrong keypress details shown in practice game
Modified: tuxtype/branches/soc3/ChangeLog
===================================================================
--- tuxtype/branches/soc3/ChangeLog 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/ChangeLog 2008-08-09 16:22:36 UTC (rev 599)
@@ -1,3 +1,7 @@
+3 Aug 2008 - svn revision 599
+[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
+ - Added keypress details for wrong key pressed in practice.
+
3 Aug 2008 - svn revision 580
[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
- Added automatic keyboard layout generation in practice.c.
Modified: tuxtype/branches/soc3/data/Makefile.am
===================================================================
--- tuxtype/branches/soc3/data/Makefile.am 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/data/Makefile.am 2008-08-09 16:22:36 UTC (rev 599)
@@ -5,4 +5,5 @@
tuxtypedatadir = $(pkgdatadir)/data
-dist_tuxtypedata_DATA = keyboard.lst
+dist_tuxtypedata_DATA = keyboard.lst \
+ phrases.txt
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A00.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A00.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A01.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A02.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A02.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A03.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A03.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A04.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A04.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A05.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A05.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A06.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A06.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A07.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A07.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A08.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A08.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A09.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A09.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A10.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A11.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A11.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A12.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A13.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_A13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B00.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B00.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B01.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B02.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B02.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B03.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B03.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B04.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B04.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B05.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B05.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B06.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B06.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B07.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B07.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B08.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B08.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B09.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B09.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B10.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B11.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B11.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B12.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B13.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_B13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C00.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C00.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C01.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C02.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C02.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C03.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C03.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C04.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C04.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C05.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C05.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C06.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C06.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C07.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C07.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C08.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C08.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C09.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C09.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C10.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C11.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C11.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C12.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C13.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_C13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D00.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D00.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D01.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D02.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D02.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D03.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D03.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D04.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D04.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D05.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D05.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D06.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D06.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D07.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D07.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D08.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D08.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D09.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D09.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D10.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D11.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D11.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D12.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_D12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E00.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E00.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E01.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E02.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E02.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E03.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E03.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E04.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E04.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E05.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E05.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E06.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E06.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E07.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_E07.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/branches/soc3/data/images/keyboard/keyboardN_None.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboardN_None.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tuxtype/branches/soc3/data/images/keyboard/keyboard_E03.png
===================================================================
--- tuxtype/branches/soc3/data/images/keyboard/keyboard_E03.png 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/data/images/keyboard/keyboard_E03.png 2008-08-09 16:22:36 UTC (rev 599)
@@ -1,4 +1,7 @@
‰PNG
-IHDR  • Ëäú¾ bKGD ÿ ÿ ÿ ½§“ pHYs % %º¨? tIMEØ %o*¢$ AIDATxÚí×½J a†áwt‘‘&(©dŠ ÁbriÒnëYx–9‹4©=†ÅnëOX°HPÁBv‰ˆî¦²v,FØëê¶Ùâa˜{Þ €Ñ1A^Ê:u#¢g 2ñ< W 3 „4R¤á²Íÿï]ïÄÇ“ïñp4ŽÙèG,¶î O«¶nNÇÕÜ´¥ošº}ŠˆÓˆˆµß{ƒþÕî—Ç÷ÑZ·m¹9Í¢òÑŽ‹·\ƒƒóùþÅ7«°ªÊ:7g£ÙËïy5ñ®^a‘†Ë²NÖ “®¿<×Ö M]äe:®þYLžåG+ „ „ „ „ „ „ „ „ „ „ „ „ „ „ „ „ „ „ „Ù*ÒpYÖi` VYY§^‘†KKð :&È+‚V Gójâ]…‹ž»@nú—ÕW+à"¤ùUøëðOôŸ-Kšùa¸NgÞæˆ IEND®B`‚
\ No newline at end of file
+IHDR  • Ëäú¾ bKGD ÿ ÿ ÿ ½§“ pHYs % %º¨? tIMEØ ª" ø žIDATxÚíر
+ƒ0†Ñ߈.s° ûϲFúK—šÆH>Þ«¨OÖ}6 À"†ôRI™Í–”=…"‚ˆ¡)0Ëf <Ùn=_ƒ3nЯÏùÿþ ïr[ç®ó 3Y`
+‡0áLÃu~ö»ÙX8Ë „ „ „ „ „ „ „ „ „ ! ! ! ! ! ! ! ! ! 4´A/•T’Œd˜«Ÿc¸ƒeiyÀ
+‹Ê®b¿Fð"Ä«¼yª ŒÄ8CkÁ IEND®B`‚
\ No newline at end of file
Added: tuxtype/branches/soc3/data/images/keyboard/keyboard_NA01.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/soc3/data/images/keyboard/keyboard_NA01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tuxtype/branches/soc3/src/alphabet.c
===================================================================
--- tuxtype/branches/soc3/src/alphabet.c 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/src/alphabet.c 2008-08-09 16:22:36 UTC (rev 599)
@@ -298,9 +298,14 @@
void GetKeyPos(int index, char *buf)
{
- sprintf(buf,"keyboard/keyboard_%s.png", keyboard_list[index].keyname);
-
+ sprintf(buf,"keyboard/keyboard_%s.png", keyboard_list[index].keyname);
}
+
+void GetWrongKeyPos(int index, char *buf)
+{
+ sprintf(buf,"keyboard/keyboardN_%s.png", keyboard_list[index].keyname);
+}
+
void GetKeyShift(int index, char *buf)
{
if(keyboard_list[index].shift==0)
@@ -309,7 +314,7 @@
if(keyboard_list[index].shift==1)
sprintf(buf,"keyboard/keyboard_D00.png");
else
- sprintf(buf,"keyboard/keyboard_D11.png", settings.default_data_path);
+ sprintf(buf,"keyboard/keyboard_D12.png", settings.default_data_path);
}
int unicode_in_key_list(wchar_t uni_char)
{
@@ -1149,59 +1154,59 @@
{
case '`':strcpy(keyboard_entry->keyname,"A00");
keyboard_entry->shift=0;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case '~':strcpy(keyboard_entry->keyname,"A00");
keyboard_entry->shift=2;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case '1':strcpy(keyboard_entry->keyname,"A01");
keyboard_entry->shift=0;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case '!':strcpy(keyboard_entry->keyname,"A01");
keyboard_entry->shift=2;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case '2':strcpy(keyboard_entry->keyname,"A02");
keyboard_entry->shift=0;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case '@':strcpy(keyboard_entry->keyname,"A02");
keyboard_entry->shift=2;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case '3':strcpy(keyboard_entry->keyname,"A03");
keyboard_entry->shift=0;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case '#':strcpy(keyboard_entry->keyname,"A03");
keyboard_entry->shift=2;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case '4':strcpy(keyboard_entry->keyname,"A04");
keyboard_entry->shift=0;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case '$':strcpy(keyboard_entry->keyname,"A04");
keyboard_entry->shift=2;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case '5':strcpy(keyboard_entry->keyname,"A05");
keyboard_entry->shift=0;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case '%':strcpy(keyboard_entry->keyname,"A05");
keyboard_entry->shift=2;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case '6':strcpy(keyboard_entry->keyname,"A06");
keyboard_entry->shift=0;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case '^':strcpy(keyboard_entry->keyname,"A06");
keyboard_entry->shift=1;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case '7':strcpy(keyboard_entry->keyname,"A07");
keyboard_entry->shift=0;
@@ -1209,23 +1214,23 @@
break;
case '&':strcpy(keyboard_entry->keyname,"A07");
keyboard_entry->shift=1;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case '8':strcpy(keyboard_entry->keyname,"A08");
keyboard_entry->shift=0;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case '*':strcpy(keyboard_entry->keyname,"A08");
keyboard_entry->shift=1;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case '9':strcpy(keyboard_entry->keyname,"A09");
keyboard_entry->shift=0;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case '(':strcpy(keyboard_entry->keyname,"A09");
keyboard_entry->shift=1;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case '0':strcpy(keyboard_entry->keyname,"A10");
keyboard_entry->shift=0;
@@ -1259,25 +1264,25 @@
keyboard_entry->shift=1;
keyboard_entry->finger=9;
break;
- case 'q':strcpy(keyboard_entry->keyname,"B01;");
+ case 'q':strcpy(keyboard_entry->keyname,"B01");
keyboard_entry->shift=0;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case 'Q':strcpy(keyboard_entry->keyname,"B01");
keyboard_entry->shift=2;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case 'w':strcpy(keyboard_entry->keyname,"B02");
keyboard_entry->shift=0;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case 'W':strcpy(keyboard_entry->keyname,"B02");
keyboard_entry->shift=2;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case 'e':strcpy(keyboard_entry->keyname,"B03");
keyboard_entry->shift=0;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case 'E':strcpy(keyboard_entry->keyname,"B03");
keyboard_entry->shift=2;
@@ -1285,51 +1290,51 @@
break;
case 'r':strcpy(keyboard_entry->keyname,"B04");
keyboard_entry->shift=0;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case 'R':strcpy(keyboard_entry->keyname,"B04");
keyboard_entry->shift=2;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case 't':strcpy(keyboard_entry->keyname,"B05");
keyboard_entry->shift=0;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case 'T':strcpy(keyboard_entry->keyname,"B05");
keyboard_entry->shift=2;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case 'y':strcpy(keyboard_entry->keyname,"B06");
keyboard_entry->shift=0;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case 'Y':strcpy(keyboard_entry->keyname,"B06");
keyboard_entry->shift=1;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case 'u':strcpy(keyboard_entry->keyname,"B07");
keyboard_entry->shift=0;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case 'U':strcpy(keyboard_entry->keyname,"B07");
keyboard_entry->shift=1;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case 'i':strcpy(keyboard_entry->keyname,"B08");
keyboard_entry->shift=0;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case 'I':strcpy(keyboard_entry->keyname,"B08");
keyboard_entry->shift=1;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case 'o':strcpy(keyboard_entry->keyname,"B09");
keyboard_entry->shift=0;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case 'O':strcpy(keyboard_entry->keyname,"B09");
keyboard_entry->shift=1;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case 'p':strcpy(keyboard_entry->keyname,"B10");
keyboard_entry->shift=0;
@@ -1357,59 +1362,59 @@
break;
case 'a':strcpy(keyboard_entry->keyname,"C01");
keyboard_entry->shift=0;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case 'A':strcpy(keyboard_entry->keyname,"C01");
keyboard_entry->shift=2;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case 's':strcpy(keyboard_entry->keyname,"C02");
keyboard_entry->shift=0;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case 'S':strcpy(keyboard_entry->keyname,"C02");
keyboard_entry->shift=2;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case 'd':strcpy(keyboard_entry->keyname,"C03");
keyboard_entry->shift=0;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case 'D':strcpy(keyboard_entry->keyname,"C03");
keyboard_entry->shift=2;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case 'f':strcpy(keyboard_entry->keyname,"C04");
keyboard_entry->shift=0;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case 'F':strcpy(keyboard_entry->keyname,"C04");
keyboard_entry->shift=2;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case 'g':strcpy(keyboard_entry->keyname,"C05");
keyboard_entry->shift=0;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case 'G':strcpy(keyboard_entry->keyname,"C05");
- keyboard_entry->shift=2;
- keyboard_entry->finger=5;
+ keyboard_entry->shift=1;
+ keyboard_entry->finger=4;
break;
case 'h':strcpy(keyboard_entry->keyname,"C06");
keyboard_entry->shift=0;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case 'H':strcpy(keyboard_entry->keyname,"C06");
keyboard_entry->shift=1;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case 'j':strcpy(keyboard_entry->keyname,"C07");
keyboard_entry->shift=0;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case 'J':strcpy(keyboard_entry->keyname,"C07");
keyboard_entry->shift=1;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case 'k':strcpy(keyboard_entry->keyname,"C08");
keyboard_entry->shift=0;
@@ -1417,7 +1422,7 @@
break;
case 'K':strcpy(keyboard_entry->keyname,"C08");
keyboard_entry->shift=1;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case 'l':strcpy(keyboard_entry->keyname,"C09");
keyboard_entry->shift=0;
@@ -1425,7 +1430,7 @@
break;
case 'L':strcpy(keyboard_entry->keyname,"C09");
keyboard_entry->shift=1;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case ';':strcpy(keyboard_entry->keyname,"C10");
keyboard_entry->shift=0;
@@ -1445,75 +1450,75 @@
break;
case 'z':strcpy(keyboard_entry->keyname,"D01");
keyboard_entry->shift=0;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case 'Z':strcpy(keyboard_entry->keyname,"D01");
keyboard_entry->shift=2;
- keyboard_entry->finger=1;
+ keyboard_entry->finger=0;
break;
case 'x':strcpy(keyboard_entry->keyname,"D02");
keyboard_entry->shift=0;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case 'X':strcpy(keyboard_entry->keyname,"D02");
keyboard_entry->shift=2;
- keyboard_entry->finger=2;
+ keyboard_entry->finger=1;
break;
case 'c':strcpy(keyboard_entry->keyname,"D03");
keyboard_entry->shift=0;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case 'C':strcpy(keyboard_entry->keyname,"D03");
keyboard_entry->shift=2;
- keyboard_entry->finger=3;
+ keyboard_entry->finger=2;
break;
case 'v':strcpy(keyboard_entry->keyname,"D04");
keyboard_entry->shift=0;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case 'V':strcpy(keyboard_entry->keyname,"D04");
keyboard_entry->shift=2;
- keyboard_entry->finger=4;
+ keyboard_entry->finger=3;
break;
case 'b':strcpy(keyboard_entry->keyname,"D05");
keyboard_entry->shift=0;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case 'B':strcpy(keyboard_entry->keyname,"D05");
keyboard_entry->shift=2;
- keyboard_entry->finger=5;
+ keyboard_entry->finger=4;
break;
case 'n':strcpy(keyboard_entry->keyname,"D06");
keyboard_entry->shift=0;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case 'N':strcpy(keyboard_entry->keyname,"D06");
keyboard_entry->shift=1;
- keyboard_entry->finger=6;
+ keyboard_entry->finger=5;
break;
case 'm':strcpy(keyboard_entry->keyname,"D07");
keyboard_entry->shift=0;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case 'M':strcpy(keyboard_entry->keyname,"D07");
keyboard_entry->shift=1;
- keyboard_entry->finger=7;
+ keyboard_entry->finger=6;
break;
case ',':strcpy(keyboard_entry->keyname,"D08");
keyboard_entry->shift=0;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case '<':strcpy(keyboard_entry->keyname,"D08");
keyboard_entry->shift=1;
- keyboard_entry->finger=8;
+ keyboard_entry->finger=7;
break;
case '.':strcpy(keyboard_entry->keyname,"D09");
keyboard_entry->shift=0;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case '>':strcpy(keyboard_entry->keyname,"D09");
keyboard_entry->shift=1;
- keyboard_entry->finger=9;
+ keyboard_entry->finger=8;
break;
case '/':strcpy(keyboard_entry->keyname,"D10");
keyboard_entry->shift=0;
@@ -1576,8 +1581,11 @@
if(keyboard_list[i].shift>0)
{
new.x-=9;
- new.y-=9;
- }
+ if(new.y<9)
+ new.y-=5;
+ else
+ new.y-=9;
+ }
DEBUGCODE { printf("Making %d : %C\n",i,keyboard_list[i].unicode_value); }
//tmp=BlackOutline_Unicode(t, smallfont, &black);
tmp=TTF_RenderUNICODE_Blended((TTF_Font*)smallfont, t, black);
@@ -1623,12 +1631,10 @@
if(keyboard_list[i].latin_char==-1)
{
fprintf(fp,"%d|%s\n",keyboard_list[i].finger,buf);
- printf("Adding old %d|%s\n",keyboard_list[i].finger,buf);
}
else
{
fprintf(fp,"%d|%s|%c\n",keyboard_list[i].finger,buf,keyboard_list[i].latin_char);
- printf("Adding %d|%s|%c\n",keyboard_list[i].finger,buf,keyboard_list[i].latin_char);
}
}
fclose(fp);
Modified: tuxtype/branches/soc3/src/funcs.h
===================================================================
--- tuxtype/branches/soc3/src/funcs.h 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/src/funcs.h 2008-08-09 16:22:36 UTC (rev 599)
@@ -51,6 +51,7 @@
int GetIndex(wchar_t uni_char);
void GetKeyShift(int index, char *buf);
void GetKeyPos(int index, char *buf);
+void GetWrongKeyPos(int index, char *buf);
//int map_keys(wchar_t *wide_str,keymap key);
void GenerateKeyboard(SDL_Surface* keyboard);
void updatekeylist(int key,char ch);
Modified: tuxtype/branches/soc3/src/practice.c
===================================================================
--- tuxtype/branches/soc3/src/practice.c 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/src/practice.c 2008-08-09 16:22:36 UTC (rev 599)
@@ -45,6 +45,7 @@
static void show(unsigned char t);
SDL_Surface* GetKeypress1(int index);
SDL_Surface* GetKeypress2(int index);
+SDL_Surface* GetWrongKeypress(int index);
/************************************************************************/
@@ -186,6 +187,7 @@
case 3:
SDL_BlitSurface(hands, NULL, screen, &hand_loc);
+ SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
state = 12;
break;
@@ -249,82 +251,132 @@
char tmp=-1;
switch(event.key.keysym.sym)
{
- case SDLK_SPACE:tmp=' ';
+ case SDLK_BACKQUOTE:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='~';
+ else
+ tmp='`';
break;
- case SDLK_EXCLAIM:tmp='!';
+ case SDLK_COMMA:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='<';
+ else
+ tmp=',';
break;
- case SDLK_QUOTEDBL:tmp='"';
+ case SDLK_MINUS:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='_';
+ else
+ tmp='-';
break;
- case SDLK_HASH:tmp='#';
+ case SDLK_PERIOD:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='>';
+ else
+ tmp='.';
break;
- case SDLK_DOLLAR:tmp='$';
+ case SDLK_SLASH:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='?';
+ else
+ tmp='/';
break;
- case SDLK_AMPERSAND:tmp='&';
+ case SDLK_0:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp=')';
+ else
+ tmp='0';
break;
- case SDLK_QUOTE:tmp='\'';
+ case SDLK_1:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='!';
+ else
+ tmp='1';
break;
- case SDLK_LEFTPAREN:tmp='(';
+ case SDLK_2:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='@';
+ else
+ tmp='2';
break;
- case SDLK_RIGHTPAREN:tmp=')';
+ case SDLK_3:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='#';
+ else
+ tmp='3';
break;
- case SDLK_ASTERISK:tmp='*';
+ case SDLK_4:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='$';
+ else
+ tmp='4';
break;
- case SDLK_PLUS:tmp='+';
+ case SDLK_5:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='%';
+ else
+ tmp='5';
break;
- case SDLK_COMMA:tmp=',';
+ case SDLK_6:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='^';
+ else
+ tmp='6';
break;
- case SDLK_MINUS:tmp='-';
+ case SDLK_7:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='&';
+ else
+ tmp='7';
break;
- case SDLK_PERIOD:tmp='.';
+ case SDLK_8:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='*';
+ else
+ tmp='8';
break;
- case SDLK_SLASH:tmp='/';
+ case SDLK_9:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='(';
+ else
+ tmp='9';
break;
- case SDLK_0:tmp='0';
+ case SDLK_SEMICOLON:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp=':';
+ else
+ tmp=';';
break;
- case SDLK_1:tmp='1';
+ case SDLK_EQUALS:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='+';
+ else
+ tmp='=';
break;
- case SDLK_2:tmp='2';
+ case SDLK_LEFTBRACKET:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='{';
+ else
+ tmp='[';
break;
- case SDLK_3:tmp='3';
+ case SDLK_BACKSLASH:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='|';
+ else
+ tmp='\\';
break;
- case SDLK_4:tmp='4';
+ case SDLK_RIGHTBRACKET:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='}';
+ else
+ tmp=']';
break;
- case SDLK_5:tmp='5';
+ case SDLK_QUOTE:
+ if(event.key.keysym.mod&KMOD_SHIFT)
+ tmp='"';
+ else
+ tmp='\'';
break;
- case SDLK_6:tmp='6';
- break;
- case SDLK_7:tmp='7';
- break;
- case SDLK_8:tmp='8';
- break;
- case SDLK_9:tmp='9';
- break;
- case SDLK_COLON:tmp=':';
- break;
- case SDLK_SEMICOLON:tmp=';';
- break;
- case SDLK_LESS:tmp='<';
- break;
- case SDLK_EQUALS:tmp='=';
- break;
- case SDLK_GREATER:tmp='>';
- break;
- case SDLK_QUESTION:tmp='?';
- break;
- case SDLK_AT:tmp='@';
- break;
- case SDLK_LEFTBRACKET:tmp='[';
- break;
- case SDLK_BACKSLASH:tmp='\\';
- break;
- case SDLK_RIGHTBRACKET:tmp=']';
- break;
- case SDLK_CARET:tmp='^';
- break;
- case SDLK_UNDERSCORE:tmp='_';
- break;
- case SDLK_BACKQUOTE:tmp='`';
- break;
case SDLK_a:tmp='a';
break;
case SDLK_b:tmp='b';
@@ -380,8 +432,7 @@
}
if(event.key.keysym.mod&KMOD_SHIFT)
tmp=toupper(tmp);
- if(tmp!=-1)
- updatekeylist(key,tmp);
+ updatekeylist(key,tmp);
/****************************************************/
if (pphrase[c]==event.key.keysym.unicode)
{
@@ -442,6 +493,12 @@
}
else
{
+ int key = GetIndex((wchar_t)event.key.keysym.unicode);
+ keypress1= GetWrongKeypress(key);
+ SDL_BlitSurface(keypress1, NULL, screen, &keyboard_loc);
+ SDL_FreeSurface(keypress1);
+ state=0;
+
if (event.key.keysym.sym != SDLK_RSHIFT
&& event.key.keysym.sym != SDLK_LSHIFT)
PlaySound(wrong);
@@ -485,7 +542,7 @@
hand_shift[1] = LoadImage("hands/lshift.png", IMG_ALPHA);
hand_shift[2] = LoadImage("hands/rshift.png", IMG_ALPHA);
keyboard = LoadImage("keyboard/keyboard.png", IMG_ALPHA);
- bg = LoadImage("main_bkg.png", IMG_ALPHA);
+ bg = LoadImage("main_bkg.png", IMG_ALPHA);
wrong = LoadSound("tock.wav");
font = LoadFont(settings.theme_font_name, 30);
@@ -811,6 +868,13 @@
return (LoadImage(buf, IMG_ALPHA));
}
+SDL_Surface* GetWrongKeypress(int index)
+{
+ char buf[50];
+ GetWrongKeyPos(index,buf);
+ return (LoadImage(buf, IMG_ALPHA));
+}
+
SDL_Surface* GetKeypress2(int index)
{
char buf[50];
Modified: tuxtype/branches/soc3/src/titlescreen.c
===================================================================
--- tuxtype/branches/soc3/src/titlescreen.c 2008-08-09 03:17:18 UTC (rev 598)
+++ tuxtype/branches/soc3/src/titlescreen.c 2008-08-09 16:22:36 UTC (rev 599)
@@ -100,6 +100,10 @@
int key_menu = 1;
int old_key_menu = 5;
wchar_t phrase[128];
+ FILE *fp;
+ unsigned char fn[FNLEN];
+ int found = 0;
+ unsigned char str[1000];
if (settings.sys_sound)
@@ -108,10 +112,10 @@
settings.menu_music = 1;
}
-
+
/* FIXME phrase(s) should come from file */
- ConvertFromUTF8(phrase, "Now is the time for all good men to come to the aid of their country.");
+// ConvertFromUTF8(phrase, "Now is the time for all good men to come to the aid of their country.");
// ConvertFromUTF8(phrase, "To all that believe in his name he gave power to become children of God");
// wcscpy(phrase, "Now is the time for all good men to come to the aid of their country.");
@@ -644,10 +648,69 @@
if (menu_opt == FREETYPE)
{
unload_media();
- Phrases( phrase );
+ found=0;
+ if (!settings.use_english)
+ {
+ sprintf(fn , "%s/phrases.txt", settings.theme_data_path);
+ if (CheckFile(fn))
+ {
+ found = 1;
+ }
+ /* Now look in default path if desired or needed: */
+ if (!found)
+ {
+ sprintf(fn , "%s/words/words3.txt", settings.theme_data_path);
+ if (CheckFile(fn))
+ {
+ found = 1;
+ }
+ }
+ if (!found)
+ {
+ sprintf(fn , "%s/words/words2.txt", settings.theme_data_path);
+ if (CheckFile(fn))
+ {
+ found = 1;
+ }
+ }
+ if (!found)
+ {
+ sprintf(fn , "%s/words/words1.txt", settings.theme_data_path);
+ if (CheckFile(fn))
+ {
+ found = 1;
+ }
+ }
+ }
+ if (!found)
+ {
+ sprintf(fn , "%s/phrases.txt", settings.default_data_path);
+ if (CheckFile(fn))
+ {
+ found = 1;
+ }
+ }
+ if (!found)
+ {
+ fprintf(stderr, "LoadKeyboard(): Error finding file for keyboard setup!\n");
+ return 0;
+ }
+
+ fp=fopen(fn,"r");
+ do
+ {
+ fscanf( fp, "%[^\n]\n", str);
+ ConvertFromUTF8(phrase, str);
+ Phrases( phrase );
+ //Practice();
+ load_media();
+ redraw = 1;
+ } while (0);
+ fclose(fp);
+ //Phrases( phrase );
//Practice();
- load_media();
- redraw = 1;
+ //load_media();
+ //redraw = 1;
}
/* ------ End menu_opt processing ----------- */
More information about the Tux4kids-commits
mailing list