X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_system.pas;h=89cebaf02b5e84d292118595e878a4a17e680f52;hp=7899e9cfac8e602b427f5c21049bcdf72e845e1b;hb=e452d337f0620b50d8d978b534437b2732134d8f;hpb=9b4492224e2e59560931496e925333bdbe6f2b0e diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas index 7899e9c..89cebaf 100644 --- a/src/game/sdl2/g_system.pas +++ b/src/game/sdl2/g_system.pas @@ -25,7 +25,7 @@ interface (* --- Graphics --- *) function sys_GetDisplayModes (bpp: Integer): SSArray; - function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen: Boolean): Boolean; + function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean; procedure sys_EnableVSync (yes: Boolean); procedure sys_Repaint; @@ -40,7 +40,7 @@ interface implementation uses - SysUtils, SDL2, Math, + SysUtils, SDL2, Math, ctypes, e_log, e_graphics, e_input, e_sound, {$INCLUDE ../nogl/noGLuses.inc} {$IFDEF ENABLE_HOLMES} @@ -54,7 +54,8 @@ implementation var window: PSDL_Window; context: TSDL_GLContext; - display: Integer; + display, wx, wy: Integer; + wc: Boolean; 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; @@ -77,6 +78,15 @@ implementation 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); + e_ResizeFramebuffer(w, h); + end; gScreenWidth := w; gScreenHeight := h; {$IFDEF ENABLE_HOLMES} @@ -105,8 +115,8 @@ implementation result := PChar(Format(GameTitle, [info])) end; - function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean; - var flags: UInt32; x, y: Integer; + function InitWindow (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean; + var flags: UInt32; x, y: cint; begin // note: on window close make: if assigned(oglDeinitCB) then oglDeinitCB; e_LogWritefln('InitWindow %s %s %s %s', [w, h, bpp, fullScreen]); @@ -129,8 +139,17 @@ implementation {$ENDIF} flags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE; if fullScreen then flags := flags or SDL_WINDOW_FULLSCREEN; - x := SDL_WINDOWPOS_CENTERED; - y := SDL_WINDOWPOS_CENTERED; + if maximized then flags := flags or SDL_WINDOW_MAXIMIZED; + if wc then + begin + x := SDL_WINDOWPOS_CENTERED; + y := SDL_WINDOWPOS_CENTERED + end + else + begin + x := wx; + y := wy + end; window := SDL_CreateWindow(GetTitle(), x, y, w, h, flags); if window <> nil then begin @@ -139,12 +158,31 @@ implementation begin {$IFDEF NOGL_INIT} nogl_Init; + glRenderToFBO := False; // TODO: check for GL_OES_framebuffer_object + {$ELSE} + if glRenderToFBO then + if not Load_GL_ARB_framebuffer_object() then + if not Load_GL_EXT_framebuffer_object() then + begin + e_LogWriteln('SDL: no framebuffer support detected'); + glRenderToFBO := False + end; {$ENDIF} + if (fullscreen = false) and (maximized = false) and (wc = false) then + begin + SDL_GetWindowPosition(window, @x, @y); + wx := x; wy := y + end; + gFullScreen := fullscreen; + gWinMaximized := maximized; + gRC_FullScreen := fullscreen; + gRC_Maximized := maximized; UpdateSize(w, h); result := true end else begin + // SDL_DestroyWindow(window); e_LogWritefln('SDL: unable to create OpenGL context: %s', [SDL_GetError]) end end @@ -155,9 +193,31 @@ implementation end else begin - if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0; SDL_SetWindowSize(window, w, h); + if wc then + begin + x := SDL_WINDOWPOS_CENTERED; + y := SDL_WINDOWPOS_CENTERED + end + else + begin + x := wx; + y := wy + end; + SDL_SetWindowPosition(window, x, y); + if (fullscreen = false) and (maximized = false) and (wc = false) then + begin + SDL_GetWindowPosition(window, @x, @y); + wx := x; wy := y + end; + if maximized then + SDL_MaximizeWindow(window); + if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0; SDL_SetWindowFullscreen(window, flags); + gFullScreen := fullscreen; + gWinMaximized := maximized; + gRC_FullScreen := fullscreen; + gRC_Maximized := maximized; UpdateSize(w, h); result := true end @@ -165,6 +225,8 @@ implementation procedure sys_Repaint; begin + if glRenderToFBO then + e_BlitFramebuffer(gWinSizeX, gWinSizeY); SDL_GL_SwapWindow(window) end; @@ -208,9 +270,9 @@ implementation end end; - function sys_SetDisplayMode (w, h, bpp: Integer; fullScreen: Boolean): Boolean; + function sys_SetDisplayMode (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean; begin - result := InitWindow(w, h, bpp, fullScreen) + result := InitWindow(w, h, bpp, fullScreen, maximized) end; (* --------- Joystick --------- *) @@ -363,10 +425,17 @@ implementation function HandleWindow (var ev: TSDL_WindowEvent): Boolean; begin result := false; + if g_dbg_input then + e_LogWritefln('Window Event: event = %s, data1 = %s, data2 = %s', [ev.event, ev.data1, ev.data2]); case ev.event of SDL_WINDOWEVENT_RESIZED: UpdateSize(ev.data1, ev.data2); SDL_WINDOWEVENT_EXPOSED: sys_Repaint; SDL_WINDOWEVENT_CLOSE: result := true; + SDL_WINDOWEVENT_MOVED: + begin + wx := ev.data1; + wy := ev.data2 + end; SDL_WINDOWEVENT_FOCUS_LOST, SDL_WINDOWEVENT_MINIMIZED: begin e_UnpressAllKeys; @@ -378,6 +447,16 @@ implementation end; SDL_WINDOWEVENT_FOCUS_GAINED, SDL_WINDOWEVENT_MAXIMIZED, SDL_WINDOWEVENT_RESTORED: begin + if ev.event = SDL_WINDOWEVENT_MAXIMIZED then + begin + gWinMaximized := true; + gRC_Maximized := true + end + else if ev.event = SDL_WINDOWEVENT_RESTORED then + begin + gWinMaximized := false; + gRC_Maximized := false + end; e_MuteChannels(false); {$IFDEF ENABLE_HOLMES} if assigned(winFocusCB) then winFocusCB; @@ -470,11 +549,15 @@ implementation flags := SDL_INIT_TIMER or $00004000; {$ENDIF} {$ELSE} - flags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO; + flags := SDL_INIT_TIMER or SDL_INIT_VIDEO; {$ENDIF} SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0'); if SDL_Init(flags) <> 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError); + {$IFNDEF HEADLESS} + if SDL_InitSubSystem(SDL_INIT_JOYSTICK) <> 0 then + e_LogWritefln('SDL: Init subsystem failed: %s', [SDL_GetError()]); + {$ENDIF} SDL_ShowCursor(SDL_DISABLE); end; @@ -499,4 +582,11 @@ implementation initialization conRegVar('sdl2_display_index', @display, 'use display index as base', ''); + conRegVar('sdl2_window_x', @wx, 'window position x', ''); + conRegVar('sdl2_window_y', @wy, 'window position y', ''); + conRegVar('sdl2_window_center', @wc, 'force window creation at center', ''); + display := 0; + wx := SDL_WINDOWPOS_CENTERED; + wy := SDL_WINDOWPOS_CENTERED; + wc := false end.