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

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index ecc6677..edf484f 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -22,60 +22,52 @@ uses
   utils; // for SSArray
 
   const
-    ACTION_MOVEUP = 1;
-    ACTION_MOVEDOWN = 2;
-    ACTION_MOVELEFT = 3;
-    ACTION_MOVERIGHT = 4;
-    ACTION_SPEED = 5;
+    ACTION_JUMP = 0;
+    ACTION_MOVELEFT = 1;
+    ACTION_MOVERIGHT = 2;
+    ACTION_LOOKDOWN = 3;
+    ACTION_LOOKUP = 4;
+    ACTION_ATTACK = 5;
     ACTION_SCORES = 6;
-    ACTION_LOOKDOWN = 7;
-    ACTION_LOOKUP = 8;
-    ACTION_ATTACK = 9;
-    ACTION_ACTIVATE = 10;
-    ACTION_STRAFE = 11;
-    ACTION_WEAPNEXT = 12;
-    ACTION_WEAPPREV = 13;
-    ACTION_WEAP1 = 14;
-    ACTION_WEAP2 = 15;
-    ACTION_WEAP3 = 16;
-    ACTION_WEAP4 = 17;
-    ACTION_WEAP5 = 18;
-    ACTION_WEAP6 = 19;
-    ACTION_WEAP7 = 20;
-    ACTION_WEAP8 = 21;
-    ACTION_WEAP9 = 22;
-    ACTION_WEAP10 = 23;
-    ACTION_WEAP11 = 24;
-
-    LAST_ACTION = ACTION_WEAP11;
-    MAX_ACTION_WEAP = ACTION_WEAP11 - ACTION_WEAP1 + 1;
-
-procedure g_Console_Init ();
-procedure g_Console_Update ();
-procedure g_Console_Draw ();
-procedure g_Console_Switch ();
+    ACTION_ACTIVATE = 7;
+    ACTION_STRAFE = 8;
+    ACTION_WEAPNEXT = 9;
+    ACTION_WEAPPREV = 10;
+
+    FIRST_ACTION = ACTION_JUMP;
+    LAST_ACTION = ACTION_WEAPPREV;
+
+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);
+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;
 
@@ -85,8 +77,8 @@ var
   gChatShow: Boolean = false;
   gChatTeam: Boolean = false;
   gAllowConsoleMessages: Boolean = true;
-  gChatEnter: Boolean = true;
   gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
+  gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
   gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
 
 implementation
@@ -94,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
@@ -112,6 +104,8 @@ type
     ptr: Pointer; // various data
     msg: AnsiString; // message for var changes
     cheat: Boolean;
+    action: Integer; // >= 0 for action commands
+    player: Integer; // used for action commands
   end;
 
   TAlias = record
@@ -147,11 +141,32 @@ var
                               Msg: AnsiString;
                               Time: Word;
                             end;
+
   gInputBinds: Array [0..e_MaxInputKeys - 1] of record
-    cmd: AnsiString
+    down, up: SSArray;
   end;
-  bindDown, bindProcess: 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;
@@ -207,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
@@ -214,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;
@@ -230,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
@@ -256,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;
@@ -280,6 +287,8 @@ begin
   cp.ptr := pvar;
   cp.msg := amsg;
   cp.cheat := acheat;
+  cp.action := -1;
+  cp.player := -1;
 end;
 
 
@@ -299,6 +308,8 @@ begin
   cp.ptr := pvar;
   cp.msg := amsg;
   cp.cheat := acheat;
+  cp.action := -1;
+  cp.player := -1;
 end;
 
 
@@ -314,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
@@ -323,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;
@@ -344,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^]);
@@ -372,6 +386,8 @@ begin
   cp.ptr := pv;
   cp.msg := amsg;
   cp.cheat := acheat;
+  cp.action := -1;
+  cp.player := -1;
 end;
 
 
@@ -514,14 +530,20 @@ begin
   begin
     // exec <filename>
     if Length(p) = 2 then
-    begin
-      s := GameDir + '/' + p[1];
-      g_Console_ReadConfig(s);
-    end
+      g_Console_ReadConfig(GameDir + '/' + p[1])
     else
       g_Console_Add('exec <script file>');
   end;
 
+  if cmd = 'writeconfig' then
+  begin
+    // writeconfig <filename>
+    if Length(p) = 2 then
+      g_Console_WriteConfig(GameDir + '/' + p[1])
+    else
+      g_Console_Add('writeconfig <file>');
+  end;
+
   if (cmd = 'ver') or (cmd = 'version') then
   begin
     conwriteln('Doom 2D: Forever v. ' + GAME_VERSION);
@@ -593,9 +615,6 @@ begin
     else
       g_Console_Add('call <alias name>');
   end;
-
-  if cmd = '//' then
-    Exit;
 end;
 
 procedure WhitelistCommand(cmd: AnsiString);
@@ -607,25 +626,6 @@ begin
   Whitelist[a] := LowerCase(cmd);
 end;
 
-procedure AddCommand(cmd: AnsiString; proc: TCmdProc; ahelp: AnsiString=''; ahidden: Boolean=false; acheat: Boolean=false);
-var
-  a: Integer;
-  cp: PCommand;
-begin
-  SetLength(commands, Length(commands)+1);
-  a := High(commands);
-  cp := @commands[a];
-  cp.cmd := LowerCase(cmd);
-  cp.proc := proc;
-  cp.procEx := nil;
-  cp.help := ahelp;
-  cp.hidden := ahidden;
-  cp.ptr := nil;
-  cp.msg := '';
-  cp.cheat := acheat;
-end;
-
-
 procedure segfault (p: SSArray);
 var
   pp: PByte = nil;
@@ -633,27 +633,58 @@ begin
   pp^ := 0;
 end;
 
+function GetCommandString (p: SSArray): AnsiString;
+  var i: Integer;
+begin
+  result := '';
+  if Length(p) >= 1 then
+  begin
+    result := p[0];
+    for i := 1 to High(p) do
+      result := result + '; ' + p[i]
+  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, act: AnsiString; i: Integer;
+  var cmd, key: AnsiString; i: Integer;
 begin
   cmd := LowerCase(p[0]);
   case cmd of
   'bind':
-    // bind <key> <action>
-    if Length(p) = 3 then
+    // bind <key> [down [up]]
+    if (Length(p) >= 2) and (Length(p) <= 4) then
     begin
-      key := LowerCase(p[1]);
-      act := p[2];
       i := 0;
+      key := LowerCase(p[1]);
       while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
       if i < e_MaxInputKeys then
-        gInputBinds[i].cmd := act
+      begin
+        if Length(p) = 2 then
+          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 *)
+          g_Console_BindKey(i, p[2], p[3])
+      end
+      else
+        g_Console_Add('bind: "' + p[1] + '" is not a key')
+    end
+    else
+    begin
+      g_Console_Add('bind <key> <down action> [up action]')
     end;
   'bindlist':
     for i := 0 to e_MaxInputKeys - 1 do
-      if gInputBinds[i].cmd <> '' then
-        g_Console_Add(LowerCase(e_KeyNames[i]) + ' "' + gInputBinds[i].cmd + '"');
+      if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
+        g_Console_Add(e_KeyNames[i] + ' ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(GetCommandString(gInputBinds[i].up)));
   'unbind':
     // unbind <key>
     if Length(p) = 2 then
@@ -662,102 +693,110 @@ begin
       i := 0;
       while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
       if i < e_MaxInputKeys then
-        gInputBinds[i].cmd := ''
-    end;
+        g_Console_BindKey(i, '')
+      else
+        g_Console_Add('unbind: "' + p[1] + '" is not a key')
+    end
+    else
+      g_Console_Add('unbind <key>');
   'unbindall':
     for i := 0 to e_MaxInputKeys - 1 do
-      gInputBinds[i].cmd := '';
-  'bindkeys':
-    for i := 0 to e_MaxInputKeys - 1 do
-      if e_KeyNames[i] <> '' then
-        g_Console_Add(IntToStr(i) + ': ' + LowerCase(e_KeyNames[i]));
+      g_Console_BindKey(i, '');
+  'showkeyboard':
+    g_Touch_ShowKeyboard(True);
+  'hidekeyboard':
+    g_Touch_ShowKeyboard(False);
+  'togglemenu':
+    if gConsoleShow then
+    begin
+      g_Console_Switch;
+      menu_toggled := True
+    end
+    else
+    begin
+      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;
 
-
-procedure KeyActionCommands (p: SSArray);
-  var cmd: AnsiString; val: Boolean; player, action, offset: Integer;
+procedure AddCommand(cmd: AnsiString; proc: TCmdProc; ahelp: AnsiString=''; ahidden: Boolean=false; acheat: Boolean=false);
+var
+  a: Integer;
+  cp: PCommand;
 begin
-  // syntax: ("+" | "-") ["p" digit "_"] Command
-  cmd := LowerCase(p[0]);
+  SetLength(commands, Length(commands)+1);
+  a := High(commands);
+  cp := @commands[a];
+  cp.cmd := LowerCase(cmd);
+  cp.proc := proc;
+  cp.procEx := nil;
+  cp.help := ahelp;
+  cp.hidden := ahidden;
+  cp.ptr := nil;
+  cp.msg := '';
+  cp.cheat := acheat;
+  cp.action := -1;
+  cp.player := -1;
+end;
 
-  if cmd[1] = '+' then
-    val := (not bindProcess) or (bindProcess and bindDown)
-  else if cmd[1] = '-' then
-    val := bindProcess and bindDown
-  else
-    Exit;
+procedure AddAction (cmd: AnsiString; action: Integer; help: AnsiString = ''; hidden: Boolean = False; cheat: Boolean = False);
+  const
+    PrefixList: array [0..1] of AnsiString = ('+', '-');
+    PlayerList: array [0..1] of Integer = (1, 2);
+  var
+    s: AnsiString;
+    i: Integer;
 
-  player := 0;
-  offset := 2;
-  if (Length(cmd) >= 4) and (cmd[2] = 'p') and (cmd[3] >= '1') and (cmd[3] <= '9') and (cmd[4] = '_') then
+  procedure NewAction (cmd: AnsiString; player: Integer);
+    var cp: PCommand;
   begin
-    player := ord(cmd[3]) - ord('1') - 1;
-    offset := 5;
+    SetLength(commands, Length(commands) + 1);
+    cp := @commands[High(commands)];
+    cp.cmd := LowerCase(cmd);
+    cp.proc := nil;
+    cp.procEx := nil;
+    cp.help := help;
+    cp.hidden := hidden;
+    cp.ptr := nil;
+    cp.msg := '';
+    cp.cheat := cheat;
+    cp.action := action;
+    cp.player := player;
   end;
 
-  case Copy(cmd, offset) of
-    'moveup': action := ACTION_MOVEUP;
-    'movedown': action := ACTION_MOVEDOWN;
-    'moveleft': action := ACTION_MOVELEFT;
-    'moveright': action := ACTION_MOVERIGHT;
-    'speed': action := ACTION_SPEED;
-    'scores': action := ACTION_SCORES;
-    'lookup': action := ACTION_LOOKUP;
-    'lookdown': action := ACTION_LOOKDOWN;
-    'attack': action := ACTION_ATTACK;
-    'activate': action := ACTION_ACTIVATE;
-    'strafe': action := ACTION_STRAFE;
-    'weapnext': action := ACTION_WEAPNEXT;
-    'weapprev': action := ACTION_WEAPPREV;
-  else
-    Exit
-  end;
-
-  gPlayerAction[player, action] := val;
-end;
-
-procedure ActionCommands (p: SSArray);
-  var cmd: AnsiString; i, player, offset, action: Integer;
 begin
-  cmd := LowerCase(p[0]);
-
-  player := 0;
-  offset := 1;
-  if (Length(cmd) >= 3) and (cmd[1] = 'p') and (cmd[2] >= '1') and (cmd[2] <= '9') and (cmd[3] = '_') then
+  ASSERT(action >= FIRST_ACTION);
+  ASSERT(action <= LAST_ACTION);
+  for s in PrefixList do
   begin
-    player := ord(cmd[2]) - ord('1') - 1;
-    offset := 4;
-  end;
-
-  case Copy(cmd, offset) of
-    'weapnext': action := ACTION_WEAPNEXT;
-    'weapprev': action := ACTION_WEAPPREV;
-    'weapon':
-      if Length(p) = 2 then
-      begin
-        i := StrToInt(p[1]);
-        if (i > 0) and (i <= MAX_ACTION_WEAP) then
-          action := ACTION_WEAP1 + i - 1
-        else
-          Exit
-      end
-      else
-        Exit;
-  end;
-
-  gPlayerAction[player, action] := bindDown;
+    NewAction(s + cmd, 0);
+    for i in PlayerList do
+      NewAction(s + 'p' + IntToStr(i) + '_' + cmd, i - 1)
+  end
 end;
 
 procedure g_Console_Init();
-  const
-    PrefixList: array [0..1] of AnsiString = ('+', '-');
-    PlayerList: array [0..2] of AnsiString = ('', 'p1_', 'p2_');
-    KeyActionList: array [0..12] of AnsiString = ('moveup', 'movedown', 'moveleft', 'moveright', 'speed', 'scores', 'lookup', 'lookdown', 'attack', 'activate', 'strafe', 'weapnext', 'weapprev');
-    ActionList: array [0..2] of AnsiString = ('weapnext', 'weapprev', 'weapon');
   var
     a: Integer;
-    s0, s1, s2: AnsiString;
 begin
   g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
   Cons_Y := -(gScreenHeight div 2);
@@ -779,16 +818,12 @@ begin
   AddCommand('bindlist', BindCommands);
   AddCommand('unbind', BindCommands);
   AddCommand('unbindall', BindCommands);
-  AddCommand('bindkeys', BindCommands);
-
-  for s0 in PrefixList do
-    for s1 in PlayerList do
-      for s2 in KeyActionList do
-        AddCommand(s0 + s1 + s2, KeyActionCommands);
-
-  for s1 in PlayerList do
-    for s2 in ActionList do
-      AddCommand(s1 + s2, ActionCommands);
+  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);
@@ -799,6 +834,7 @@ begin
   AddCommand('echo', ConsoleCommands);
   AddCommand('dump', ConsoleCommands);
   AddCommand('exec', ConsoleCommands);
+  AddCommand('writeconfig', ConsoleCommands);
   AddCommand('alias', ConsoleCommands);
   AddCommand('call', ConsoleCommands);
   AddCommand('ver', ConsoleCommands);
@@ -820,8 +856,6 @@ begin
   AddCommand('p2_name', GameCVars);
   AddCommand('p1_color', GameCVars);
   AddCommand('p2_color', GameCVars);
-  AddCommand('r_showfps', GameCVars);
-  AddCommand('r_showtime', GameCVars);
   AddCommand('r_showscore', GameCVars);
   AddCommand('r_showlives', GameCVars);
   AddCommand('r_showstat', GameCVars);
@@ -889,6 +923,10 @@ begin
   AddCommand('vote', GameCommands);
   AddCommand('clientlist', GameCommands);
   AddCommand('event', GameCommands);
+  AddCommand('screenshot', GameCommands);
+  AddCommand('weapon', GameCommands);
+  AddCommand('p1_weapon', GameCommands);
+  AddCommand('p2_weapon', GameCommands);
 
   AddCommand('god', GameCheats);
   AddCommand('notarget', GameCheats);
@@ -902,6 +940,18 @@ begin
   AddCommand('aimline', GameCheats);
   AddCommand('automap', GameCheats);
 
+  AddAction('jump', ACTION_JUMP);
+  AddAction('moveleft', ACTION_MOVELEFT);
+  AddAction('moveright', ACTION_MOVERIGHT);
+  AddAction('lookup', ACTION_LOOKUP);
+  AddAction('lookdown', ACTION_LOOKDOWN);
+  AddAction('attack', ACTION_ATTACK);
+  AddAction('scores', ACTION_SCORES);
+  AddAction('activate', ACTION_ACTIVATE);
+  AddAction('strafe', ACTION_STRAFE);
+  AddAction('weapnext', ACTION_WEAPNEXT);
+  AddAction('weapprev', ACTION_WEAPPREV);
+
   WhitelistCommand('say');
   WhitelistCommand('tell');
   WhitelistCommand('overtime');
@@ -927,11 +977,13 @@ begin
   WhitelistCommand('g_scorelimit');
   WhitelistCommand('g_timelimit');
 
-  g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
-  g_Console_Add('');
-
+  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('');
 end;
 
 procedure g_Console_Update();
@@ -1116,33 +1168,14 @@ begin
   e_TextureFontPrint((CPos+1)*CWidth, Cons_Y+(gScreenHeight div 2)-21, '_', gStdFont);
 end;
 
-procedure g_Console_Switch();
-begin
-  if gChatShow then Exit;
-  gConsoleShow := not gConsoleShow;
-  Cons_Shown := True;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
-end;
-
-procedure g_Console_Chat_Switch(Team: Boolean = False);
-begin
-  if gConsoleShow then Exit;
-  if not g_Game_IsNet then Exit;
-  gChatShow := not gChatShow;
-  gChatTeam := Team;
-  if gChatShow then
-    gChatEnter := False;
-  Line := '';
-  CPos := 1;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
-end;
-
 procedure g_Console_Char(C: AnsiChar);
 begin
-  if gChatShow and (not gChatEnter) 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;
 
 
@@ -1274,13 +1307,13 @@ begin
     IK_DELETE:
       if (Length(Line) > 0) and (CPos <= Length(Line)) then
         Delete(Line, CPos, 1);
-    IK_LEFT, IK_KPLEFT, VK_LEFT:
+    IK_LEFT, IK_KPLEFT, VK_LEFT, JOY0_LEFT, JOY1_LEFT, JOY2_LEFT, JOY3_LEFT:
       if CPos > 1 then
         CPos := CPos - 1;
-    IK_RIGHT, IK_KPRIGHT, VK_RIGHT:
+    IK_RIGHT, IK_KPRIGHT, VK_RIGHT, JOY0_RIGHT, JOY1_RIGHT, JOY2_RIGHT, JOY3_RIGHT:
       if CPos <= Length(Line) then
         CPos := CPos + 1;
-    IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE:
+    IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE, JOY0_ATTACK, JOY1_ATTACK, JOY2_ATTACK, JOY3_ATTACK:
     begin
       if Cons_Shown then
         g_Console_Process(Line)
@@ -1317,7 +1350,7 @@ begin
     IK_TAB:
       if not gChatShow then
         Complete();
-    IK_DOWN, IK_KPDOWN, VK_DOWN:
+    IK_DOWN, IK_KPDOWN, VK_DOWN, JOY0_DOWN, JOY1_DOWN, JOY2_DOWN, JOY3_DOWN:
       if not gChatShow then
         if (CommandHistory <> nil) and
            (CmdIndex < Length(CommandHistory)) then
@@ -1327,7 +1360,7 @@ begin
           Line := CommandHistory[CmdIndex];
           CPos := Length(Line) + 1;
         end;
-    IK_UP, IK_KPUP, VK_UP:
+    IK_UP, IK_KPUP, VK_UP, JOY0_UP, JOY1_UP, JOY2_UP, JOY3_UP:
       if not gChatShow then
         if (CommandHistory <> nil) and
            (CmdIndex <= Length(CommandHistory)) then
@@ -1337,15 +1370,34 @@ begin
           Line := CommandHistory[CmdIndex];
           Cpos := Length(Line) + 1;
         end;
-    IK_PAGEUP, IK_KPPAGEUP, VK_PREV: // PgUp
+    IK_PAGEUP, IK_KPPAGEUP, VK_PREV, JOY0_PREV, JOY1_PREV, JOY2_PREV, JOY3_PREV: // PgUp
       if not gChatShow then Inc(conSkipLines);
-    IK_PAGEDN, IK_KPPAGEDN, VK_NEXT: // PgDown
+    IK_PAGEDN, IK_KPPAGEDN, VK_NEXT, JOY0_NEXT, JOY1_NEXT, JOY2_NEXT, JOY3_NEXT: // PgDown
       if not gChatShow and (conSkipLines > 0) then Dec(conSkipLines);
     IK_HOME, IK_KPHOME:
       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;
@@ -1587,34 +1639,203 @@ begin
   begin
     if commands[i].cmd = LowerCase(Arr[0]) then
     begin
+      if commands[i].action >= 0 then
+      begin
+        gPlayerAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+';
+        exit
+      end;
       if assigned(commands[i].procEx) then
       begin
         commands[i].procEx(@commands[i], Arr);
-        exit;
+        exit
       end;
       if assigned(commands[i].proc) then
       begin
         commands[i].proc(Arr);
-        exit;
-      end;
-    end;
+        exit
+      end
+    end
   end;
 
   g_Console_Add(Format(_lc[I_CONSOLE_UNKNOWN], [Arr[0]]));
 end;
 
 
+function g_Console_Interactive: Boolean;
+begin
+  Result := gConsoleShow
+end;
+
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
+begin
+  //e_LogWritefln('bind "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), cmd, key]);
+  ASSERT(key >= 0);
+  ASSERT(key < e_MaxInputKeys);
+  if key > 0 then
+  begin
+    gInputBinds[key].down := ParseAlias(down);
+    gInputBinds[key].up := ParseAlias(up);
+  end;
+  g_Console_WriteGameConfig();
+end;
+
+function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
+
+  function EqualsCommandLists (a, b: SSArray): Boolean;
+    var i, len: Integer;
+  begin
+    result := False;
+    len := Length(a);
+    if len = Length(b) then
+    begin
+      i := 0;
+      while (i < len) and (a[i] = b[i]) do inc(i);
+      if i >= len then
+        result := True
+    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;
+  if commands = nil then Exit;
+  i := 0;
+  while (n >= 1) and (i < e_MaxInputKeys) do
+  begin
+    if g_Console_MatchBind(i, down, up) then
+    begin
+      result := i;
+      dec(n)
+    end;
+    inc(i)
+  end;
+  if n >= 1 then
+    result := 0
+end;
+
+function g_Console_Action (action: Integer): Boolean;
+  var i, len: Integer;
+begin
+  ASSERT(action >= FIRST_ACTION);
+  ASSERT(action <= LAST_ACTION);
+  i := 0;
+  len := Length(gPlayerAction);
+  while (i < len) and (not gPlayerAction[i, action]) do inc(i);
+  Result := i < len
+end;
+
 procedure g_Console_ProcessBind (key: Integer; down: Boolean);
+  var i: Integer;
 begin
-  if (key >= 0) and (key < e_MaxInputKeys) and (gInputBinds[key].cmd <> '') then
+  if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
   begin
-    bindDown := down;
-    bindProcess := True;
-    g_Console_Process(gInputBinds[key].cmd, True);
-    bindProcess := False;
-  end
+    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
+    else
+      for i := 0 to High(gInputBinds[key].up) do
+        g_Console_Process(gInputBinds[key].up[i], True)
+  end;
+  if down and not menu_toggled then
+    KeyPress(key);
+  menu_toggled := False
 end;
 
+procedure g_Console_ResetBinds;
+  var i: Integer;
+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');
+  g_Console_BindKey(IK_W, '+p1_lookup', '-p1_lookup');
+  g_Console_BindKey(IK_S, '+p1_lookdown', '-p1_lookdown');
+  g_Console_BindKey(IK_SPACE, '+p1_jump', '-p1_jump');
+  g_Console_BindKey(IK_H, '+p1_attack', '-p1_attack');
+  g_Console_BindKey(IK_J, '+p1_activate', '-p1_activate');
+  g_Console_BindKey(IK_E, '+p1_weapnext', '-p1_weapnext');
+  g_Console_BindKey(IK_Q, '+p1_weapprev', '-p1_weapprev');
+  g_Console_BindKey(IK_ALT, '+p1_strafe', '-p1_strafe');
+  g_Console_BindKey(IK_1, 'p1_weapon 1');
+  g_Console_BindKey(IK_2, 'p1_weapon 2');
+  g_Console_BindKey(IK_3, 'p1_weapon 3');
+  g_Console_BindKey(IK_4, 'p1_weapon 4');
+  g_Console_BindKey(IK_5, 'p1_weapon 5');
+  g_Console_BindKey(IK_6, 'p1_weapon 6');
+  g_Console_BindKey(IK_7, 'p1_weapon 7');
+  g_Console_BindKey(IK_8, 'p1_weapon 8');
+  g_Console_BindKey(IK_9, 'p1_weapon 9');
+  g_Console_BindKey(IK_0, 'p1_weapon 10');
+  g_Console_BindKey(IK_MINUS, 'p1_weapon 11');
+  g_Console_BindKey(IK_T, 'togglechat');
+  g_Console_BindKey(IK_Y, 'toggleteamchat');
+  g_Console_BindKey(IK_F11, 'screenshot');
+  g_Console_BindKey(IK_TAB, '+p1_scores', '-p1_scores');
+  g_Console_BindKey(IK_PAUSE, 'pause');
+  g_Console_BindKey(IK_F1, 'vote');
+
+  (* for i := 0 to e_MaxJoys - 1 do *)
+  for i := 0 to 1 do
+  begin
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_LEFT), '+p' + IntToStr(i mod 2 + 1) + '_moveleft', '-p' + IntToStr(i mod 2 + 1) + '_moveleft');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_RIGHT), '+p' + IntToStr(i mod 2 + 1) + '_moveright', '-p' + IntToStr(i mod 2 + 1) + '_moveright');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_UP), '+p' + IntToStr(i mod 2 + 1) + '_lookup', '-p' + IntToStr(i mod 2 + 1) + '_lookup');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_DOWN), '+p' + IntToStr(i mod 2 + 1) + '_lookdown', '-p' + IntToStr(i mod 2 + 1) + '_lookdown');
+    g_Console_BindKey(e_JoyButtonToKey(i, 2), '+p' + IntToStr(i mod 2 + 1) + '_jump', '-p' + IntToStr(i mod 2 + 1) + '_jump');
+    g_Console_BindKey(e_JoyButtonToKey(i, 0), '+p' + IntToStr(i mod 2 + 1) + '_attack', '-p' + IntToStr(i mod 2 + 1) + '_attack');
+    g_Console_BindKey(e_JoyButtonToKey(i, 3), '+p' + IntToStr(i mod 2 + 1) + '_activate', '-p' + IntToStr(i mod 2 + 1) + '_activate');
+    g_Console_BindKey(e_JoyButtonToKey(i, 1), '+p' + IntToStr(i mod 2 + 1) + '_weapnext', '-p' + IntToStr(i mod 2 + 1) + '_weapnext');
+    g_Console_BindKey(e_JoyButtonToKey(i, 4), '+p' + IntToStr(i mod 2 + 1) + '_weapprev', '-p' + IntToStr(i mod 2 + 1) + '_weapprev');
+    g_Console_BindKey(e_JoyButtonToKey(i, 7), '+p' + IntToStr(i mod 2 + 1) + '_strafe', '-p' + IntToStr(i mod 2 + 1) + '_strafe');
+    g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu');
+  end;
+
+  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');
+  g_Console_BindKey(VK_RIGHT, '+moveright', '-moveright');
+  g_Console_BindKey(VK_UP, '+lookup', '-lookup');
+  g_Console_BindKey(VK_DOWN, '+lookdown', '-lookdown');
+  g_Console_BindKey(VK_JUMP, '+jump', '-jump');
+  g_Console_BindKey(VK_FIRE, '+attack', '-attack');
+  g_Console_BindKey(VK_OPEN, '+activate', '-activate');
+  g_Console_BindKey(VK_NEXT, '+weapnext', '-weapnext');
+  g_Console_BindKey(VK_PREV, '+weapprev', '-weapprev');
+  g_Console_BindKey(VK_STRAFE, '+strafe', '-strafe');
+  g_Console_BindKey(VK_0, 'weapon 1');
+  g_Console_BindKey(VK_1, 'weapon 2');
+  g_Console_BindKey(VK_2, 'weapon 3');
+  g_Console_BindKey(VK_3, 'weapon 4');
+  g_Console_BindKey(VK_4, 'weapon 5');
+  g_Console_BindKey(VK_5, 'weapon 6');
+  g_Console_BindKey(VK_6, 'weapon 7');
+  g_Console_BindKey(VK_7, 'weapon 8');
+  g_Console_BindKey(VK_8, 'weapon 9');
+  g_Console_BindKey(VK_9, 'weapon 10');
+  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');
+  g_Console_BindKey(VK_HIDEKBD, 'hidekeyboard');
+end;
 
 procedure g_Console_ReadConfig (filename: String);
   var f: TextFile; s: AnsiString; i, len: Integer;
@@ -1634,12 +1855,57 @@ 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)
+          g_Console_Process(s, True);
       end
     end;
-    CloseFile(f)
+    CloseFile(f);
   end
 end;
 
+procedure g_Console_WriteConfig (filename: String);
+  var f: TextFile; i, j: Integer;
+begin
+  AssignFile(f, filename);
+  Rewrite(f);
+  WriteLn(f, '// generated by doom2d, do not modify');
+  WriteLn(f, 'unbindall');
+  for i := 0 to e_MaxInputKeys - 1 do
+    if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then
+    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
+    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)
+      end
+      else if @commands[i].procEx = @intVarHandler then
+      begin
+        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)
+      end
+    end
+  end;
+  CloseFile(f)
+end;
+
+procedure g_Console_WriteGameConfig;
+begin
+  if gParsingBinds then
+    Exit;
+  g_Console_WriteConfig(GameDir + '/dfconfig.cfg');
+end;
 
 end.