diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas
index 40b7522c8690c3d0896fa842424fc0facccf5c30..1c27249fc44465151cf00dc129c9bf85fa6a5f51 100644 (file)
--- a/src/engine/e_input.pas
+++ b/src/engine/e_input.pas
+(* 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 <http://www.gnu.org/licenses/>.
+ *)
+{$INCLUDE ../shared/a_modes.inc}
unit e_input;
interface
uses
SysUtils,
e_log,
- SDL;
+ SDL2;
const
- e_MaxKbdKeys = 321;
+ 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_UNKNOWN = SDLK_UNKNOWN;
IK_INVALID = 65535;
- IK_ESCAPE = SDLK_ESCAPE;
- IK_RETURN = SDLK_RETURN;
- IK_ENTER = SDLK_RETURN;
- IK_UP = SDLK_UP;
- IK_DOWN = SDLK_DOWN;
- IK_LEFT = SDLK_LEFT;
- IK_RIGHT = SDLK_RIGHT;
- IK_DELETE = SDLK_DELETE;
- IK_HOME = SDLK_HOME;
- IK_INSERT = SDLK_INSERT;
- IK_SPACE = SDLK_SPACE;
- IK_CONTROL = SDLK_LCTRL;
- IK_SHIFT = SDLK_LSHIFT;
- IK_TAB = SDLK_TAB;
- IK_PAGEUP = SDLK_PAGEUP;
- IK_PAGEDN = SDLK_PAGEDOWN;
- IK_F2 = SDLK_F2;
- IK_F3 = SDLK_F3;
- IK_F4 = SDLK_F4;
- IK_F5 = SDLK_F5;
- IK_F6 = SDLK_F6;
- IK_F7 = SDLK_F7;
- IK_F8 = SDLK_F8;
- IK_F9 = SDLK_F9;
- IK_F10 = SDLK_F10;
- IK_END = SDLK_END;
- IK_BACKSPACE = SDLK_BACKSPACE;
- IK_BACKQUOTE = SDLK_BACKQUOTE;
- IK_PAUSE = SDLK_PAUSE;
+ IK_ESCAPE = SDL_SCANCODE_ESCAPE;
+ IK_RETURN = SDL_SCANCODE_RETURN;
+ IK_KPRETURN= SDL_SCANCODE_KP_ENTER;
+ IK_ENTER = SDL_SCANCODE_RETURN;
+ IK_UP = SDL_SCANCODE_UP;
+ IK_KPUP = SDL_SCANCODE_KP_8;
+ IK_DOWN = SDL_SCANCODE_DOWN;
+ IK_KPDOWN = SDL_SCANCODE_KP_2;
+ IK_LEFT = SDL_SCANCODE_LEFT;
+ IK_KPLEFT = SDL_SCANCODE_KP_4;
+ IK_RIGHT = SDL_SCANCODE_RIGHT;
+ IK_KPRIGHT = SDL_SCANCODE_KP_6;
+ IK_DELETE = SDL_SCANCODE_DELETE;
+ IK_HOME = SDL_SCANCODE_HOME;
+ IK_KPHOME = SDL_SCANCODE_KP_7;
+ IK_INSERT = SDL_SCANCODE_INSERT;
+ IK_SPACE = SDL_SCANCODE_SPACE;
+ IK_CONTROL = SDL_SCANCODE_LCTRL;
+ IK_SHIFT = SDL_SCANCODE_LSHIFT;
+ IK_TAB = SDL_SCANCODE_TAB;
+ IK_PAGEUP = SDL_SCANCODE_PAGEUP;
+ IK_KPPAGEUP= SDL_SCANCODE_KP_9;
+ IK_PAGEDN = SDL_SCANCODE_PAGEDOWN;
+ IK_KPPAGEDN= SDL_SCANCODE_KP_3;
+ IK_F2 = SDL_SCANCODE_F2;
+ IK_F3 = SDL_SCANCODE_F3;
+ IK_F4 = SDL_SCANCODE_F4;
+ IK_F5 = SDL_SCANCODE_F5;
+ IK_F6 = SDL_SCANCODE_F6;
+ IK_F7 = SDL_SCANCODE_F7;
+ IK_F8 = SDL_SCANCODE_F8;
+ IK_F9 = SDL_SCANCODE_F9;
+ IK_F10 = SDL_SCANCODE_F10;
+ IK_END = SDL_SCANCODE_END;
+ IK_KPEND = SDL_SCANCODE_KP_1;
+ IK_BACKSPACE = SDL_SCANCODE_BACKSPACE;
+ IK_BACKQUOTE = SDL_SCANCODE_GRAVE;
+ IK_GRAVE = SDL_SCANCODE_GRAVE;
+ IK_PAUSE = SDL_SCANCODE_PAUSE;
+ IK_Y = SDL_SCANCODE_Y;
+ IK_N = SDL_SCANCODE_N;
// TODO: think of something better than this shit
- IK_LASTKEY = 320;
+ 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;
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;
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;
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
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;
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
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;
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_GetKeyState(@NKeys);
- if (Keys = nil) or (NKeys < 1) then
- Exit;
+ {
+ Keys := SDL_GetKeyboardState(@NKeys);
+ 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);
HatBuf[i, HAT_RIGHT] := LongBool(hat and SDL_HAT_RIGHT);
end;
end;
+ end;
end;
procedure GenerateKeyNames();
begin
// keyboard key names
for i := 0 to IK_LASTKEY do
- begin
- e_KeyNames[i] := SDL_GetKeyName(i);
- if e_KeyNames[i] = 'unknown key' then
- e_KeyNames[i] := '';
- end;
+ e_KeyNames[i] := SDL_GetScancodeName(i);
// joysticks
for j := 0 to e_MaxJoys-1 do
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;
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
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
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);
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;