Support for non-US (QWERTY) keyboard layout.

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

1 files changed, 30 insertions, 21 deletions

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 9c64c01b..6d05c145 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -134,19 +134,43 @@ begin
   Result := true;
   If (PressedDown) Then
   begin // Key Down
-    case PressedKey of
-      SDLK_Q:
-        begin
+    // check normal keys
+    case WideUpperCase(CharCode)[1] of

+      'Q':
+        begin

           //When not ask before Exit then Finish now
           if (Ini.AskbeforeDel <> 1) then
             Finish
-          //else just Pause and let the Popup make the Work  
+          //else just Pause and let the Popup make the Work
           else if not paused then
             Pause;
-          
+
           Result := false;
+          Exit;
+        end;
+      'V': //Show Visualization

+        begin
+          fShowVisualization := not fShowVisualization;
+
+          if fShowVisualization then
+            fCurrentVideoPlaybackEngine := Visualization
+          else
+            fCurrentVideoPlaybackEngine := VideoPlayback;
+
+          if fShowVisualization then
+            fCurrentVideoPlaybackEngine.play;
+
+          Exit;  
+        end;
+      'P':

+        begin
+          Pause;
+          Exit;
         end;
+    end;

 
+    // check special keys
+    case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
@@ -158,26 +182,11 @@ begin
           FadeTo(@ScreenScore);
         end;
 
-      SDLK_P,
-      SDLK_SPACE://Pause Mod
+      SDLK_SPACE:
         begin
           Pause;
         end;
 
-      SDLK_V: //Show Visualization
-        begin
-          fShowVisualization := not fShowVisualization;
-
-          if fShowVisualization then
-            fCurrentVideoPlaybackEngine := Visualization
-          else
-            fCurrentVideoPlaybackEngine := VideoPlayback;
-
-          if fShowVisualization then
-            fCurrentVideoPlaybackEngine.play;
-
-        end;
-
       SDLK_TAB: //Change Visualization Preset
         begin
           if fShowVisualization then