Little changes in alt vkbd layout

[d2df-sdl.git] / src / game / g_touch.pas

diff --git a/src/game/g_touch.pas b/src/game/g_touch.pas
index 8519f0d4c1dc3dc7d120103e1df23ecb49b50dc7..9256fb8e79411f362c9873beeb7dc11114c49086 100644 (file)
--- a/src/game/g_touch.pas
+++ b/src/game/g_touch.pas
@@ -22,8 +22,9 @@ interface
     SDL2;
 
   var
-    g_touch_size: Single;
-    g_touch_fire: Boolean;
+    g_touch_size: Single = 1.0;
+    g_touch_offset: Single = 50;
+    g_touch_fire: Boolean = True;
 
   procedure g_Touch_Init;
   procedure g_Touch_ShowKeyboard(yes: Boolean);
@@ -55,27 +56,28 @@ implementation
     sw := gScreenWidth; sh := gScreenHeight;
     if jab then
     begin
-      w := sz div 2; h := sz div 3;
+      w := sz div 2; h := sz div 2;
       case key of
-        VK_CONSOLE: begin x := 0;                y := 0 end;
-        VK_ESCAPE:  begin x := sw - w - 1;       y := 0 end;
-        VK_CHAT:    begin x := sw div 2 - w - 4; y := 0 end;
-        VK_TEAM:    begin x := sw div 2 + 0 + 4; y := 0 end;
+        VK_CONSOLE: begin x := 0; y := 0 end;
+        VK_ESCAPE:  begin x := sw - w - 1; y := 0 end;
+        VK_CHAT:    begin x := sw div 2 - w div 2 - w; y := 0 end;
+        VK_STATUS:  begin x := sw div 2 - w div 2 + 0; y := 0 end;
+        VK_TEAM:    begin x := sw div 2 - w div 2 + w; y := 0 end;
+        VK_PREV:    begin x := 0; y := sh - 4*sz - 1; w := sz end;
+        VK_NEXT:    begin x := sw - w - 1; y := sh - 4*sz - 1; w := sz end;
       else
-        w := sz; h := sz * 2;
+        w := sz; h := sz * 3;
         case key of
           VK_LEFT:  begin x := 0; y := sh - h - 1 end;
           VK_RIGHT: begin x := w; y := sh - h - 1 end;
         else
           w := sz; h := sz;
           case key of
-            VK_OPEN: begin h := sz;       x := sw - 1*w - 1; y := sh - 1*h - 1 end;
-            VK_JUMP: begin h := sz;       x := sw - 1*w - 1; y := sh - 2*h - 1 end;
-            VK_UP:   begin h := sz div 2; x := sw - 2*w - 1; y := sh - 2*sz - 1 end;
-            VK_FIRE: begin h := sz;       x := sw - 2*w - 1; y := sh - sz div 2 - sz - 1 end;
-            VK_DOWN: begin h := sz div 2; x := sw - 2*w - 1; y := sh - sz div 2 - 1 end;
-            VK_PREV: begin h := sz div 2; x := 0;            y := sh - 3*sz - 1 end;
-            VK_NEXT: begin h := sz div 2; x := sw - w - 1;   y := sh - 3*sz - 1 end;
+            VK_UP:   begin x := sw - 2*w - 1; y := sh - 3*h - 1 end;
+            VK_FIRE: begin x := sw - 2*w - 1; y := sh - 2*h - 1 end;
+            VK_DOWN: begin x := sw - 2*w - 1; y := sh - 1*h - 1 end;
+            VK_OPEN: begin x := sw - 1*w - 1; y := sh - 1*h - h div 2 - 1 end;
+            VK_JUMP: begin x := sw - 1*w - 1; y := sh - 2*h - h div 2 - 1 end;
           else
             founded := false
           end
@@ -84,21 +86,21 @@ implementation
     end
     else
     begin
-      x := 0; y := 0; w := sz; h := sz;
+      x := 0; y := Round(sh * g_touch_offset / 100); w := sz; h := sz;
       case key of
-        VK_LSTRAFE: begin x := 0;            y := sh div 2 - h div 2; w := w div 2 end;
-        VK_LEFT:    begin x := w div 2;      y := sh div 2 - h div 2 end;
-        VK_RIGHT:   begin x := w div 2 + 1*w;y := sh div 2 - h div 2 end;
-        VK_RSTRAFE: begin x := w div 2 + 2*w;y := sh div 2 - h div 2; w := w div 2 end;
-        VK_UP:      begin x := sw - w - 1;   y := sh div 2 - h div 2 - h end;
-        VK_FIRE:    begin x := sw - 1*w - 1; y := sh div 2 - h div 2 end;
-        VK_DOWN:    begin x := sw - w - 1;   y := sh div 2 - h div 2 + h end;
-        VK_NEXT:    begin x := sw - 2*w - 1; y := sh div 2 - h div 2 - h end;
-        VK_JUMP:    begin x := sw - 2*w - 1; y := sh div 2 - h div 2 end;
-        VK_PREV:    begin x := sw - 3*w - 1; y := sh div 2 - h div 2 - h end;
-        VK_OPEN:    begin x := sw - 3*w - 1; y := sh div 2 - h div 2 end;
+        VK_LSTRAFE: begin x := 0;             y := y - h div 2; w := w div 2 end;
+        VK_LEFT:    begin x := w div 2;       y := y - h div 2 end;
+        VK_RIGHT:   begin x := w div 2 + 1*w; y := y - h div 2 end;
+        VK_RSTRAFE: begin x := w div 2 + 2*w; y := y - h div 2; w := w div 2 end;
+        VK_UP:      begin x := sw - w - 1;    y := y - h div 2 - h end;
+        VK_FIRE:    begin x := sw - 1*w - 1;  y := y - h div 2 end;
+        VK_DOWN:    begin x := sw - w - 1;    y := y - h div 2 + h end;
+        VK_NEXT:    begin x := sw - 2*w - 1;  y := y - h div 2 - h end;
+        VK_JUMP:    begin x := sw - 2*w - 1;  y := y - h div 2 end;
+        VK_PREV:    begin x := sw - 3*w - 1;  y := y - h div 2 - h end;
+        VK_OPEN:    begin x := sw - 3*w - 1;  y := y - h div 2 end;
       else
-        w := sz div 2; h := sz div 2;
+        x := 0; y := 0; w := sz div 2; h := sz div 2;
         case key of
           VK_0:       begin x := sw div 2 - w div 2 - 5*w - 1; y := sh - 1*h - 1 end;
           VK_1:       begin x := sw div 2 - w div 2 - 4*w - 1; y := sh - 1*h - 1 end;
@@ -317,7 +319,6 @@ initialization
   conRegVar('touch_enable', @enabled, 'enable/disable virtual buttons', 'draw buttons');
   conRegVar('touch_fire', @g_touch_fire, 'enable/disable fire when press virtual up/down', 'fire when press up/down');
   conRegVar('touch_size', @g_touch_size, 0.1, 10, 'size of virtual buttons', 'button size');
+  conRegVar('touch_offset', @g_touch_offset, 0, 100, '', '');
   conRegVar('touch_alt', @jab, 'althernative virtual buttons layout', 'althernative layout');
 end.
-
-