- IsNumericChar/... and other character class type functions moved to UUnicodeUtils.pas

- UCS4 to UTF8 converters added. Nice for changing single characters (e.g. MyString[i] := 'de')
- Player names are now UTF8
- DeleteLastLetter is UTF8 now

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1504 b956fd51-792f-4845-bead-9b4dfca2ff2c

12 files changed, 175 insertions, 127 deletions

diff --git a/unicode/src/base/UCommon.pas b/unicode/src/base/UCommon.pas
index a52349c0..234e4ddb 100644
--- a/unicode/src/base/UCommon.pas
+++ b/unicode/src/base/UCommon.pas
@@ -66,27 +66,10 @@ procedure RestoreNumericLocale();
 {$IFNDEF MSWINDOWS}
   procedure ZeroMemory( Destination: Pointer; Length: DWORD );
   function MakeLong(a, b: Word): Longint;
-  (*
-  #define LOBYTE(a) (BYTE)(a)
-  #define HIBYTE(a) (BYTE)((a)>>8)
-  #define LOWORD(a) (WORD)(a)
-  #define HIWORD(a) (WORD)((a)>>16)
-  #define MAKEWORD(a,b) (WORD)(((a)&0xff)|((b)<<8))
-  *)
 {$ENDIF}
 
 function FileExistsInsensitive(var FileName: string): boolean;
 
-(*
- * Character classes
- *)
-
-function IsAlphaChar(ch: WideChar): boolean;
-function IsNumericChar(ch: WideChar): boolean;
-function IsAlphaNumericChar(ch: WideChar): boolean;
-function IsPunctuationChar(ch: WideChar): boolean;
-function IsControlChar(ch: WideChar): boolean;
-
 // A stable alternative to TList.Sort() (use TList.Sort() if applicable, see below)
 procedure MergeSort(List: TList; CompareFunc: TListSortCompare);
 
@@ -258,6 +241,7 @@ end;
 
 
 {$IFNDEF MSWINDOWS}
+
 procedure ZeroMemory( Destination: Pointer; Length: DWORD );
 begin
   FillChar( Destination^, Length, 0 );
@@ -268,28 +252,6 @@ begin
   Result := (LongInt(B) shl 16) + A;
 end;
 
-(*
-function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;
-
-  // From http://en.wikipedia.org/wiki/RDTSC
-  function RDTSC: Int64; register;
-  asm
-    rdtsc
-  end;
-
-begin
-  // Use clock_gettime(CLOCK_REALTIME, ...) here (but not from the libc unit)
-  lpPerformanceCount := RDTSC();
-  result := true;
-end;
-
-function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;
-begin
-  // clock_getres(CLOCK_REALTIME, ...)
-  lpFrequency := 0;
-  result := true;
-end;
-*)
 {$ENDIF}
 
 // Checks if a regular files or directory with the given name exists.
@@ -543,59 +505,6 @@ begin
 {$IFEND}
 end;
 
-function IsAlphaChar(ch: WideChar): boolean;
-begin
-  // TODO: add chars > 255 when unicode-fonts work?
-  case ch of
-    'A'..'Z',  // A-Z
-    'a'..'z',  // a-z
-    #170,#181,#186,
-    #192..#214,
-    #216..#246,
-    #248..#255:
-      Result := true;
-    else
-      Result := false;
-  end;
-end;
-
-function IsNumericChar(ch: WideChar): boolean;
-begin
-  case ch of
-    '0'..'9':
-      Result := true;
-    else
-      Result := false;
-  end;
-end;
-
-function IsAlphaNumericChar(ch: WideChar): boolean;
-begin
-  Result := (IsAlphaChar(ch) or IsNumericChar(ch));
-end;
-
-function IsPunctuationChar(ch: WideChar): boolean;
-begin
-  // TODO: add chars outside of Latin1 basic (0..127)?
-  case ch of
-    ' '..'/',':'..'@','['..'`','{'..'~':
-      Result := true;
-    else
-      Result := false;
-  end;
-end;
-
-function IsControlChar(ch: WideChar): boolean;
-begin
-  case ch of
-    #0..#31,
-    #127..#159:
-      Result := true;
-    else
-      Result := false;
-  end;
-end;
-
 (*
  * Recursive part of the MergeSort algorithm.
  * OutList will be either InList or TempList and will be swapped in each
diff --git a/unicode/src/base/UIni.pas b/unicode/src/base/UIni.pas
index 3a4d6129..f50f95ce 100644
--- a/unicode/src/base/UIni.pas
+++ b/unicode/src/base/UIni.pas
@@ -925,12 +925,12 @@ begin
     IniFile := TIniFile.Create(Filename);
 
     //Name Templates for Names Mod
-    for I := 1 to 12 do
-      IniFile.WriteString('Name', 'P' + IntToStr(I), Name[I-1]);
-    for I := 1 to 3 do
-      IniFile.WriteString('NameTeam', 'T' + IntToStr(I), NameTeam[I-1]);
-    for I := 1 to 12 do
-      IniFile.WriteString('NameTemplate', 'Name' + IntToStr(I), NameTemplate[I-1]);
+    for I := 0 to High(Name) do
+      IniFile.WriteString('Name', 'P' + IntToStr(I+1), Name[I]);
+    for I := 0 to High(NameTeam) do
+      IniFile.WriteString('NameTeam', 'T' + IntToStr(I+1), NameTeam[I]);
+    for I := 0 to High(NameTemplate) do
+      IniFile.WriteString('NameTemplate', 'Name' + IntToStr(I+1), NameTemplate[I]);
 
     IniFile.Free;
   end;
diff --git a/unicode/src/base/UUnicodeUtils.pas b/unicode/src/base/UUnicodeUtils.pas
new file mode 100644
index 00000000..91c5966f
--- /dev/null
+++ b/unicode/src/base/UUnicodeUtils.pas
@@ -0,0 +1,124 @@
+{* UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *}
+
+unit UUnicodeUtils;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses
+  SysUtils,
+  Windows;
+
+(*
+ * Character classes
+ *)
+
+function IsAlphaChar(ch: WideChar): boolean;
+function IsNumericChar(ch: WideChar): boolean;
+function IsAlphaNumericChar(ch: WideChar): boolean;
+function IsPunctuationChar(ch: WideChar): boolean;
+function IsControlChar(ch: WideChar): boolean;
+
+function UTF8ToUCS4String(const str: UTF8String): UCS4String;
+function UCS4ToUTF8String(const str: UCS4String): UTF8String;
+
+implementation
+
+function IsAlphaChar(ch: WideChar): boolean;
+begin
+  {$IFDEF MSWINDOWS}
+    Result := IsCharAlphaW(ch);
+  {$ELSE}
+    // TODO: add chars > 255
+    case ch of
+      'A'..'Z',  // A-Z
+      'a'..'z',  // a-z
+      #170,#181,#186,
+      #192..#214,
+      #216..#246,
+      #248..#255:
+        Result := true;
+      else
+        Result := false;
+    end;
+  {$ENDIF}
+end;
+
+function IsNumericChar(ch: WideChar): boolean;
+begin
+  // ignore non-arabic numerals as we do not want to handle them
+  case ch of
+    '0'..'9':
+      Result := true;
+    else
+      Result := false;
+  end;
+end;
+
+function IsAlphaNumericChar(ch: WideChar): boolean;
+begin
+  Result := (IsAlphaChar(ch) or IsNumericChar(ch));
+end;
+
+function IsPunctuationChar(ch: WideChar): boolean;
+begin
+  // TODO: add chars > 255?
+  case ch of
+    ' '..'/',':'..'@','['..'`','{'..'~',
+    #160..#191,#215,#247:
+      Result := true;
+    else
+      Result := false;
+  end;
+end;
+
+function IsControlChar(ch: WideChar): boolean;
+begin
+  case ch of
+    #0..#31,
+    #127..#159:
+      Result := true;
+    else
+      Result := false;
+  end;
+end;
+
+function UTF8ToUCS4String(const str: UTF8String): UCS4String;
+begin
+  Result := WideStringToUCS4String(UTF8Decode(str));
+end;
+
+function UCS4ToUTF8String(const str: UCS4String): UTF8String;
+begin
+  Result := UTF8Encode(UCS4StringToWideString(str));
+end;
+
+end.
diff --git a/unicode/src/menu/UMenuText.pas b/unicode/src/menu/UMenuText.pas
index 3fc60384..24c7eae6 100644
--- a/unicode/src/menu/UMenuText.pas
+++ b/unicode/src/menu/UMenuText.pas
@@ -78,7 +78,7 @@ type
       procedure SetText(Value: string);
       property  Text: string read TextString write SetText;
 
-      procedure DeleteLastL; //Procedure to Delete Last Letter
+      procedure DeleteLastLetter; //Procedure to Delete Last Letter
 
       procedure Draw;
       constructor Create; overload;
@@ -88,8 +88,10 @@ type
 
 implementation
 
-uses UGraphic,
-     StrUtils;
+uses
+  UGraphic,
+  UUnicodeUtils,
+  StrUtils;
 
 procedure TText.SetSelect(Value: boolean);
 begin
@@ -242,17 +244,17 @@ begin
   AddBreak(LastBreak, Length(Value)+1);
 end;
 
-procedure TText.DeleteLastL;
+procedure TText.DeleteLastLetter;
 var
-  S: string;
-  L: integer;
+  Str: UCS4String;
+  Len: integer;
 begin
-  S := TextString;
-  L := Length(S);
-  if (L > 0) then
-    SetLength(S, L-1);
+  Str := UTF8ToUCS4String(TextString);
+  Len := Length(Str);
+  if (Len > 0) then
+    SetLength(Str, Len-1);
 
-  SetText(S);
+  SetText(UCS4ToUTF8String(Str));
 end;
 
 procedure TText.Draw;
diff --git a/unicode/src/screens/UScreenCredits.pas b/unicode/src/screens/UScreenCredits.pas
index 7e85c5d4..2fb73a81 100644
--- a/unicode/src/screens/UScreenCredits.pas
+++ b/unicode/src/screens/UScreenCredits.pas
@@ -138,17 +138,17 @@ const
   OUTRO_EXD_FILE          = 'outro-exit-dark.png';
 
   Timings: array[0..21] of Cardinal=(
-     20,   //  0 Delay vor Start
+     20,   //  0 Delay before Start
 
-    149,   //  1 Ende erster Intro Zoom
-    155,   //  2 Start 2. Action im Intro
-    170,   //  3 Ende Separation im Intro
-    271,   //  4 Anfang Zoomout im Intro
+    149,   //  1 End first Intro Zoom
+    155,   //  2 Start 2. Action in Intro
+    170,   //  3 End Separation in Intro
+    271,   //  4 beginning Zoomout in Intro
       0,   //  5 unused
-    261,   //  6 Start fade-to-white im Intro
+    261,   //  6 Start fade-to-white in Intro
 
     271,   //  7 Start Main Part
-    280,   //  8 Start On-Beat-Sternchen Main Part
+    280,   //  8 Start On-Beat-Star Main Part
 
     396,   //  9 Start BlindGuard
     666,   // 10 Start blindy
@@ -162,7 +162,7 @@ const
    2826,   // 18 Ende Whiteshark
    3096,   // 19 Start FadeOut Mainscreen
    3366,   // 20 Ende Credits Tune
-     60);  // 21 start flare im intro
+     60);  // 21 start flare in intro
 
 implementation
 
diff --git a/unicode/src/screens/UScreenEditHeader.pas b/unicode/src/screens/UScreenEditHeader.pas
index 5ff3dde5..edced1fa 100644
--- a/unicode/src/screens/UScreenEditHeader.pas
+++ b/unicode/src/screens/UScreenEditHeader.pas
@@ -150,7 +150,7 @@ begin
         begin
           T := Interaction - 2 + TextTitle;
           if (Interaction >= 2) and (Interaction <= 13) and (Length(Text[T].Text) >= 1) then begin
-            Text[T].DeleteLastL;
+            Text[T].DeleteLastLetter;
             SetRoundButtons;            
           end;
         end;
diff --git a/unicode/src/screens/UScreenName.pas b/unicode/src/screens/UScreenName.pas
index dd11b882..3debabc3 100644
--- a/unicode/src/screens/UScreenName.pas
+++ b/unicode/src/screens/UScreenName.pas
@@ -34,7 +34,13 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;
+  UMenu,
+  UDisplay,
+  UMusic,
+  UFiles,
+  SDL,
+  SysUtils,
+  UThemes;
 
 type
   TScreenName = class(TMenu)
@@ -48,7 +54,12 @@ type
 
 implementation
 
-uses UGraphic, UMain, UIni, UTexture, UCommon;
+uses
+  UGraphic,
+  UMain,
+  UIni,
+  UTexture,
+  UUnicodeUtils;
 
 
 function TScreenName.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
@@ -65,9 +76,10 @@ begin
 
     // check normal keys
     if (IsAlphaNumericChar(CharCode) or
-        {(CharCode in [' ','-','_','!',',','<','/','*','?','''','"']))} IsPunctuationChar(CharCode)) then
+        IsPunctuationChar(CharCode)) then
     begin
-      Button[Interaction].Text[0].Text := Button[Interaction].Text[0].Text + CharCode;
+      Button[Interaction].Text[0].Text := Button[Interaction].Text[0].Text +
+                                          UTF8Encode(CharCode);
       Exit;
     end;
 
@@ -186,7 +198,7 @@ begin
 
       SDLK_BACKSPACE:
         begin
-          Button[Interaction].Text[0].DeleteLastL;
+          Button[Interaction].Text[0].DeleteLastLetter;
         end;
 
       SDLK_ESCAPE :
diff --git a/unicode/src/screens/UScreenOpen.pas b/unicode/src/screens/UScreenOpen.pas
index 116fd175..8c03ba50 100644
--- a/unicode/src/screens/UScreenOpen.pas
+++ b/unicode/src/screens/UScreenOpen.pas
@@ -82,7 +82,7 @@ begin
         begin
             if Interaction = 0 then
             begin
-              Text[TextN].DeleteLastL;
+              Text[TextN].DeleteLastLetter;
             end;
         end;
 
diff --git a/unicode/src/screens/UScreenPartyPlayer.pas b/unicode/src/screens/UScreenPartyPlayer.pas
index d38a6435..799d00e5 100644
--- a/unicode/src/screens/UScreenPartyPlayer.pas
+++ b/unicode/src/screens/UScreenPartyPlayer.pas
@@ -221,7 +221,7 @@ begin
 
       SDLK_BACKSPACE:
         begin
-          Button[Interaction].Text[0].DeleteLastL;
+          Button[Interaction].Text[0].DeleteLastLetter;
         end;
 
       SDLK_ESCAPE:
diff --git a/unicode/src/screens/UScreenSongJumpto.pas b/unicode/src/screens/UScreenSongJumpto.pas
index a8679368..17696b20 100644
--- a/unicode/src/screens/UScreenSongJumpto.pas
+++ b/unicode/src/screens/UScreenSongJumpto.pas
@@ -92,7 +92,7 @@ begin
         begin
           if (Interaction = 0) AND (Length(Button[0].Text[0].Text) > 0) then
           begin
-            Button[0].Text[0].DeleteLastL;
+            Button[0].Text[0].DeleteLastLetter;
             SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
           end;
         end;
diff --git a/unicode/src/screens/UScreenSongMenu.pas b/unicode/src/screens/UScreenSongMenu.pas
index 7aa2e498..6febdcab 100644
--- a/unicode/src/screens/UScreenSongMenu.pas
+++ b/unicode/src/screens/UScreenSongMenu.pas
@@ -109,7 +109,7 @@ begin
       case PressedKey of
         SDLK_BACKSPACE:
           begin
-            Button[Interaction].Text[0].DeleteLastL;
+            Button[Interaction].Text[0].DeleteLastLetter;
             exit;
           end;
       end;
diff --git a/unicode/src/ultrastardx.dpr b/unicode/src/ultrastardx.dpr
index c7e330e0..d4664cfc 100644
--- a/unicode/src/ultrastardx.dpr
+++ b/unicode/src/ultrastardx.dpr
@@ -195,6 +195,7 @@ uses
   USingNotes        in 'base\USingNotes.pas',
 
   TextGL            in 'base\TextGL.pas',
+  UUnicodeUtils     in 'base\UUnicodeUtils.pas',
   UFont             in 'base\UFont.pas',
   UTextEncoding     in 'base\UTextEncoding.pas',