X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_input.pas;h=1c27249fc44465151cf00dc129c9bf85fa6a5f51;hb=5c25a7dbffb4dbd896cc24cfafbd8cc52ddf22a4;hp=b16508fb3a4171a85f99630c9b18776be47a27e3;hpb=e06da872a0a072eea1117350ed6c14a709328807;p=d2df-sdl.git diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas index b16508f..1c27249 100644 --- a/src/engine/e_input.pas +++ b/src/engine/e_input.pas @@ -1,3 +1,19 @@ +(* Copyright (C) Doom 2D: Forever Developers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) +{$INCLUDE ../shared/a_modes.inc} unit e_input; interface @@ -11,16 +27,18 @@ const e_MaxKbdKeys = SDL_NUM_SCANCODES; e_MaxJoys = 4; e_MaxJoyBtns = 32; - e_MaxJoyAxes = 4; - e_MaxJoyHats = 4; + e_MaxJoyAxes = 8; + e_MaxJoyHats = 8; + e_MaxVirtKeys = 48; e_MaxJoyKeys = e_MaxJoyBtns + e_MaxJoyAxes*2 + e_MaxJoyHats*4; - e_MaxInputKeys = e_MaxKbdKeys + e_MaxJoys*e_MaxJoyKeys - 1; + e_MaxInputKeys = e_MaxKbdKeys + e_MaxJoys*e_MaxJoyKeys + e_MaxVirtKeys - 1; // $$$..$$$ - 321 Keyboard buttons/keys // $$$..$$$ - 4*32 Joystick buttons - // $$$..$$$ - 4*4 Joystick axes (- and +) + // $$$..$$$ - 8*2 Joystick axes (- and +) // $$$..$$$ - 4*4 Joystick hats (L U R D) + // $$$..$$$ - 48 Virtual buttons/keys // these are apparently used in g_gui and g_game and elsewhere IK_INVALID = 65535; @@ -68,6 +86,43 @@ const // TODO: think of something better than this shit IK_LASTKEY = SDL_NUM_SCANCODES-1; + VK_FIRSTKEY = e_MaxKbdKeys + e_MaxJoys*e_MaxJoyKeys; + VK_LEFT = VK_FIRSTKEY + 0; + VK_RIGHT = VK_FIRSTKEY + 1; + VK_UP = VK_FIRSTKEY + 2; + VK_DOWN = VK_FIRSTKEY + 3; + VK_FIRE = VK_FIRSTKEY + 4; + VK_OPEN = VK_FIRSTKEY + 5; + VK_JUMP = VK_FIRSTKEY + 6; + VK_CHAT = VK_FIRSTKEY + 7; + VK_ESCAPE = VK_FIRSTKEY + 8; + VK_0 = VK_FIRSTKEY + 9; + VK_1 = VK_FIRSTKEY + 10; + VK_2 = VK_FIRSTKEY + 11; + VK_3 = VK_FIRSTKEY + 12; + VK_4 = VK_FIRSTKEY + 13; + VK_5 = VK_FIRSTKEY + 14; + VK_6 = VK_FIRSTKEY + 15; + VK_7 = VK_FIRSTKEY + 16; + VK_8 = VK_FIRSTKEY + 17; + VK_9 = VK_FIRSTKEY + 18; + VK_A = VK_FIRSTKEY + 19; + VK_B = VK_FIRSTKEY + 20; + VK_C = VK_FIRSTKEY + 21; + VK_D = VK_FIRSTKEY + 22; + VK_E = VK_FIRSTKEY + 23; + VK_F = VK_FIRSTKEY + 24; + VK_CONSOLE = VK_FIRSTKEY + 25; + VK_STATUS = VK_FIRSTKEY + 26; + VK_TEAM = VK_FIRSTKEY + 27; + VK_PREV = VK_FIRSTKEY + 28; + VK_NEXT = VK_FIRSTKEY + 29; + VK_STRAFE = VK_FIRSTKEY + 30; + VK_LSTRAFE = VK_FIRSTKEY + 31; + VK_RSTRAFE = VK_FIRSTKEY + 32; + VK_PRINTSCR = VK_FIRSTKEY + 33; + VK_LASTKEY = e_MaxKbdKeys + e_MaxJoys*e_MaxJoyKeys + e_MaxVirtKeys - 1; + AX_MINUS = 0; AX_PLUS = 1; HAT_LEFT = 0; @@ -78,7 +133,8 @@ const function e_InitInput(): Boolean; procedure e_ReleaseInput(); procedure e_ClearInputBuffer(); -function e_PollInput(): Boolean; +//function e_PollInput(): Boolean; +procedure e_PollJoysticks(); // call this from message loop to update joysticks function e_KeyPressed(Key: Word): Boolean; function e_AnyKeyPressed(): Boolean; function e_GetFirstKeyPressed(): Word; @@ -89,6 +145,9 @@ function e_JoyAxisToKey(id: Word; ax: Byte; dir: Byte): Word; function e_JoyHatToKey(id: Word; hat: Byte; dir: Byte): Word; procedure e_SetKeyState(key: Word; state: Integer); +procedure e_UnpressAllKeys (); +procedure e_KeyUpDown (key: Word; down: Boolean); + var {e_MouseInfo: TMouseInfo;} e_EnableInput: Boolean = False; @@ -108,6 +167,8 @@ const JOYA_END = JOYA_BEG + e_MaxJoyAxes*2*e_MaxJoys; JOYH_BEG = JOYA_END; JOYH_END = JOYH_BEG + e_MaxJoyHats*4*e_MaxJoys; + VIRT_BEG = JOYH_END; + VIRT_END = VIRT_BEG + e_MaxVirtKeys; type TJoystick = record @@ -118,16 +179,18 @@ type Hats: Byte; ButtBuf: array [0..e_MaxJoyBtns] of Boolean; AxisBuf: array [0..e_MaxJoyAxes] of Integer; + AxisZero: array [0..e_MaxJoyAxes] of Integer; HatBuf: array [0..e_MaxJoyHats] of array [HAT_LEFT..HAT_DOWN] of Boolean; end; var KeyBuffer: array [0..e_MaxKbdKeys] of Boolean; + VirtBuffer: array [0..e_MaxVirtKeys] of Boolean; Joysticks: array of TJoystick = nil; function OpenJoysticks(): Byte; var - i, k, c: Integer; + i, j, k, c: Integer; joy: PSDL_Joystick; begin Result := 0; @@ -140,7 +203,8 @@ begin if joy <> nil then begin Inc(c); - e_WriteLog('Input: Opened SDL joystick ' + IntToStr(i) + ' as joystick ' + IntToStr(c) + ':', MSG_NOTIFY); + e_WriteLog('Input: Opened SDL joystick ' + IntToStr(i) + ' (' + SDL_JoystickName(joy) + + ') as joystick ' + IntToStr(c) + ':', TMsgType.Notify); SetLength(Joysticks, c); with Joysticks[c-1] do begin @@ -149,8 +213,10 @@ begin Axes := Min(e_MaxJoyAxes, SDL_JoystickNumAxes(joy)); Buttons := Min(e_MaxJoyBtns, SDL_JoystickNumButtons(joy)); Hats := Min(e_MaxJoyHats, SDL_JoystickNumHats(joy)); + // TODO: find proper solution for this xbox trigger shit + for j := 0 to Axes do AxisZero[j] := SDL_JoystickGetAxis(joy, j); e_WriteLog(' ' + IntToStr(Axes) + ' axes, ' + IntToStr(Buttons) + ' buttons, ' + - IntToStr(Hats) + ' hats.', MSG_NOTIFY); + IntToStr(Hats) + ' hats.', TMsgType.Notify); end; end; end; @@ -168,37 +234,57 @@ begin SetLength(Joysticks, 0); end; + +procedure e_UnpressAllKeys (); +var + i: Integer; +begin + for i := 0 to High(KeyBuffer) do KeyBuffer[i] := False; + for i := 0 to High(VirtBuffer) do VirtBuffer[i] := False; +end; + + +procedure e_KeyUpDown (key: Word; down: Boolean); +begin + if (key > 0) and (key < Length(KeyBuffer)) then KeyBuffer[key] := down + else if (key >= VIRT_BEG) and (key < VIRT_END) then VirtBuffer[key - VIRT_BEG] := down +end; + + function PollKeyboard(): Boolean; +{ var Keys: PByte; NKeys: Integer; - i: Cardinal; + i: NativeUInt; +} begin Result := False; + { Keys := SDL_GetKeyboardState(@NKeys); - if (Keys = nil) or (NKeys < 1) then - Exit; + if (Keys = nil) or (NKeys < 1) then Exit; for i := 0 to NKeys do - KeyBuffer[i] := ((PByte(Cardinal(Keys) + i)^) <> 0); - for i := NKeys to High(KeyBuffer) do - KeyBuffer[i] := False; + begin + if ((PByte(NativeUInt(Keys) + i)^) <> 0) then KeyBuffer[i] := false; + end; + for i := NKeys to High(KeyBuffer) do KeyBuffer[i] := False; + } end; -function PollJoysticks(): Boolean; +procedure e_PollJoysticks(); var i, j: Word; hat: Byte; begin - Result := False; + //Result := False; if (Joysticks = nil) or (e_JoysticksAvailable = 0) then Exit; SDL_JoystickUpdate(); for j := Low(Joysticks) to High(Joysticks) do + begin with Joysticks[j] do begin - for i := 0 to Buttons do - ButtBuf[i] := SDL_JoystickGetButton(Handle, i) <> 0; - for i := 0 to Axes do - AxisBuf[i] := SDL_JoystickGetAxis(Handle, i); + for i := 0 to Buttons do ButtBuf[i] := SDL_JoystickGetButton(Handle, i) <> 0; + for i := 0 to Axes do AxisBuf[i] := SDL_JoystickGetAxis(Handle, i); for i := 0 to Hats do begin hat := SDL_JoystickGetHat(Handle, i); @@ -208,6 +294,7 @@ begin HatBuf[i, HAT_RIGHT] := LongBool(hat and SDL_HAT_RIGHT); end; end; + end; end; procedure GenerateKeyNames(); @@ -242,12 +329,16 @@ begin e_KeyNames[k + i*4 + 3] := Format('JOY%d D%dD', [j, i]); end; end; + + // vitrual keys + for i := 0 to e_MaxVirtKeys-1 do + e_KeyNames[VIRT_BEG + i] := 'VIRTUAL ' + IntToStr(i); end; function e_InitInput(): Boolean; begin Result := False; - + e_JoysticksAvailable := OpenJoysticks(); e_EnableInput := True; GenerateKeyNames(); @@ -278,17 +369,21 @@ begin for d := Low(Joysticks[i].HatBuf[j]) to High(Joysticks[i].HatBuf[j]) do Joysticks[i].HatBuf[j, d] := False; end; + for i := Low(VirtBuffer) to High(VirtBuffer) do + VirtBuffer[i] := False; end; +{ function e_PollInput(): Boolean; var kb, js: Boolean; begin kb := PollKeyboard(); - js := PollJoysticks(); + js := e_PollJoysticks(); Result := kb or js; end; +} function e_KeyPressed(Key: Word): Boolean; var @@ -324,9 +419,11 @@ begin Key := (Key - JOYA_BEG) mod (e_MaxJoyAxes*2); dir := Key mod 2; if dir = AX_MINUS then - Result := Joysticks[JoyI].AxisBuf[Key div 2] < -e_JoystickDeadzones[JoyI] + Result := Joysticks[JoyI].AxisBuf[Key div 2] < + Joysticks[JoyI].AxisZero[Key div 2] - e_JoystickDeadzones[JoyI] else - Result := Joysticks[JoyI].AxisBuf[Key div 2] > e_JoystickDeadzones[JoyI] + Result := Joysticks[JoyI].AxisBuf[Key div 2] > + Joysticks[JoyI].AxisZero[Key div 2] + e_JoystickDeadzones[JoyI] end; end @@ -341,7 +438,10 @@ begin dir := Key mod 4; Result := Joysticks[JoyI].HatBuf[Key div 4, dir]; end; - end; + end + + else if (Key >= VIRT_BEG) and (Key < VIRT_END) then + Result := VirtBuffer[Key - VIRT_BEG] end; procedure e_SetKeyState(key: Word; state: Integer); @@ -390,7 +490,10 @@ begin dir := Key mod 4; Joysticks[JoyI].HatBuf[Key div 4, dir] := (state <> 0); end; - end; + end + + else if (Key >= VIRT_BEG) and (Key < VIRT_END) then + VirtBuffer[Key - VIRT_BEG] := (state <> 0) end; function e_AnyKeyPressed(): Boolean;