X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=033a46827d5a3312a6b062fa335d37446edc5038;hp=69158eae2eb830bacfa8b785e2f09b35b28dde35;hb=6a9364772aa1d92cf10886b5d1cec54d557bcada;hpb=7301e8529da2fdfdae50653f91c1f9597df65541

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 69158ea..033a468 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -37,36 +37,37 @@ 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_FindBind (n: Integer; cmd: AnsiString): Integer;
-procedure g_Console_BindKey (key: Integer; cmd: AnsiString);
+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;
 
@@ -77,14 +78,15 @@ var
   gChatTeam: Boolean = false;
   gAllowConsoleMessages: Boolean = true;
   gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
-  gPlayerAction, gDefaultAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+  gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
+  gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
 
 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
@@ -125,7 +127,9 @@ var
   RecursionDepth: Word = 0;
   RecursionLimitHit: Boolean = False;
   Cons_Y: SmallInt;
+  ConsoleHeight: Single;
   Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
+  InputReady: Boolean;
   Line: AnsiString;
   CPos: Word;
   //ConsoleHistory: SSArray;
@@ -140,11 +144,34 @@ var
                               Time: Word;
                             end;
 
-  bindDown, bindProcess: Boolean;
   gInputBinds: Array [0..e_MaxInputKeys - 1] of record
-    commands: SSArray;
+    down, up: SSArray;
   end;
+  menu_toggled: BOOLEAN; (* hack for menu controls *)
+  ChatTop: BOOLEAN;
+
+
+procedure g_Console_Switch;
+begin
+  gChatShow := False;
+  gConsoleShow := not gConsoleShow;
+  Cons_Shown := True;
+  InputReady := False;
+  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;
+  Cons_Shown := True;
+  InputReady := False;
+  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;
@@ -200,6 +227,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
@@ -207,12 +236,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;
@@ -223,24 +255,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
@@ -249,7 +265,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;
@@ -311,7 +330,7 @@ type
 procedure singleVarHandler (me: PCommand; p: SSArray);
 var
   pv: PVarSingle;
-  nv: Single;
+  nv, old: Single;
   msg: AnsiString;
 begin
   if (Length(p) > 2) then
@@ -320,6 +339,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;
@@ -341,6 +361,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^]);
@@ -513,14 +535,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);
@@ -592,9 +620,6 @@ begin
     else
       g_Console_Add('call <alias name>');
   end;
-
-  if cmd = '//' then
-    Exit;
 end;
 
 procedure WhitelistCommand(cmd: AnsiString);
@@ -613,32 +638,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, j: 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]);
       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].commands := ParseAlias(p[2])
-    end;
-  'bindlist':
-    for i := 0 to e_MaxInputKeys - 1 do
-    begin
-      if gInputBinds[i].commands <> nil then
       begin
-        act := gInputBinds[i].commands[0];
-        for j := 1 to High(gInputBinds[i].commands) do
-          act := act + ' ;' + gInputBinds[i].commands[j];
-        g_Console_Add(LowerCase(e_KeyNames[i]) + ' "' + act + '"')
+        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].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
@@ -647,16 +698,38 @@ begin
       i := 0;
       while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
       if i < e_MaxInputKeys then
-        gInputBinds[i].commands := nil
-    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
-      if gInputBinds[i].commands <> nil then
-        gInputBinds[i].commands := nil;
-  'bindkeys':
-    for i := 0 to e_MaxInputKeys - 1 do
-      if e_KeyNames[i] <> '' then
-        g_Console_Add(LowerCase(e_KeyNames[i]));
+      g_Console_BindKey(i, '');
+  'showkeyboard':
+    g_Touch_ShowKeyboard(True);
+  'hidekeyboard':
+    g_Touch_ShowKeyboard(False);
+  'togglemenu':
+    begin
+      if gConsoleShow then
+        g_Console_Switch
+      else if gChatShow then
+        g_Console_Chat_Switch
+      else
+        KeyPress(VK_ESCAPE);
+      menu_toggled := True
+    end;
+  'toggleconsole':
+    g_Console_Switch;
+  'togglechat':
+    if not gConsoleShow and (g_ActiveWindow = nil) then
+      g_Console_Chat_Switch;
+  'toggleteamchat':
+    if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
+      if not gConsoleShow and (g_ActiveWindow = nil) then
+        g_Console_Chat_Switch(True);
   end
 end;
 
@@ -706,7 +779,7 @@ procedure AddAction (cmd: AnsiString; action: Integer; help: AnsiString = ''; hi
   end;
 
 begin
-  ASSERT(action >= 0);
+  ASSERT(action >= FIRST_ACTION);
   ASSERT(action <= LAST_ACTION);
   for s in PrefixList do
   begin
@@ -721,10 +794,11 @@ 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;
+  InputReady := False;
   CPos := 1;
 
   for a := 0 to High(MsgArray) do
@@ -740,19 +814,12 @@ begin
   AddCommand('bindlist', BindCommands);
   AddCommand('unbind', BindCommands);
   AddCommand('unbindall', BindCommands);
-  AddCommand('bindkeys', BindCommands);
-
-  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);
+  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);
@@ -763,6 +830,7 @@ begin
   AddCommand('echo', ConsoleCommands);
   AddCommand('dump', ConsoleCommands);
   AddCommand('exec', ConsoleCommands);
+  AddCommand('writeconfig', ConsoleCommands);
   AddCommand('alias', ConsoleCommands);
   AddCommand('call', ConsoleCommands);
   AddCommand('ver', ConsoleCommands);
@@ -784,8 +852,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);
@@ -854,8 +920,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);
@@ -872,6 +936,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');
@@ -897,8 +973,10 @@ begin
   WhitelistCommand('g_scorelimit');
   WhitelistCommand('g_timelimit');
 
+  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('');
@@ -910,26 +988,36 @@ var
 begin
   if Cons_Shown then
   begin
-  // Â ïðîöåññå îòêðûòèÿ:
+    (* Open animation *)
     if gConsoleShow and (Cons_Y < 0) then
-    begin
       Cons_Y := Cons_Y+Step;
-    end;
 
-  // Â ïðîöåññå çàêðûòèÿ:
-    if (not gConsoleShow) and
-       (Cons_Y > -(gScreenHeight div 2)) then
+    (* Colse animation *)
+    if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then
       Cons_Y := Cons_Y-Step;
 
-  // Îêîí÷àòåëüíî îòêðûëàñü:
-    if Cons_Y > 0 then
+    if gChatShow then
+    begin
+      (* End open chat animation. Do not show console *)
+      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
+      Cons_Shown := False;
+      InputReady := True;
+    end
+    else
+    if Cons_Y >= 0 then
+    begin
+      (* End open animation *)
       Cons_Y := 0;
-
-  // Îêîí÷àòåëüíî çàêðûëàñü:
-    if Cons_Y <= (-(gScreenHeight div 2)) then
+      Cons_Shown := True;
+      InputReady := True;
+    end
+    else
+    if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then
     begin
-      Cons_Y := -(gScreenHeight div 2);
+      (* End close animation *)
+      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
       Cons_Shown := False;
+      InputReady := False;
     end;
   end;
 
@@ -1005,7 +1093,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
@@ -1018,48 +1106,51 @@ procedure g_Console_Draw();
 var
   CWidth, CHeight: Byte;
   mfW, mfH: Word;
-  a, b: Integer;
+  a, b, offset_y: Integer;
 begin
   e_TextureFontGetSize(gStdFont, CWidth, CHeight);
 
+  if ChatTop and gChatShow then
+    offset_y := CHeight
+  else
+    offset_y := 0;
+
   for a := 0 to High(MsgArray) do
     if MsgArray[a].Time > 0 then
-      e_TextureFontPrintFmt(0, CHeight*a, MsgArray[a].Msg,
-        gStdFont, True);
+      e_TextureFontPrintFmt(0, offset_y + CHeight * a, MsgArray[a].Msg, gStdFont, True);
 
-  if not Cons_Shown then
+  if gChatShow then
   begin
-    if gChatShow then
+    if ChatTop then
+      offset_y := 0
+    else
+      offset_y := gScreenHeight - CHeight - 1;
+    if gChatTeam then
     begin
-      if gChatTeam then
-      begin
-        e_TextureFontPrintEx(0, gScreenHeight - CHeight - 1, 'say team> ' + Line,
-          gStdFont, 255, 255, 255, 1, True);
-        e_TextureFontPrintEx((CPos + 9)*CWidth, gScreenHeight - CHeight - 1, '_',
-          gStdFont, 255, 255, 255, 1, True);
-      end
-      else
-      begin
-        e_TextureFontPrintEx(0, gScreenHeight - CHeight - 1, 'say> ' + Line,
-          gStdFont, 255, 255, 255, 1, True);
-        e_TextureFontPrintEx((CPos + 4)*CWidth, gScreenHeight - CHeight - 1, '_',
-          gStdFont, 255, 255, 255, 1, True);
-      end;
-    end;
-    Exit;
+      e_TextureFontPrintEx(0, offset_y, 'say team> ' + Line, gStdFont, 255, 255, 255, 1, True);
+      e_TextureFontPrintEx((CPos + 9) * CWidth, offset_y, '_', gStdFont, 255, 255, 255, 1, True);
+    end
+    else
+    begin
+      e_TextureFontPrintEx(0, offset_y, 'say> ' + Line, gStdFont, 255, 255, 255, 1, True);
+      e_TextureFontPrintEx((CPos + 4) * CWidth, offset_y, '_', gStdFont, 255, 255, 255, 1, True);
+    end
   end;
 
+  if not Cons_Shown then
+    Exit;
+
   if gDebugMode then
   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();
   (*
@@ -1067,8 +1158,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);
@@ -1076,41 +1167,22 @@ 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);
-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);
+  e_TextureFontPrint((CPos + 1) * CWidth, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - 21, '_', gStdFont);
 end;
 
 procedure g_Console_Char(C: AnsiChar);
 begin
-//  if gChatShow then
-//    Exit;
-  Insert(C, Line, CPos);
-  CPos := CPos + 1;
+  if InputReady and (gConsoleShow or gChatShow) then
+  begin
+    Insert(C, Line, CPos);
+    CPos := CPos + 1;
+  end
 end;
 
 
@@ -1242,15 +1314,15 @@ 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
+      if gConsoleShow then
         g_Console_Process(Line)
       else
         if gChatShow then
@@ -1277,15 +1349,15 @@ begin
 
           Line := '';
           CPos := 1;
-          gChatShow := False;
           gJustChatted := True;
-          g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+          g_Console_Chat_Switch;
+          InputReady := False;
         end;
     end;
     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
@@ -1295,7 +1367,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
@@ -1305,15 +1377,19 @@ 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 *)
+  end
 end;
 
 function GetStr(var Str: AnsiString): AnsiString;
@@ -1557,26 +1633,9 @@ begin
     begin
       if commands[i].action >= 0 then
       begin
-        if bindProcess then
-        begin
-          if bindDown then
-            gPlayerAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+'
-          else
-            gPlayerAction[commands[i].player, commands[i].action] := gDefaultAction[commands[i].player, commands[i].action]
-        end
-        else
-        begin
-          gPlayerAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+';
-          gDefaultAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+'
-        end;
-        exit
-      end
-      else if bindProcess and not bindDown then
-      begin
-        (* command is not action, so do not execute it again after button release *)
+        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);
@@ -1596,27 +1655,54 @@ end;
 
 function g_Console_Interactive: Boolean;
 begin
-  Result := not bindProcess
+  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;
 
-procedure g_Console_BindKey (key: Integer; cmd: AnsiString);
+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);
-  gInputBinds[key].commands := ParseAlias(cmd)
+  result := EqualsCommandLists(ParseAlias(down), gInputBinds[key].down) and EqualsCommandLists(ParseAlias(up), gInputBinds[key].up)
 end;
 
-function g_Console_FindBind (n: Integer; cmd: AnsiString): Integer;
+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;
-  cmd := LowerCase(cmd);
   while (n >= 1) and (i < e_MaxInputKeys) do
   begin
-    if (Length(gInputBinds[i].commands) = 1) and (gInputBinds[i].commands[0] = cmd) then
+    if g_Console_MatchBind(i, down, up) then
     begin
       result := i;
       dec(n)
@@ -1638,19 +1724,126 @@ 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 gChatShow) and (not gConsoleShow) and (key >= 0) and (key < e_MaxInputKeys) and (gInputBinds[key].commands <> nil) then
+  if BindsAllowed(key) then
   begin
-    bindDown := down;
-    bindProcess := True;
-    for i := 0 to High(gInputBinds[key].commands) do
-      g_Console_Process(gInputBinds[key].commands[i], True);
-    bindProcess := False;
-  end
+    if down then
+      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)
+  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;
@@ -1670,12 +1863,67 @@ 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;
 
+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;
 
+initialization
+  conRegVar('chat_at_top', @ChatTop, 'draw chat at top border', 'draw chat at top border');
+  conRegVar('console_height', @ConsoleHeight, 0.0, 1.0, 'set console size', 'set console size');
+{$IFDEF ANDROID}
+  ChatTop := True;
+  ConsoleHeight := 0.35
+{$ELSE}
+  ChatTop := False;
+  ConsoleHeight := 0.5
+{$ENDIF}
 end.