X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=63454eb1cb52dbf1ad6b6014a971926559679f5b;hb=2f4ef61a594006d1da7ec293ab72502d5d6ba241;hp=b5e771091280eeaaa43be238aedaea15d8b7b72c;hpb=e6b669503304e196d3337cbe236fbfcbfff9b5a1;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index b5e7710..63454eb 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -48,6 +48,7 @@ procedure g_Console_Clear;
 function  g_Console_CommandBlacklisted (C: AnsiString): Boolean;
 procedure g_Console_ReadConfig (filename: String);
 procedure g_Console_WriteConfig (filename: String);
+procedure g_Console_WriteGameConfig;
 
 function  g_Console_Interactive: Boolean;
 function  g_Console_Action (action: Integer): Boolean;
@@ -77,6 +78,7 @@ var
   gChatTeam: Boolean = false;
   gAllowConsoleMessages: Boolean = true;
   gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
+  gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
   gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
 
 implementation
@@ -125,6 +127,7 @@ var
   RecursionDepth: Word = 0;
   RecursionLimitHit: Boolean = False;
   Cons_Y: SmallInt;
+  ConsoleHeight: Single;
   Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
   Line: AnsiString;
   CPos: Word;
@@ -144,26 +147,28 @@ var
     down, up: SSArray;
   end;
   menu_toggled: BOOLEAN; (* hack for menu controls *)
-  gSkipFirstChar: Boolean; (* hack for console/chat input *)
 
 
 procedure g_Console_Switch;
 begin
+  if gConsoleShow or Cons_Shown or gChatShow then
+    g_Touch_ShowKeyboard(False);
   gChatShow := False;
   gConsoleShow := not gConsoleShow;
   Cons_Shown := True;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
 end;
 
 procedure g_Console_Chat_Switch (Team: Boolean = False);
 begin
+  if gConsoleShow or Cons_Shown or gChatShow then
+    g_Touch_ShowKeyboard(False);
   if not g_Game_IsNet then Exit;
   gConsoleShow := False;
   gChatShow := not gChatShow;
   gChatTeam := Team;
+  Cons_Shown := True;
   Line := '';
   CPos := 1;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
 end;
 
 // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
@@ -220,6 +225,8 @@ end;
 
 procedure boolVarHandler (me: PCommand; p: SSArray);
   procedure binaryFlag (var flag: Boolean; msg: AnsiString);
+  var
+    old: Boolean;
   begin
     if (Length(p) > 2) then
     begin
@@ -227,12 +234,15 @@ procedure boolVarHandler (me: PCommand; p: SSArray);
     end
     else
     begin
+      old := flag;
       case conGetBoolArg(p, 1) of
         -1: begin end;
          0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
          1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
          666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
       end;
+      if flag <> old then
+        g_Console_WriteGameConfig();
       if (Length(msg) = 0) then msg := p[0] else msg += ':';
       if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
     end;
@@ -243,24 +253,8 @@ end;
 
 
 procedure intVarHandler (me: PCommand; p: SSArray);
-  procedure binaryFlag (var flag: Boolean; msg: AnsiString);
-  begin
-    if (Length(p) > 2) then
-    begin
-      conwritefln('too many arguments to ''%s''', [p[0]]);
-    end
-    else
-    begin
-      case conGetBoolArg(p, 1) of
-        -1: begin end;
-         0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
-         1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
-         666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
-      end;
-      if (Length(msg) = 0) then msg := p[0] else msg += ':';
-      if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
-    end;
-  end;
+var
+  old: Integer;
 begin
   if (Length(p) <> 2) then
   begin
@@ -269,7 +263,10 @@ begin
   else
   begin
     try
+      old := PInteger(me.ptr)^;
       PInteger(me.ptr)^ := StrToInt(p[1]);
+      if PInteger(me.ptr)^ <> old then
+        g_Console_WriteGameConfig();
     except
       conwritefln('invalid integer value: "%s"', [p[1]]);
     end;
@@ -331,7 +328,7 @@ type
 procedure singleVarHandler (me: PCommand; p: SSArray);
 var
   pv: PVarSingle;
-  nv: Single;
+  nv, old: Single;
   msg: AnsiString;
 begin
   if (Length(p) > 2) then
@@ -340,6 +337,7 @@ begin
     exit;
   end;
   pv := PVarSingle(me.ptr);
+  old := pv.val^;
   if (Length(p) = 2) then
   begin
     if me.cheat and (not conIsCheatsEnabled) then begin conwriteln('not available'); exit; end;
@@ -361,6 +359,8 @@ begin
       pv.val^ := nv;
     end;
   end;
+  if pv.val^ <> old then
+    g_Console_WriteGameConfig();
   msg := me.msg;
   if (Length(msg) = 0) then msg := me.cmd else msg += ':';
   conwritefln('%s %s', [msg, pv.val^]);
@@ -648,6 +648,14 @@ begin
   end
 end;
 
+function QuoteStr(str: String): String;
+begin
+  if Pos(' ', str) > 0 then
+    Result := '"' + str + '"'
+  else
+    Result := str;
+end;
+
 procedure BindCommands (p: SSArray);
   var cmd, key: AnsiString; i: Integer;
 begin
@@ -663,7 +671,7 @@ begin
       if i < e_MaxInputKeys then
       begin
         if Length(p) = 2 then
-          g_Console_Add('"' + e_KeyNames[i] + '" = "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"')
+          g_Console_Add(QuoteStr(e_KeyNames[i]) + ' = ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(GetCommandString(gInputBinds[i].up)))
         else if Length(p) = 3 then
           g_Console_BindKey(i, p[2], '')
         else (* len = 4 *)
@@ -679,7 +687,7 @@ begin
   'bindlist':
     for i := 0 to e_MaxInputKeys - 1 do
       if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
-        g_Console_Add(e_KeyNames[i] + ' "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"');
+        g_Console_Add(e_KeyNames[i] + ' ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(GetCommandString(gInputBinds[i].up)));
   'unbind':
     // unbind <key>
     if Length(p) = 2 then
@@ -702,34 +710,24 @@ begin
   'hidekeyboard':
     g_Touch_ShowKeyboard(False);
   'togglemenu':
-    if gConsoleShow then
     begin
-      g_Console_Switch;
-      menu_toggled := True
-    end
-    else
-    begin
-      KeyPress(VK_ESCAPE);
+      if gConsoleShow then
+        g_Console_Switch
+      else if gChatShow then
+        g_Console_Chat_Switch
+      else
+        KeyPress(VK_ESCAPE);
       menu_toggled := True
     end;
   'toggleconsole':
-    begin
-      g_Console_Switch;
-      gSkipFirstChar := g_Console_Interactive();
-    end;
+    g_Console_Switch;
   'togglechat':
-    begin
-      if not gConsoleShow and (g_ActiveWindow = nil) then
-        g_Console_Chat_Switch;
-      gSkipFirstChar := not g_Console_Interactive()
-    end;
+    if not gConsoleShow and (g_ActiveWindow = nil) then
+      g_Console_Chat_Switch;
   'toggleteamchat':
     if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
-    begin
       if not gConsoleShow and (g_ActiveWindow = nil) then
         g_Console_Chat_Switch(True);
-      gSkipFirstChar := not g_Console_Interactive()
-    end;
   end
 end;
 
@@ -794,7 +792,7 @@ procedure g_Console_Init();
     a: Integer;
 begin
   g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
-  Cons_Y := -(gScreenHeight div 2);
+  Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
   gConsoleShow := False;
   gChatShow := False;
   Cons_Shown := False;
@@ -975,6 +973,7 @@ begin
   g_Console_ResetBinds;
   g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
   g_Console_ReadConfig(GameDir + '/autoexec.cfg');
+  gParsingBinds := False;
 
   g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
   g_Console_Add('');
@@ -988,23 +987,31 @@ begin
   begin
   // Â ïðîöåññå îòêðûòèÿ:
     if gConsoleShow and (Cons_Y < 0) then
-    begin
       Cons_Y := Cons_Y+Step;
-    end;
 
   // Â ïðîöåññå çàêðûòèÿ:
-    if (not gConsoleShow) and
-       (Cons_Y > -(gScreenHeight div 2)) then
+    if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then
       Cons_Y := Cons_Y-Step;
 
+    // Open chat
+    if gChatShow then
+    begin
+      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
+      Cons_Shown := False;
+      g_Touch_ShowKeyboard(True);
+    end;
+
   // Îêîí÷àòåëüíî îòêðûëàñü:
     if Cons_Y > 0 then
+    begin
       Cons_Y := 0;
+      g_Touch_ShowKeyboard(True);
+    end;
 
   // Îêîí÷àòåëüíî çàêðûëàñü:
-    if Cons_Y <= (-(gScreenHeight div 2)) then
+    if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then
     begin
-      Cons_Y := -(gScreenHeight div 2);
+      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
       Cons_Shown := False;
     end;
   end;
@@ -1081,7 +1088,7 @@ var
 
 begin
   e_TextureFontGetSize(gStdFont, CWidth, CHeight);
-  ty := (gScreenHeight div 2)-4-2*CHeight-Abs(Cons_Y);
+  ty := Floor(gScreenHeight * ConsoleHeight) - 4 - 2 * CHeight - Abs(Cons_Y);
   skip := conSkipLines;
   cbufLastLine(sp, ep);
   repeat
@@ -1129,13 +1136,13 @@ begin
   begin
     e_CharFont_GetSize(gMenuFont, DEBUG_STRING, mfW, mfH);
     a := (gScreenWidth - 2*mfW) div 2;
-    b := Cons_Y + ((gScreenHeight div 2) - 2*mfH) div 2;
+    b := Cons_Y + (Floor(gScreenHeight * ConsoleHeight) - 2 * mfH) div 2;
     e_CharFont_PrintEx(gMenuFont, a div 2, b div 2, DEBUG_STRING,
                        _RGB(128, 0, 0), 2.0);
   end;
 
-  e_DrawSize(ID, 0, Cons_Y, Alpha, False, False, gScreenWidth, gScreenHeight div 2);
-  e_TextureFontPrint(0, Cons_Y+(gScreenHeight div 2)-CHeight-4, '> '+Line, gStdFont);
+  e_DrawSize(ID, 0, Cons_Y, Alpha, False, False, gScreenWidth, Floor(gScreenHeight * ConsoleHeight));
+  e_TextureFontPrint(0, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - CHeight - 4, '> ' + Line, gStdFont);
 
   drawConsoleText();
   (*
@@ -1143,8 +1150,8 @@ begin
   begin
     b := 0;
     if CHeight > 0 then
-      if Length(ConsoleHistory) > ((gScreenHeight div 2) div CHeight)-1 then
-        b := Length(ConsoleHistory)-((gScreenHeight div 2) div CHeight)+1;
+      if Length(ConsoleHistory) > (Floor(gScreenHeight * ConsoleHeight) div CHeight) - 1 then
+        b := Length(ConsoleHistory) - (Floor(gScreenHeight * ConsoleHeight) div CHeight) + 1;
 
     b := Max(b-Offset, 0);
     d := Max(High(ConsoleHistory)-Offset, 0);
@@ -1152,24 +1159,19 @@ begin
     c := 2;
     for a := d downto b do
     begin
-      e_TextureFontPrintFmt(0, (gScreenHeight div 2)-4-c*CHeight-Abs(Cons_Y), ConsoleHistory[a],
-                           gStdFont, True);
+      e_TextureFontPrintFmt(0, Floor(gScreenHeight * ConsoleHeight) - 4 - c * CHeight - Abs(Cons_Y), ConsoleHistory[a], gStdFont, True);
       c := c + 1;
     end;
   end;
   *)
 
-  e_TextureFontPrint((CPos+1)*CWidth, Cons_Y+(gScreenHeight div 2)-21, '_', gStdFont);
+  e_TextureFontPrint((CPos + 1) * CWidth, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - 21, '_', gStdFont);
 end;
 
 procedure g_Console_Char(C: AnsiChar);
 begin
-  if not gSkipFirstChar then
-  begin
-    Insert(C, Line, CPos);
-    CPos := CPos + 1;
-  end;
-  gSkipFirstChar := False
+  Insert(C, Line, CPos);
+  CPos := CPos + 1;
 end;
 
 
@@ -1309,7 +1311,7 @@ begin
         CPos := CPos + 1;
     IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE, JOY0_ATTACK, JOY1_ATTACK, JOY2_ATTACK, JOY3_ATTACK:
     begin
-      if Cons_Shown then
+      if gConsoleShow then
         g_Console_Process(Line)
       else
         if gChatShow then
@@ -1336,9 +1338,8 @@ begin
 
           Line := '';
           CPos := 1;
-          gChatShow := False;
           gJustChatted := True;
-          g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+          g_Console_Chat_Switch
         end;
     end;
     IK_TAB:
@@ -1376,21 +1377,6 @@ begin
     IK_SEMICOLON, IK_QUOTE, IK_BACKSLASH, IK_SLASH, IK_COMMA, IK_DOT, IK_EQUALS,
     IK_0, IK_1, IK_2, IK_3, IK_4, IK_5, IK_6, IK_7, IK_8, IK_9, IK_MINUS, IK_EQUALS:
       (* see TEXTINPUT event *)
-  else
-    if not gSkipFirstChar then
-    begin
-      if gConsoleShow and g_Console_MatchBind(K, 'toggleconsole') then
-        g_Console_Switch;
-
-      if g_Console_MatchBind(K, 'togglemenu') then
-      begin
-        menu_toggled := True;
-        if gChatShow then
-          g_Console_Chat_Switch
-        else if gConsoleShow then
-          g_Console_Switch
-      end
-    end
   end
 end;
 
@@ -1668,8 +1654,9 @@ begin
   if key > 0 then
   begin
     gInputBinds[key].down := ParseAlias(down);
-    gInputBinds[key].up := ParseAlias(up)
-  end
+    gInputBinds[key].up := ParseAlias(up);
+  end;
+  g_Console_WriteGameConfig();
 end;
 
 function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
@@ -1725,17 +1712,33 @@ begin
   Result := i < len
 end;
 
+function BindsAllowed (key: Integer): Boolean;
+begin
+  Result := False;
+  if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
+  begin
+    if gChatShow then
+      Result := g_Console_MatchBind(key, 'togglemenu') or
+                g_Console_MatchBind(key, 'showkeyboard') or
+                g_Console_MatchBind(key, 'hidekeyboard')
+    else if gConsoleShow or (g_ActiveWindow <> nil) or (gGameSettings.GameType = GT_NONE) then
+      Result := g_Console_MatchBind(key, 'togglemenu') or
+                g_Console_MatchBind(key, 'toggleconsole') or
+                g_Console_MatchBind(key, 'showkeyboard') or
+                g_Console_MatchBind(key, 'hidekeyboard')
+    else (* in game *)
+      Result := True
+  end
+end;
+
 procedure g_Console_ProcessBind (key: Integer; down: Boolean);
   var i: Integer;
 begin
-  if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
+  if BindsAllowed(key) then
   begin
     if down then
-    begin
-      if not gChatShow then
-        for i := 0 to High(gInputBinds[key].down) do
-          g_Console_Process(gInputBinds[key].down[i], True);
-    end
+      for i := 0 to High(gInputBinds[key].down) do
+        g_Console_Process(gInputBinds[key].down[i], True)
     else
       for i := 0 to High(gInputBinds[key].up) do
         g_Console_Process(gInputBinds[key].up[i], True)
@@ -1848,10 +1851,10 @@ begin
         while (i <= len) and (s[i] <= ' ') do inc(i);
         (* skip comments *)
         if (i <= len) and ((s[i] <> '#') and ((i + 1 > len) or (s[i] <> '/') or (s[i + 1] <> '/'))) then
-          g_Console_Process(s, True)
+          g_Console_Process(s, True);
       end
     end;
-    CloseFile(f)
+    CloseFile(f);
   end
 end;
 
@@ -1864,7 +1867,14 @@ begin
   WriteLn(f, 'unbindall');
   for i := 0 to e_MaxInputKeys - 1 do
     if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then
-      WriteLn(f, 'bind ', e_KeyNames[i], ' "', GetCommandString(gInputBinds[i].down), '" "', GetCommandString(gInputBinds[i].up), '"');
+    begin
+      Write(f, 'bind ', e_KeyNames[i], ' ', QuoteStr(GetCommandString(gInputBinds[i].down)));
+      if Length(gInputBinds[i].down) = 0 then
+        Write(f, '""');
+      if Length(gInputBinds[i].up) > 0 then
+        Write(f, ' ', QuoteStr(GetCommandString(gInputBinds[i].up)));
+      WriteLn(f, '');
+    end;
   for i := 0 to High(commands) do
   begin
     if not commands[i].cheat then
@@ -1872,20 +1882,33 @@ begin
       if @commands[i].procEx = @boolVarHandler then
       begin
         if PBoolean(commands[i].ptr)^ then j := 1 else j := 0;
-        WriteLn(f, commands[i].cmd, ' "', j, '"')
+        WriteLn(f, commands[i].cmd, ' ', j)
       end
       else if @commands[i].procEx = @intVarHandler then
       begin
-        WriteLn(f, commands[i].cmd, ' "', PInteger(commands[i].ptr)^, '"')
+        WriteLn(f, commands[i].cmd, ' ', PInteger(commands[i].ptr)^)
       end
       else if @commands[i].procEx = @singleVarHandler then
       begin
-        WriteLn(f, commands[i].cmd, ' "', PVarSingle(commands[i].ptr).val^:0:6, '"')
+        WriteLn(f, commands[i].cmd, ' ', PVarSingle(commands[i].ptr).val^:0:6)
       end
     end
   end;
   CloseFile(f)
 end;
 
+procedure g_Console_WriteGameConfig;
+begin
+  if gParsingBinds then
+    Exit;
+  g_Console_WriteConfig(GameDir + '/dfconfig.cfg');
+end;
 
+initialization
+  conRegVar('console_height', @ConsoleHeight, 0.0, 1.0, 'set console size', 'set console size');
+{$IFDEF ANDROID}
+  ConsoleHeight := 0.35
+{$ELSE}
+  ConsoleHeight := 0.5
+{$ENDIF}
 end.