X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_system.pas;h=abfbfb322dfebceeb83d4f5c9b99fd7ee204e6fb;hb=f0a9bf39a38819cc4e86b81d2daefc6b029ccb20;hp=5468afb36645a728039d44582cae616022672cf9;hpb=f8c006bbcbec547e9a3beda8372076a10ed049ae;p=d2df-sdl.git diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas index 5468afb..abfbfb3 100644 --- a/src/game/sdl2/g_system.pas +++ b/src/game/sdl2/g_system.pas @@ -19,10 +19,6 @@ interface uses Utils; - (* --- Utils --- *) - function sys_GetTicks (): Int64; - procedure sys_Delay (ms: Integer); - (* --- Graphics --- *) function sys_GetDisplayModes (bpp: Integer): SSArray; function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean; @@ -33,6 +29,11 @@ interface function sys_HandleInput (): Boolean; procedure sys_RequestQuit; +{$IFDEF ENABLE_TOUCH} + function sys_IsTextInputActive (): Boolean; + procedure sys_ShowKeyboard (yes: Boolean); +{$ENDIF} + (* --- Init --- *) procedure sys_Init; procedure sys_Final; @@ -44,13 +45,19 @@ interface implementation uses - SysUtils, SDL2, Math, ctypes, - e_log, r_graphics, e_input, e_sound, - {$INCLUDE ../nogl/noGLuses.inc} {$IFDEF ENABLE_HOLMES} - g_holmes, sdlcarcass, fui_ctls, + sdlcarcass, + {$ENDIF} + {$IFNDEF HEADLESS} + r_render, {$ENDIF} - g_touch, g_options, g_console, g_game, g_menu, g_gui, g_basic; + {$IFDEF ENABLE_MENU} + g_gui, + {$ENDIF} + SysUtils, SDL2, Math, ctypes, + e_log, e_input, e_sound, + g_options, g_console, g_game, g_basic + ; const GameTitle = 'Doom 2D: Forever (SDL 2, %s)'; @@ -64,42 +71,14 @@ implementation JoystickHatState: array [0..e_MaxJoys - 1, 0..e_MaxJoyHats - 1, HAT_LEFT..HAT_DOWN] of Boolean; JoystickZeroAxes: array [0..e_MaxJoys - 1, 0..e_MaxJoyAxes - 1] of Integer; - (* --------- Utils --------- *) - - function sys_GetTicks (): Int64; - begin - result := SDL_GetTicks() - end; - - procedure sys_Delay (ms: Integer); - begin - SDL_Delay(ms) - end; +{$IFDEF ENABLE_TOUCH} + var (* touch *) + angleFire: Boolean; + keyFinger: array [VK_FIRSTKEY..VK_LASTKEY] of Integer; +{$ENDIF} (* --------- Graphics --------- *) - function LoadGL: Boolean; - begin - result := true; - {$IFDEF NOGL_INIT} - nogl_Init; - if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then - {$ELSE} - if glRenderToFBO and (not Load_GL_ARB_framebuffer_object) then - {$ENDIF} - begin - e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering'); - glRenderToFBO := false; - end; - end; - - procedure FreeGL; - begin - {$IFDEF NOGL_INIT} - nogl_Quit(); - {$ENDIF} - end; - function GetTitle (): PChar; var info: AnsiString; begin @@ -150,12 +129,6 @@ implementation context := SDL_GL_CreateContext(window); if context <> nil then begin - if not LoadGL then - begin - e_LogWriteln('GL: unable to load OpenGL functions', TMsgType.Fatal); - SDL_GL_DeleteContext(context); context := nil; - exit; - end; if (fullscreen = false) and (maximized = false) and (wc = false) then begin SDL_GetWindowPosition(window, @x, @y); @@ -408,6 +381,136 @@ implementation end end; + (* --------- Touch --------- *) + +{$IFDEF ENABLE_TOUCH} + function sys_IsTextInputActive (): Boolean; + begin + Result := SDL_IsTextInputActive() = SDL_True + end; + + procedure sys_ShowKeyboard (yes: Boolean); + begin + {$IFNDEF HEADLESS} + if g_dbg_input then + e_LogWritefln('g_Touch_ShowKeyboard(%s)', [yes]); + (* on desktop we always receive text (needed for cheats) *) + if yes or (SDL_HasScreenKeyboardSupport() = SDL_FALSE) then + SDL_StartTextInput + else + SDL_StopTextInput + {$ENDIF} + end; + + procedure HandleTouch (const ev: TSDL_TouchFingerEvent); + var + x, y, i, finger: Integer; + + function IntersectControl(ctl, xx, yy: Integer): Boolean; + var x, y, w, h: Integer; founded: Boolean; + begin + r_Render_GetKeyRect(ctl, x, y, w, h, founded); + result := founded and (xx >= x) and (yy >= y) and (xx <= x + w) and (yy <= y + h); + end; + + procedure KeyUp (finger, i: Integer); + begin + if g_dbg_input then + e_LogWritefln('Input Debug: g_touch.KeyUp, finger=%s, key=%s', [finger, i]); + + keyFinger[i] := 0; + e_KeyUpDown(i, False); + g_Console_ProcessBind(i, False); + + (* up/down + fire hack *) +{$IFDEF ENABLE_MENU} + if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and (g_ActiveWindow = nil) and angleFire then +{$ELSE} + if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and angleFire then +{$ENDIF} + begin + if (i = VK_UP) or (i = VK_DOWN) then + begin + angleFire := False; + keyFinger[VK_FIRE] := 0; + e_KeyUpDown(VK_FIRE, False); + g_Console_ProcessBind(VK_FIRE, False) + end + end + end; + + procedure KeyDown (finger, i: Integer); + begin + if g_dbg_input then + e_LogWritefln('Input Debug: g_touch.KeyDown, finger=%s, key=%s', [finger, i]); + + keyFinger[i] := finger; + e_KeyUpDown(i, True); + g_Console_ProcessBind(i, True); + + (* up/down + fire hack *) +{$IFDEF ENABLE_MENU} + if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and (g_ActiveWindow = nil) then +{$ELSE} + if g_touch_fire and (gGameSettings.GameType <> GT_NONE) then +{$ENDIF} + begin + if i = VK_UP then + begin + angleFire := True; + keyFinger[VK_FIRE] := -1; + e_KeyUpDown(VK_FIRE, True); + g_Console_ProcessBind(VK_FIRE, True) + end + else if i = VK_DOWN then + begin + angleFire := True; + keyFinger[VK_FIRE] := -1; + e_KeyUpDown(VK_FIRE, True); + g_Console_ProcessBind(VK_FIRE, True) + end + end + end; + + procedure KeyMotion (finger, i: Integer); + begin + if keyFinger[i] <> finger then + begin + KeyUp(finger, i); + KeyDown(finger, i) + end + end; + + begin + if not g_touch_enabled then + Exit; + + finger := ev.fingerId + 2; + x := Trunc(ev.x * gWinSizeX); + y := Trunc(ev.y * gWinSizeY); + + for i := VK_FIRSTKEY to VK_LASTKEY do + begin + if IntersectControl(i, x, y) then + begin + if ev.type_ = SDL_FINGERUP then + KeyUp(finger, i) + else if ev.type_ = SDL_FINGERMOTION then + KeyMotion(finger, i) + else if ev.type_ = SDL_FINGERDOWN then + keyDown(finger, i) + end + else if keyFinger[i] = finger then + begin + if ev.type_ = SDL_FINGERUP then + KeyUp(finger, i) + else if ev.type_ = SDL_FINGERMOTION then + KeyUp(finger, i) + end + end + end; +{$ENDIF} // TOUCH + (* --------- Input --------- *) function HandleWindow (var ev: TSDL_WindowEvent): Boolean; @@ -514,7 +617,9 @@ implementation SDL_JOYDEVICEADDED: HandleJoyAdd(ev.jdevice); SDL_JOYDEVICEREMOVED: HandleJoyRemove(ev.jdevice); SDL_TEXTINPUT: HandleTextInput(ev.text); - SDL_FINGERMOTION, SDL_FINGERDOWN, SDL_FINGERUP: g_Touch_HandleEvent(ev.tfinger); + {$IFDEF ENABLE_TOUCH} + SDL_FINGERMOTION, SDL_FINGERDOWN, SDL_FINGERUP: HandleTouch(ev.tfinger); + {$ENDIF} {$IFDEF ENABLE_HOLMES} SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION: fuiOnSDLEvent(ev); {$ENDIF} @@ -552,6 +657,12 @@ implementation e_LogWritefln('SDL: Init subsystem failed: %s', [SDL_GetError()]); {$ENDIF} SDL_ShowCursor(SDL_DISABLE); + {$IFDEF ENABLE_TOUCH} + sys_ShowKeyboard(FALSE); + g_touch_enabled := SDL_GetNumTouchDevices() > 0; + {$ELSE} + g_touch_enabled := False; + {$ENDIF} end; procedure sys_Final; @@ -559,7 +670,6 @@ implementation e_WriteLog('Releasing SDL2', TMsgType.Notify); if context <> nil then begin - FreeGL; SDL_GL_DeleteContext(context); context := nil; end;