Holmes, please, there are no criminals in dedicated server!

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

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index f5249cc0e810e168e58409423eae45e306f9dc58..0ac570dad8b00a296278d4e0163f19ee28785b72 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -250,6 +250,7 @@ begin
     begin
       curMsButState := 0;
       curKbState := 0;
+      e_UnpressAllKeys();
       if not wMinimized then
       begin
         e_ResizeWindow(0, 0);
@@ -336,6 +337,7 @@ begin
       curMsButState := 0;
       curKbState := 0;
       wDeactivate := True;
+      e_UnpressAllKeys();
       //e_WriteLog('window lost focus!', MSG_NOTIFY);
       g_Holmes_WindowBlured();
     end;
@@ -440,8 +442,7 @@ begin
         Result := True;
       end;
 
-    SDL_KEYDOWN,
-    SDL_KEYUP:
+    SDL_KEYDOWN, SDL_KEYUP:
       begin
         key := ev.key.keysym.scancode;
         if (g_holmes_enabled) then
@@ -451,11 +452,19 @@ begin
           kbev.sym := ev.key.keysym.sym;
           kbev.bstate := curMsButState;
           kbev.kstate := curKbState;
-          if g_Holmes_keyEvent(kbev) then exit;
+          {$IF not DEFINED(HEADLESS)}
+          if g_Holmes_keyEvent(kbev) then
+          begin
+            if (ev.type_ <> SDL_KEYDOWN) then e_KeyUpDown(ev.key.keysym.scancode, false);
+            exit;
+          end;
+          {$ENDIF}
         end;
         if (ev.type_ = SDL_KEYDOWN) then KeyPress(key);
+        e_KeyUpDown(ev.key.keysym.scancode, (ev.type_ = SDL_KEYDOWN));
       end;
 
+    {$IF not DEFINED(HEADLESS)}
     SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP:
       begin
         msev.dx := ev.button.x-curMsX;
@@ -469,7 +478,7 @@ begin
         if (msev.but <> 0) then
         begin
           // ev.button.clicks: Byte
-          curMsButState := curMsButState or msev.but;
+          if (ev.type_ = SDL_MOUSEBUTTONDOWN) then curMsButState := curMsButState or msev.but else curMsButState := curMsButState and (not msev.but);
           msev.bstate := curMsButState;
           msev.kstate := curKbState;
           if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
@@ -504,6 +513,7 @@ begin
         msev.kstate := curKbState;
         if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
       end;
+    {$ENDIF}
 
     SDL_TEXTINPUT:
       begin
@@ -815,10 +825,6 @@ begin
     if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true;
     if ParamStr(idx) = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
     if ParamStr(idx) = '--jah' then g_profile_history_size := 100;
-    //if ParamStr(idx) = '--tree-draw' then gdbg_map_use_tree_draw := true;
-    //if ParamStr(idx) = '--grid-draw' then gdbg_map_use_tree_draw := false;
-    //if ParamStr(idx) = '--tree-coldet' then gdbg_map_use_tree_coldet := true;
-    //if ParamStr(idx) = '--grid-coldet' then gdbg_map_use_tree_coldet := false;
     if ParamStr(idx) = '--no-particles' then gpart_dbg_enabled := false;
     if ParamStr(idx) = '--no-los' then gmon_dbg_los_enabled := false;
 
@@ -836,12 +842,6 @@ begin
     if ParamStr(idx) = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
   end;
 
-  //if gdbg_map_use_tree_draw then e_WriteLog('using TREE renderer', MSG_NOTIFY);
-  //if not gdbg_map_use_tree_draw then e_WriteLog('using GRID renderer', MSG_NOTIFY);
-
-  //if gdbg_map_use_tree_coldet then e_WriteLog('using TREE coldet', MSG_NOTIFY);
-  //if not gdbg_map_use_tree_coldet then e_WriteLog('using GRID coldet', MSG_NOTIFY);
-
   e_WriteLog('Initializing OpenGL', MSG_NOTIFY);
   InitOpenGL(gVSync);