X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=3950137c0361ab6a7aca40eca9e30c385cf280de;hb=08f291733a98bcae9336acc77a3bbb4ba63f9175;hp=3958d24d12df79b518b6dc351942a53d487acc52;hpb=aea87456d131c418ed632d30b57280dfeefe16de;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 3958d24..3950137 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -45,6 +45,7 @@ var gwin_has_stencil: Boolean = false; gwin_k8_enable_light_experiments: Boolean = false; g_dbg_aimline_on: Boolean = false; + g_dbg_input: Boolean = False; implementation @@ -55,7 +56,7 @@ uses {$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, @@ -84,7 +85,8 @@ var ticksOverflow: Int64 = -1; lastTicks: Uint32 = 0; // to detect overflow {$ENDIF} - + 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 @@ -411,8 +413,7 @@ begin if gWinActive then begin e_WriteLog('deactivating window', TMsgType.Notify); - e_EnableInput := false; - e_ClearInputBuffer(); + e_UnpressAllKeys; if gMuteWhenInactive then begin @@ -438,7 +439,6 @@ begin if not gWinActive then begin //e_WriteLog('activating window', MSG_NOTIFY); - e_EnableInput := true; if gMuteWhenInactive then begin @@ -464,9 +464,12 @@ end; function EventHandler (var ev: TSDL_Event): Boolean; var - key, keychr: Word; + key, keychr, minuskey: Word; uc: UnicodeChar; down: Boolean; + i: Integer; + hat: array [HAT_LEFT..HAT_DOWN] of Boolean; + joy: PSDL_Joystick; begin result := false; @@ -505,10 +508,138 @@ begin exit; end; {$ENDIF} - e_KeyUpDown(key, down); + 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; if down then KeyPress(key); end; + SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP: + if (ev.jbutton.which < e_MaxJoys) and (ev.jbutton.button < e_MaxJoyBtns) then + 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) + 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: + if (ev.jaxis.which < e_MaxJoys) and (ev.jaxis.axis < e_MaxJoyAxes) then + begin + key := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_PLUS); + minuskey := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_MINUS); + + 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 + e_KeyUpDown(key, False); + g_Console_ProcessBind(key, False); + end; + e_KeyUpDown(minuskey, True); + g_Console_ProcessBind(minuskey, True); + KeyPress(minuskey); + end + 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 + e_KeyUpDown(minuskey, False); + g_Console_ProcessBind(minuskey, False); + end; + e_KeyUpDown(key, True); + g_Console_ProcessBind(key, True); + KeyPress(key); + end + else + begin + if (e_KeyPressed(minuskey)) then + begin + e_KeyUpDown(minuskey, False); + g_Console_ProcessBind(minuskey, False); + end; + if (e_KeyPressed(key)) then + begin + e_KeyUpDown(key, False); + 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 + 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 + 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); + e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down); + if down then KeyPress(key) + end + end; + 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; + + SDL_JOYDEVICEADDED: + if (ev.jdevice.which < e_MaxJoys) then + begin + 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 + 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: fuiOnSDLEvent(ev); @@ -516,6 +647,8 @@ 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))); @@ -659,7 +792,7 @@ begin EventHandler(ev); if (ev.type_ = SDL_QUITEV) then break; end; - e_PollJoysticks(); + //e_PollJoysticks(); if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then begin @@ -726,7 +859,7 @@ begin result := EventHandler(ev); if (ev.type_ = SDL_QUITEV) then exit; end; - e_PollJoysticks(); + //e_PollJoysticks(); end; @@ -937,6 +1070,8 @@ begin 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} @@ -1054,4 +1189,6 @@ begin end; +initialization + conRegVar('d_input', @g_dbg_input, '', '') end.