X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=edf484f1dd8177dc59170710d0c48c6f4efeffb7;hp=a0839f3d3d0a2dba96e743b4f0b33cc8f6bc4521;hb=bccf523c0320f1f8f33edb72caec0a67cfa2e422;hpb=4de34c0c003869d8f125768be330702020f3c514

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index a0839f3..edf484f 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -37,21 +37,22 @@ uses
     FIRST_ACTION = ACTION_JUMP;
     LAST_ACTION = ACTION_WEAPPREV;
 
-procedure g_Console_Init ();
-procedure g_Console_Update ();
-procedure g_Console_Draw ();
-procedure g_Console_Switch ();
+procedure g_Console_Init;
+procedure g_Console_Update;
+procedure g_Console_Draw;
 procedure g_Console_Char (C: AnsiChar);
 procedure g_Console_Control (K: Word);
 procedure g_Console_Process (L: AnsiString; quiet: Boolean=false);
 procedure g_Console_Add (L: AnsiString; show: Boolean=false);
-procedure g_Console_Clear ();
+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;
+function  g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
 function  g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
 procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
 procedure g_Console_ProcessBind (key: Integer; down: Boolean);
@@ -60,15 +61,13 @@ procedure g_Console_ResetBinds;
 procedure conwriteln (const s: AnsiString; show: Boolean=false);
 procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean=false);
 
-// <0: no arg; 0/1: true/false
-function conGetBoolArg (p: SSArray; idx: Integer): Integer;
-
-procedure g_Console_Chat_Switch (team: Boolean=false);
-
 procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 
+// <0: no arg; 0/1: true/false
+function conGetBoolArg (p: SSArray; idx: Integer): Integer;
+
 // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
 function conParseFloat (var res: Single; const s: AnsiString): Boolean;
 
@@ -79,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
@@ -86,7 +86,7 @@ implementation
 uses
   g_textures, g_main, e_graphics, e_input, g_game,
   SysUtils, g_basic, g_options, Math, g_touch,
-  g_menu, g_language, g_net, g_netmsg, e_log, conbuf;
+  g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf;
 
 
 type
@@ -145,9 +145,29 @@ var
   gInputBinds: Array [0..e_MaxInputKeys - 1] of record
     down, up: SSArray;
   end;
-  menu_toggled: BOOLEAN;
+  menu_toggled: BOOLEAN; (* hack for menu controls *)
+  gSkipFirstChar: Boolean; (* hack for console/chat input *)
 
 
+procedure g_Console_Switch;
+begin
+  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 not g_Game_IsNet then Exit;
+  gConsoleShow := False;
+  gChatShow := not gChatShow;
+  gChatTeam := Team;
+  Line := '';
+  CPos := 1;
+  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+end;
+
 // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
 function conParseFloat (var res: Single; const s: AnsiString): Boolean;
 var
@@ -202,6 +222,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
@@ -209,12 +231,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;
@@ -225,24 +250,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
@@ -251,7 +260,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;
@@ -313,7 +325,7 @@ type
 procedure singleVarHandler (me: PCommand; p: SSArray);
 var
   pv: PVarSingle;
-  nv: Single;
+  nv, old: Single;
   msg: AnsiString;
 begin
   if (Length(p) > 2) then
@@ -322,6 +334,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;
@@ -343,6 +356,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^]);
@@ -630,6 +645,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
@@ -645,7 +668,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 *)
@@ -661,7 +684,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
@@ -684,11 +707,34 @@ begin
   'hidekeyboard':
     g_Touch_ShowKeyboard(False);
   'togglemenu':
+    if gConsoleShow then
+    begin
+      g_Console_Switch;
+      menu_toggled := True
+    end
+    else
     begin
-      // this is HACK
       KeyPress(VK_ESCAPE);
       menu_toggled := True
     end;
+  'toggleconsole':
+    begin
+      g_Console_Switch;
+      gSkipFirstChar := g_Console_Interactive();
+    end;
+  'togglechat':
+    begin
+      if not gConsoleShow and (g_ActiveWindow = nil) then
+        g_Console_Chat_Switch;
+      gSkipFirstChar := not g_Console_Interactive()
+    end;
+  '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;
 
@@ -775,6 +821,9 @@ begin
   AddCommand('showkeyboard', BindCommands);
   AddCommand('hidekeyboard', BindCommands);
   AddCommand('togglemenu', BindCommands);
+  AddCommand('toggleconsole', BindCommands);
+  AddCommand('togglechat', BindCommands);
+  AddCommand('toggleteamchat', BindCommands);
 
   AddCommand('clear', ConsoleCommands, 'clear console');
   AddCommand('clearhistory', ConsoleCommands);
@@ -807,7 +856,6 @@ begin
   AddCommand('p2_name', GameCVars);
   AddCommand('p1_color', GameCVars);
   AddCommand('p2_color', GameCVars);
-  AddCommand('r_showtime', GameCVars);
   AddCommand('r_showscore', GameCVars);
   AddCommand('r_showlives', GameCVars);
   AddCommand('r_showstat', GameCVars);
@@ -876,8 +924,6 @@ begin
   AddCommand('clientlist', GameCommands);
   AddCommand('event', GameCommands);
   AddCommand('screenshot', GameCommands);
-  AddCommand('togglechat', GameCommands);
-  AddCommand('toggleteamchat', GameCommands);
   AddCommand('weapon', GameCommands);
   AddCommand('p1_weapon', GameCommands);
   AddCommand('p2_weapon', GameCommands);
@@ -934,6 +980,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('');
@@ -1121,31 +1168,14 @@ begin
   e_TextureFontPrint((CPos+1)*CWidth, Cons_Y+(gScreenHeight div 2)-21, '_', gStdFont);
 end;
 
-procedure g_Console_Switch();
-begin
-  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 not g_Game_IsNet then Exit;
-  gConsoleShow := False;
-  gChatShow := not gChatShow;
-  gChatTeam := Team;
-  Line := '';
-  CPos := 1;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
-end;
-
 procedure g_Console_Char(C: AnsiChar);
 begin
-//  if gChatShow then
-//    Exit;
-  Insert(C, Line, CPos);
-  CPos := CPos + 1;
+  if not gSkipFirstChar then
+  begin
+    Insert(C, Line, CPos);
+    CPos := CPos + 1;
+  end;
+  gSkipFirstChar := False
 end;
 
 
@@ -1348,7 +1378,26 @@ begin
       CPos := 1;
     IK_END, IK_KPEND:
       CPos := Length(Line) + 1;
-  end;
+    IK_A..IK_Z, IK_SPACE, IK_SHIFT, IK_RSHIFT, IK_CAPSLOCK, IK_LBRACKET, IK_RBRACKET,
+    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;
 
 function GetStr(var Str: AnsiString): AnsiString;
@@ -1625,12 +1674,12 @@ 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_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
-  var i: Integer;
+function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
 
   function EqualsCommandLists (a, b: SSArray): Boolean;
     var i, len: Integer;
@@ -1646,6 +1695,14 @@ function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''):
     end
   end;
 
+begin
+  ASSERT(key >= 0);
+  ASSERT(key < e_MaxInputKeys);
+  result := EqualsCommandLists(ParseAlias(down), gInputBinds[key].down) and EqualsCommandLists(ParseAlias(up), gInputBinds[key].up)
+end;
+
+function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
+  var i: Integer;
 begin
   ASSERT(n >= 1);
   result := 0;
@@ -1653,13 +1710,10 @@ begin
   i := 0;
   while (n >= 1) and (i < e_MaxInputKeys) do
   begin
-    if EqualsCommandLists(ParseAlias(down), gInputBinds[i].down) then
+    if g_Console_MatchBind(i, down, up) then
     begin
-      if EqualsCommandLists(ParseAlias(up), gInputBinds[i].up) then
-      begin
-        result := i;
-        dec(n)
-      end
+      result := i;
+      dec(n)
     end;
     inc(i)
   end;
@@ -1681,11 +1735,14 @@ end;
 procedure g_Console_ProcessBind (key: Integer; down: Boolean);
   var i: Integer;
 begin
-  if (not gChatShow) and (not gConsoleShow) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
+  if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
   begin
     if down then
-      for i := 0 to High(gInputBinds[key].down) do
-        g_Console_Process(gInputBinds[key].down[i], True)
+    begin
+      if not gChatShow then
+        for i := 0 to High(gInputBinds[key].down) do
+          g_Console_Process(gInputBinds[key].down[i], True);
+    end
     else
       for i := 0 to High(gInputBinds[key].up) do
         g_Console_Process(gInputBinds[key].up[i], True)
@@ -1701,6 +1758,7 @@ begin
   for i := 0 to e_MaxInputKeys - 1 do
     g_Console_BindKey(i, '', '');
 
+  g_Console_BindKey(IK_GRAVE, 'toggleconsole');
   g_Console_BindKey(IK_ESCAPE, 'togglemenu');
   g_Console_BindKey(IK_A, '+p1_moveleft', '-p1_moveleft');
   g_Console_BindKey(IK_D, '+p1_moveright', '-p1_moveright');
@@ -1746,8 +1804,7 @@ begin
     g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu');
   end;
 
-  // HACK: VK_ESCAPE always used as togglemenu, so don't touch it!
-  // VK_CONSOLE
+  g_Console_BindKey(VK_ESCAPE, 'togglemenu');
   g_Console_BindKey(VK_LSTRAFE, '+moveleft; +strafe', '-moveleft; -strafe');
   g_Console_BindKey(VK_RSTRAFE, '+moveright; +strafe', '-moveright; -strafe');
   g_Console_BindKey(VK_LEFT, '+moveleft', '-moveleft');
@@ -1773,6 +1830,7 @@ begin
   g_Console_BindKey(VK_A, 'weapon 11');
   g_Console_BindKey(VK_CHAT, 'togglechat');
   g_Console_BindKey(VK_TEAM, 'toggleteamchat');
+  g_Console_BindKey(VK_CONSOLE, 'toggleconsole');
   g_Console_BindKey(VK_PRINTSCR, 'screenshot');
   g_Console_BindKey(VK_STATUS, '+scores', '-scores');
   g_Console_BindKey(VK_SHOWKBD, 'showkeyboard');
@@ -1797,10 +1855,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;
 
@@ -1813,7 +1871,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
@@ -1821,20 +1886,26 @@ 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;
 
 end.