diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 8578b70eabec5e305e83931ea42578ffb0663e58..226c4550c73fc5c7758048d1c94ab03da677c896 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
begin
curMsButState := 0;
curKbState := 0;
+ e_UnpressAllKeys();
if not wMinimized then
begin
e_ResizeWindow(0, 0);
curMsButState := 0;
curKbState := 0;
wDeactivate := True;
+ e_UnpressAllKeys();
//e_WriteLog('window lost focus!', MSG_NOTIFY);
g_Holmes_WindowBlured();
end;
kbev.sym := ev.key.keysym.sym;
kbev.bstate := curMsButState;
kbev.kstate := curKbState;
- if g_Holmes_keyEvent(kbev) then exit;
+ if g_Holmes_keyEvent(kbev) then
+ begin
+ if (ev.type_ <> SDL_KEYDOWN) then e_KeyUpDown(ev.key.keysym.scancode, false);
+ exit;
+ end;
end;
if (ev.type_ = SDL_KEYDOWN) then KeyPress(key);
+ e_KeyUpDown(ev.key.keysym.scancode, (ev.type_ = SDL_KEYDOWN));
end;
SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP:
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);
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;
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);