diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 80e63fd640ae7fce250d3e713d7d6944440cfeb6..ab8df098b0be9534e5cec7279e0aa9533c9d0539 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* 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
function SDLMain (): Integer;
function GetTimer (): Int64;
procedure ResetTimer ();
-function CreateGLWindow (Title: PChar): Boolean;
-procedure KillGLWindow ();
procedure PushExitEvent ();
function ProcessMessage (): Boolean;
procedure ReDrawWindow ();
const
- ProgressUpdateMSecs = 100;
+ ProgressUpdateMSecs = 1;//100;
var
h_Wnd: PSDL_Window = nil;
{$ENDIF}
-procedure KillGLWindow ();
+procedure KillGLWindow (preserveGL: Boolean);
begin
- if (h_GL <> nil) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end;
+ if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end;
if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);
- if (h_GL <> nil) then SDL_GL_DeleteContext(h_GL);
+ if (h_GL <> nil) and (not preserveGL) then SDL_GL_DeleteContext(h_GL);
h_Wnd := nil;
- h_GL := nil;
+ if (not preserveGL) then h_GL := nil;
end;
var
mode, cmode: TSDL_DisplayMode;
wFlags: LongWord = 0;
+ nw, nh: Integer;
{$ENDIF}
begin
{$IF not DEFINED(HEADLESS)}
e_WriteLog('Setting display mode...', TMsgType.Notify);
- wFlags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE;
- if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN;
- if gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED;
-
- KillGLWindow();
+ wFlags := SDL_WINDOW_OPENGL {or SDL_WINDOW_RESIZABLE};
+ if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN else wFlags := wFlags or SDL_WINDOW_RESIZABLE;
+ if (not gFullscreen) and gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED;
if gFullscreen then
begin
mode.driverdata := nil;
if (SDL_GetClosestDisplayMode(0, @mode, @cmode) = nil) then
begin
+ e_WriteLog('SDL: cannot find display mode for '+IntToStr(gScreenWidth), TMsgType.Notify);
gScreenWidth := 800;
gScreenHeight := 600;
end
else
begin
+ e_WriteLog('SDL: found display mode for '+IntToStr(gScreenWidth)+'x'+IntToStr(gScreenHeight)+': '+IntToStr(cmode.w)+'x'+IntToStr(cmode.h), TMsgType.Notify);
gScreenWidth := cmode.w;
gScreenHeight := cmode.h;
end;
end;
- h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
- if (h_Wnd = nil) then exit;
+ (*if (preserveGL) and (h_Wnd <> nil) {and (gFullscreen)} then
+ begin
+ e_WriteLog('SDL: going fullscreen...', TMsgType.Notify);
+ //SDL_SetWindowMaximumSize(h_Wnd, gScreenWidth, gScreenHeight);
+ SDL_SetWindowDisplayMode(h_Wnd, @cmode);
+ SDL_SetWindowSize(h_Wnd, gScreenWidth, gScreenHeight);
+ if (gFullscreen) then
+ begin
+ SDL_SetWindowFullscreen(h_Wnd, SDL_WINDOW_FULLSCREEN);
+ end
+ else
+ begin
+ SDL_SetWindowFullscreen(h_Wnd, 0);
+ end;
+ end
+ else*)
+ begin
+ KillGLWindow(preserveGL);
+ h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
+ if (h_Wnd = nil) then exit;
+ end;
SDL_GL_MakeCurrent(h_Wnd, h_GL);
SDL_ShowCursor(SDL_DISABLE);
- if (h_GL <> nil) then begin if (assigned(oglInitCB)) then oglInitCB(); end;
+ if (gFullscreen) then
+ begin
+ nw := 0;
+ nh := 0;
+ SDL_GetWindowSize(h_Wnd, @nw, @nh);
+ if (nw > 128) and (nh > 128) then
+ begin
+ e_WriteLog('SDL: fullscreen window got size '+IntToStr(nw)+'x'+IntToStr(nh)+': '+IntToStr(gScreenWidth)+'x'+IntToStr(gScreenHeight), TMsgType.Notify);
+ gScreenWidth := nw;
+ gScreenHeight := nh;
+ end
+ else
+ begin
+ e_WriteLog('SDL: fullscreen window got invalid size: '+IntToStr(nw)+'x'+IntToStr(nh), TMsgType.Notify);
+ end;
+ end;
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end;
{$ENDIF}
result := true;
procedure ChangeWindowSize ();
begin
+ e_LogWritefln(' ChangeWindowSize: (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]);
gWinSizeX := gScreenWidth;
gWinSizeY := gScreenHeight;
{$IF not DEFINED(HEADLESS)}
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
e_ResizeWindow(gScreenWidth, gScreenHeight);
g_Game_SetupScreenSize();
g_Menu_Reset();
if (gScreenWidth <> w) or (gScreenHeight <> h) then
begin
result := true;
+ preserve := true;
gScreenWidth := w;
gScreenHeight := h;
end;
if (gFullscreen <> fullscreen) then
begin
result := true;
+ preserve := true;
gFullscreen := fullscreen;
preserve := true;
end;
SDL_WINDOWEVENT_RESIZED:
begin
- gScreenWidth := ev.data1;
- gScreenHeight := ev.data2;
+ e_LogWritefln('Resize: (os=%dx%d) (ns=%dx%d)', [gScreenWidth, gScreenHeight, Integer(ev.data1), Integer(ev.data2)]);
+ {if (gFullscreen) then
+ begin
+ e_LogWriteln(' fullscreen fix applied.');
+ if (gScreenWidth <> ev.data1) or (gScreenHeight <> ev.data2) then
+ begin
+ SDL_SetWindowSize(h_Wnd, gScreenWidth, gScreenHeight);
+ end;
+ end
+ else}
+ begin
+ gScreenWidth := ev.data1;
+ gScreenHeight := ev.data2;
+ end;
ChangeWindowSize();
SwapBuffers();
if g_debug_WinMsgs then
wMinimized := false;
wActivate := true;
end;
- if not gWinMaximized then
+ if (not gWinMaximized) and (not gFullscreen) then
begin
gWinMaximized := true;
if g_debug_WinMsgs then
wMinimized := false;
wActivate := true;
end;
- if gWinMaximized then gWinMaximized := false;
+ gWinMaximized := false;
if g_debug_WinMsgs then
begin
g_Console_Add('Now restored');
if not g_Window_SetDisplay() then
begin
- KillGLWindow();
+ KillGLWindow(false);
e_WriteLog('Window creation error (resolution not supported?)', TMsgType.Fatal);
exit;
end;
{$IF not DEFINED(HEADLESS)}
- h_Gl := SDL_GL_CreateContext(h_Wnd);
- if (h_Gl = nil) then exit;
+ h_GL := SDL_GL_CreateContext(h_Wnd);
+ if (h_GL = nil) then exit;
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
if (assigned(oglInitCB)) then oglInitCB();
{$ENDIF}
begin
if g_Texture_Get('INTER', ID) then
begin
- e_DrawSize(ID, 0, 0, 0, false, false, gScreenWidth, gScreenHeight)
+ e_DrawSize(ID, 0, 0, 0, false, false, gScreenWidth, gScreenHeight);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
end
else
begin
while not ProcessMessage() do begin end;
Release();
- KillGLWindow();
+ KillGLWindow(false);
result := 0;
end;