added bind command + autoexec.cfg + dfconfig.cfg

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

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index b83cdad7a0a97f93a48d80f4bd0f2d95b091c13c..a5dd79cfb415955850270e0e2bdf8bc1f2820ff0 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -234,7 +234,7 @@ begin
 end;
 
 
-procedure ChangeWindowSize ();
+procedure ChangeWindowSize (requested: Boolean);
 begin
   e_LogWritefln('  ChangeWindowSize: (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]);
   gWinSizeX := gScreenWidth;
@@ -246,7 +246,13 @@ begin
   {$ENDIF}
   e_ResizeWindow(gScreenWidth, gScreenHeight);
   g_Game_SetupScreenSize();
-  g_Menu_Reset();
+  {$IF DEFINED(ANDROID)}
+    (* This will fix menu reset on keyboard showing *)
+    if requested then
+      g_Menu_Reset;
+  {$ELSE}
+    g_Menu_Reset;
+  {$ENDIF}
   g_Game_ClearLoading();
 {$ENDIF}
 end;
@@ -281,7 +287,7 @@ begin
   if result then
   begin
     g_Window_SetDisplay(preserve);
-    ChangeWindowSize();
+    ChangeWindowSize(true);
   end;
 {$ENDIF}
 end;
@@ -337,7 +343,7 @@ begin
         gScreenWidth := ev.data1;
         gScreenHeight := ev.data2;
       end;
-      ChangeWindowSize();
+      ChangeWindowSize(false);
       SwapBuffers();
       if g_debug_WinMsgs then
       begin
@@ -499,7 +505,11 @@ begin
           exit;
         end;
         {$ENDIF}
-        e_KeyUpDown(key, down);
+        if ev.key._repeat = 0 then
+        begin
+          e_KeyUpDown(key, down);
+          g_Console_ProcessBind(key, down)
+        end;
         if down then KeyPress(key);
       end;
 
@@ -892,8 +902,10 @@ var
   {$ENDIF}
   arg: AnsiString;
   mdfo: TStream;
+  {$IFDEF ENABLE_HOLMES}
   itmp: Integer;
   valres: Word;
+  {$ENDIF}
 begin
 {$IFDEF HEADLESS}
   e_NoGraphics := true;