diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 245efa3a1ee2d425efcd2e100f10db90cab708bd..3950137c0361ab6a7aca40eca9e30c385cf280de 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
g_dbg_aimline_on: Boolean = false;
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
g_dbg_aimline_on: Boolean = false;
+ g_dbg_input: Boolean = False;
implementation
implementation
{$IFDEF ENABLE_HOLMES}
g_holmes, sdlcarcass, fui_ctls,
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
g_holmes, sdlcarcass, fui_ctls,
{$ENDIF}
- SysUtils, Classes, MAPDEF,
+ SysUtils, Classes, MAPDEF, Math,
SDL2, e_graphics, e_log, e_texture, g_main,
g_console, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
SDL2, e_graphics, e_log, e_texture, g_main,
g_console, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
ticksOverflow: Int64 = -1;
lastTicks: Uint32 = 0; // to detect overflow
{$ENDIF}
ticksOverflow: Int64 = -1;
lastTicks: Uint32 = 0; // to detect overflow
{$ENDIF}
- JoystickHatState: array [0..e_MaxJoyHats, HAT_LEFT..HAT_DOWN] of Boolean;
+ JoystickHatState: array [0..e_MaxJoys, 0..e_MaxJoyHats, HAT_LEFT..HAT_DOWN] of Boolean;
+ JoystickZeroAxes: array [0..e_MaxJoys, 0..e_MaxJoyAxes] of Integer;
procedure KillGLWindow (preserveGL: Boolean);
begin
procedure KillGLWindow (preserveGL: Boolean);
begin
if gWinActive then
begin
e_WriteLog('deactivating window', TMsgType.Notify);
if gWinActive then
begin
e_WriteLog('deactivating window', TMsgType.Notify);
- e_EnableInput := false;
- e_ClearInputBuffer();
+ e_UnpressAllKeys;
if gMuteWhenInactive then
begin
if gMuteWhenInactive then
begin
if not gWinActive then
begin
//e_WriteLog('activating window', MSG_NOTIFY);
if not gWinActive then
begin
//e_WriteLog('activating window', MSG_NOTIFY);
- e_EnableInput := true;
if gMuteWhenInactive then
begin
if gMuteWhenInactive then
begin
down: Boolean;
i: Integer;
hat: array [HAT_LEFT..HAT_DOWN] of Boolean;
down: Boolean;
i: Integer;
hat: array [HAT_LEFT..HAT_DOWN] of Boolean;
+ joy: PSDL_Joystick;
begin
result := false;
begin
result := false;
{$ENDIF}
if ev.key._repeat = 0 then
begin
{$ENDIF}
if ev.key._repeat = 0 then
begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: keysym, press=%s, scancode=%s', [down, key]);
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down)
end;
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down)
end;
begin
key := e_JoyButtonToKey(ev.jbutton.which, ev.jbutton.button);
down := ev.type_ = SDL_JOYBUTTONDOWN;
begin
key := e_JoyButtonToKey(ev.jbutton.which, ev.jbutton.button);
down := ev.type_ = SDL_JOYBUTTONDOWN;
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: jbutton, joy=%s, button=%s, keycode=%s, press=%s', [ev.jbutton.which, ev.jbutton.button, key, down]);
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
if down then KeyPress(key)
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
if down then KeyPress(key)
+ end
+ else
+ begin
+ if g_dbg_input then
+ begin
+ down := ev.type_ = SDL_JOYBUTTONDOWN;
+ e_LogWritefln('Input Debug: NOT IN RANGE! jbutton, joy=%s, button=%s, press=%s', [ev.jbutton.which, ev.jbutton.button, down])
+ end
end;
SDL_JOYAXISMOTION:
end;
SDL_JOYAXISMOTION:
key := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_PLUS);
minuskey := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_MINUS);
key := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_PLUS);
minuskey := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_MINUS);
- if ev.jaxis.value < Joysticks[ev.jaxis.which].AxisZero[ev.jaxis.axis] - e_JoystickDeadzones[ev.jaxis.which] then
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: jaxis, joy=%s, axis=%s, value=%s, zeroaxes=%s, deadzone=%s', [ev.jaxis.which, ev.jaxis.axis, ev.jaxis.value, JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis], e_JoystickDeadzones[ev.jaxis.which]]);
+
+ if ev.jaxis.value < JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis] - e_JoystickDeadzones[ev.jaxis.which] then
begin
if (e_KeyPressed(key)) then
begin
begin
if (e_KeyPressed(key)) then
begin
g_Console_ProcessBind(minuskey, True);
KeyPress(minuskey);
end
g_Console_ProcessBind(minuskey, True);
KeyPress(minuskey);
end
- else if ev.jaxis.value > Joysticks[ev.jaxis.which].AxisZero[ev.jaxis.axis] + e_JoystickDeadzones[ev.jaxis.which] then
+ else if ev.jaxis.value > JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis] + e_JoystickDeadzones[ev.jaxis.which] then
begin
if (e_KeyPressed(minuskey)) then
begin
begin
if (e_KeyPressed(minuskey)) then
begin
g_Console_ProcessBind(key, False);
end;
end;
g_Console_ProcessBind(key, False);
end;
end;
+ end
+ else
+ begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: NOT IN RANGE! jaxis, joy=%s, axis=%s, value=%s, zeroaxes=%s, deadzone=%s', [ev.jaxis.which, ev.jaxis.axis, ev.jaxis.value, JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis], e_JoystickDeadzones[ev.jaxis.which]])
end;
SDL_JOYHATMOTION:
if (ev.jhat.which < e_MaxJoys) and (ev.jhat.hat < e_MaxJoyHats) then
begin
end;
SDL_JOYHATMOTION:
if (ev.jhat.which < e_MaxJoys) and (ev.jhat.hat < e_MaxJoyHats) then
begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: jhat, joy=%s, hat=%s, value=%s', [ev.jhat.which, ev.jhat.hat, ev.jhat.value]);
hat[HAT_UP] := LongBool(ev.jhat.value and SDL_HAT_UP);
hat[HAT_DOWN] := LongBool(ev.jhat.value and SDL_HAT_DOWN);
hat[HAT_LEFT] := LongBool(ev.jhat.value and SDL_HAT_LEFT);
hat[HAT_RIGHT] := LongBool(ev.jhat.value and SDL_HAT_RIGHT);
for i := HAT_LEFT to HAT_DOWN do
begin
hat[HAT_UP] := LongBool(ev.jhat.value and SDL_HAT_UP);
hat[HAT_DOWN] := LongBool(ev.jhat.value and SDL_HAT_DOWN);
hat[HAT_LEFT] := LongBool(ev.jhat.value and SDL_HAT_LEFT);
hat[HAT_RIGHT] := LongBool(ev.jhat.value and SDL_HAT_RIGHT);
for i := HAT_LEFT to HAT_DOWN do
begin
- if JoystickHatState[ev.jhat.which, i] <> hat[i] then
+ if JoystickHatState[ev.jhat.which, ev.jhat.hat, i] <> hat[i] then
begin
down := hat[i];
key := e_JoyHatToKey(ev.jhat.which, ev.jhat.hat, i);
begin
down := hat[i];
key := e_JoyHatToKey(ev.jhat.which, ev.jhat.hat, i);
if down then KeyPress(key)
end
end;
if down then KeyPress(key)
end
end;
- JoystickHatState[ev.jhat.which] := hat
+ JoystickHatState[ev.jhat.which, ev.jhat.hat] := hat
+ end
+ else
+ begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: NOT IN RANGE! jhat, joy=%s, hat=%s, value=%s', [ev.jhat.which, ev.jhat.hat, ev.jhat.value])
end;
end;
-(*
- SDL_JOYDEVICEADDED, SDL_JOYDEVICEREMOVED:
+ SDL_JOYDEVICEADDED:
+ if (ev.jdevice.which < e_MaxJoys) then
begin
begin
- // TODO update menu here
+ joy := SDL_JoystickOpen(ev.jdevice.which);
+ ASSERT(joy <> nil);
+ e_LogWritefln('Added Joystick %s', [ev.jdevice.which]);
+ e_JoystickAvailable[ev.jdevice.which] := True;
+ for i := 0 to Min(SDL_JoystickNumAxes(joy), e_MaxJoyAxes) do
+ JoystickZeroAxes[ev.jdevice.which, i] := SDL_JoystickGetAxis(joy, i);
+ SDL_JoystickClose(joy)
end
end
-*)
+ else
+ begin
+ e_LogWritefln('Warning! Added Joystick %s, but we support only <= %s', [ev.jdevice.which, e_MaxJoys])
+ end;
+
+ SDL_JOYDEVICEREMOVED:
+ begin
+ e_LogWritefln('Removed Joystick %s', [ev.jdevice.which]);
+ if (ev.jdevice.which < e_MaxJoys) then
+ e_JoystickAvailable[ev.jdevice.which] := False
+ end;
{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION:
{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION:
SDL_TEXTINPUT:
begin
SDL_TEXTINPUT:
begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: text, text=%s', [ev.text.text]);
Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
keychr := Word(uc);
if (keychr > 127) then keychr := Word(wchar2win(WideChar(keychr)));
Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
keychr := Word(uc);
if (keychr > 127) then keychr := Word(wchar2win(WideChar(keychr)));
if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
+ if arg = '--debug-input' then g_dbg_input := True;
+
{.$IF DEFINED(D2F_DEBUG)}
if arg = '--aimline' then g_dbg_aimline_on := true;
{.$ENDIF}
{.$IF DEFINED(D2F_DEBUG)}
if arg = '--aimline' then g_dbg_aimline_on := true;
{.$ENDIF}
end;
end;
+initialization
+ conRegVar('d_input', @g_dbg_input, '', '')
end.
end.