X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=6d7cf03ef433b371fb4abcad6cf440f1c9b8cbd5;hb=cf4041fda8857d538748aee9ddb3a13cad6157ab;hp=fb6dd77c5c71dd9157525a9c5d5afa3a256286b8;hpb=c7142be1c73501f5ca7fff57c6b1af1891ed83d0;p=d2df-sdl.git diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index fb6dd77..6d7cf03 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -19,112 +19,77 @@ interface uses Utils; - (* --- Utils --- *) - function sys_GetTicks (): Int64; - procedure sys_Delay (ms: Integer); + type + TGLProfile = (Core, Compat, Common, CommonLite); + + TGLDisplayInfo = record + w, h, bpp: Integer; + fullscreen: Boolean; + maximized: Boolean; + major, minor: Integer; + profile: TGLProfile; + end; (* --- Graphics --- *) + function sys_GetDisplayModes (bpp: Integer): SSArray; function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean; procedure sys_EnableVSync (yes: Boolean); procedure sys_Repaint; + function sys_SetDisplayModeGL (const info: TGLDisplayInfo): Boolean; + (* --- Input --- *) + 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; + var (* hooks *) + sys_CharPress: procedure (ch: AnsiChar) = nil; + sys_ScreenResize: procedure (w, h: Integer) = nil; + implementation uses - {$IFDEF DARWIN} + {$IF DEFINED(DARWIN) OR DEFINED(MACOS)} Keyboards, Events, + {$IFDEF CPU64} + {$linkframework Carbon} + {$ENDIF} {$ENDIF} SysUtils, SDL, Math, - {$INCLUDE ../nogl/noGLuses.inc} - e_log, e_graphics, e_input, e_sound, - g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic; + e_log, e_input, e_sound, + g_options, g_console, g_game, g_basic; const - GameTitle = 'Doom 2D: Forever (SDL 1.2, %s)'; + GameTitle = 'Doom 2D: Forever (SDL 1.2, %s, %s)'; var userResize: Boolean; modeResize: Integer; + useScancodes: Boolean; screen: PSDL_Surface; JoystickHandle: array [0..e_MaxJoys - 1] of PSDL_Joystick; 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; - (* --------- Graphics --------- *) - function LoadGL: Boolean; + function GetDriver (): AnsiString; + var buf: array [0..31] of AnsiChar; 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; - - procedure UpdateSize (w, h: Integer); - begin - gWinSizeX := w; - gWinSizeY := h; - gRC_Width := w; - gRC_Height := h; - if glRenderToFBO then - begin - // store real window size in gWinSize, downscale resolution now - w := round(w / r_pixel_scale); - h := round(h / r_pixel_scale); - if not e_ResizeFramebuffer(w, h) then - begin - e_LogWriteln('GL: could not create framebuffer, falling back to --no-fbo'); - glRenderToFBO := False; - w := gWinSizeX; - h := gWinSizeY; - end; - end; - gScreenWidth := w; - gScreenHeight := h; - {$IFDEF ENABLE_HOLMES} - fuiScrWdt := w; - fuiScrHgt := h; - {$ENDIF} - e_ResizeWindow(w, h); - e_InitGL; - g_Game_SetupScreenSize; - g_Menu_Reset; - g_Game_ClearLoading; + buf := ''; + SDL_VideoDriverName(buf, Length(buf)); + result := AnsiString(buf); end; function GetTitle (): AnsiString; @@ -133,7 +98,7 @@ implementation info := g_GetBuildHash(false); if info = 'custom build' then info := info + ' by ' + g_GetBuilderName() + ' ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME; - result := Format(GameTitle, [info]); + result := Format(GameTitle, [GetDriver(), info]); end; function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean; @@ -156,16 +121,12 @@ implementation screen := SDL_SetVideoMode(w, h, bpp, flags); if screen <> nil then begin - if not LoadGL then - begin - e_LogWriteln('GL: unable to load OpenGL functions', TMsgType.Fatal); - exit; - end; title := GetTitle(); SDL_WM_SetCaption(PChar(title), nil); gFullScreen := fullscreen; gRC_FullScreen := fullscreen; - UpdateSize(w, h); + if @sys_ScreenResize <> nil then + sys_ScreenResize(w, h); result := True end end @@ -209,6 +170,14 @@ implementation result := InitWindow(w, h, bpp, fullscreen) end; + function sys_SetDisplayModeGL (const info: TGLDisplayInfo): Boolean; + begin + result := false; + case info.profile of + TGLProfile.Compat: result := InitWindow(info.w, info.h, info.bpp, info.fullscreen); + end; + end; + (* --------- Joystick --------- *) procedure HandleJoyButton (var ev: TSDL_JoyButtonEvent); @@ -348,7 +317,26 @@ implementation (* --------- Input --------- *) -{$IFDEF DARWIN} +{$IF DEFINED(DARWIN) OR DEFINED(MACOS)} + var + IsMacPlatform: Boolean; + + function IsMacModSym (sym: Integer): Boolean; + begin + case sym of + SDLK_NUMLOCK, + SDLK_CAPSLOCK, + SDLK_RCTRL, SDLK_LCTRL, + SDLK_RSHIFT, SDLK_LSHIFT, + SDLK_RALT, SDLK_LALT, + SDLK_RSUPER, SDLK_LSUPER, + SDLK_RMETA, SDLK_LMETA: + result := true; + otherwise + result := false; + end; + end; + function Mac2Stub (scancode: Integer): Integer; begin (* SDL 2 swap tilda/grave and paragraph/plus-minus buttons on ISO keyboards *) @@ -488,6 +476,18 @@ implementation end; {$ENDIF} +{$IFDEF ENABLE_TOUCH} + procedure sys_ShowKeyboard (yes: Boolean); + begin + // stub + end; + + function sys_IsTextInputActive (): Boolean; + begin + Result := false + end; +{$ENDIF} + function Key2Stub (key: Integer): Integer; var x: Integer; begin @@ -571,8 +571,6 @@ implementation SDLK_PAUSE: x := IK_PAUSE; SDLK_A..SDLK_Z: x := IK_A + (key - SDLK_A); SDLK_MINUS: x := IK_MINUS; - SDLK_RMETA: x := IK_RMETA; - SDLK_LMETA: x := IK_LMETA; else x := IK_INVALID end; @@ -583,9 +581,14 @@ implementation var down, repeated: Boolean; key: Integer; ch: Char; begin key := IK_INVALID; - {$IFDEF DARWIN} - key := Mac2Stub(ev.keysym.scancode); - {$ENDIF} + if useScancodes then + begin + {$IF DEFINED(DARWIN) OR DEFINED(MACOS)} + if IsMacPlatform then + if IsMacModSym(ev.keysym.sym) = false then + key := Mac2Stub(ev.keysym.scancode); + {$ENDIF} + end; if key = IK_INVALID then key := Key2Stub(ev.keysym.sym); down := (ev.type_ = SDL_KEYDOWN); @@ -602,16 +605,17 @@ implementation begin g_Console_ProcessBindRepeat(key) end; - if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then - CharPress(ch) + if @sys_CharPress <> nil then + if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then + sys_CharPress(ch) end; procedure HandleResize (var ev: TSDL_ResizeEvent); begin if g_dbg_input then e_LogWritefln('Input Debug: SDL_VIDEORESIZE %s %s', [ev.w, ev.h]); - if modeResize = 1 then - UpdateSize(ev.w, ev.h) + if (modeResize = 1) and (@sys_ScreenResize <> nil) then + sys_ScreenResize(ev.w, ev.h) else if modeResize > 1 then InitWindow(ev.w, ev.h, gBPP, gFullscreen) end; @@ -645,7 +649,7 @@ implementation (* --------- Init --------- *) procedure sys_Init; - var flags: Uint32; i: Integer; + var flags: Uint32; i: Integer; name: AnsiString; begin e_WriteLog('Init SDL', TMsgType.Notify); flags := SDL_INIT_VIDEO or SDL_INIT_AUDIO or @@ -653,6 +657,11 @@ implementation (*or SDL_INIT_NOPARACHUTE*); if SDL_Init(flags) <> 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError); + name := GetDriver(); + e_LogWritefln('SDL: Video Driver "%s"', [name]); + {$IF DEFINED(DARWIN) OR DEFINED(MACOS)} + IsMacPlatform := (name = 'Quartz') or (name = 'toolbox') or (name = 'DSp'); + {$ENDIF} SDL_EnableUNICODE(1); SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); for i := 0 to e_MaxJoys - 1 do @@ -666,10 +675,7 @@ implementation for i := 0 to e_MaxJoys - 1 do RemoveJoystick(i); if screen <> nil then - begin - FreeGL; - SDL_FreeSurface(screen) - end; + SDL_FreeSurface(screen); SDL_Quit end; @@ -677,6 +683,8 @@ initialization (* window resize are broken both on linux and osx, so disabled by default *) conRegVar('sdl_allow_resize', @userResize, 'allow to resize window by user', 'allow to resize window by user'); conRegVar('sdl_resize_action', @modeResize, 'set window resize mode (0: ignore, 1: change, 2: reset)', ''); + conRegVar('sdl_use_scancodes', @useScancodes, 'use platform-specific scancodes when possible', ''); userResize := false; modeResize := 0; + useScancodes := true; end.