diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 1db0c639efbfe27713abca1491ad2723fc4de1d5..a40441b492a7d6fee0db0eb2a6c206aafb031e3f 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 ();
g_console, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
g_map, g_gfx, g_monsters, g_holmes, xprofiler,
- sdlcarcass, gh_ui;
+ sdlcarcass, fui_ctls;
const
- ProgressUpdateMSecs = 100;
+ ProgressUpdateMSecs = 1;//100;
var
h_Wnd: PSDL_Window = nil;
{$ENDIF}
-procedure KillGLWindow ();
+procedure KillGLWindow (preserveGL: Boolean);
begin
- if (h_Wnd <> 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 or SDL_WINDOW_BORDERLESS else wFlags := wFlags or SDL_WINDOW_RESIZABLE;
+ //if 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;
+ KillGLWindow(preserveGL);
+
h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
if (h_Wnd = nil) then exit;
SDL_GL_MakeCurrent(h_Wnd, h_GL);
SDL_ShowCursor(SDL_DISABLE);
- if (h_GL <> nil) then
+ if (gFullscreen) then
begin
- if assigned(oglInitCB) then oglInitCB();
+ 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;
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;
key := ev.key.keysym.scancode;
down := (ev.type_ = SDL_KEYDOWN);
{$IF not DEFINED(HEADLESS)}
- if evSDLCB(ev) then
+ if fuiOnSDLEvent(ev) then
begin
// event eaten, but...
if not down then e_KeyUpDown(key, false);
{$IF not DEFINED(HEADLESS)}
SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION:
- evSDLCB(ev);
+ fuiOnSDLEvent(ev);
{$ENDIF}
SDL_TEXTINPUT:
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;
- if assigned(oglInitCB) then oglInitCB();
+ h_GL := SDL_GL_CreateContext(h_Wnd);
+ if (h_GL = nil) then exit;
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ if (assigned(oglInitCB)) then oglInitCB();
{$ENDIF}
e_ResizeWindow(gScreenWidth, gScreenHeight);
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
{$ENDIF}
arg: AnsiString;
mdfo: TStream;
+ itmp: Integer;
+ valres: Word;
begin
{$IFDEF HEADLESS}
e_NoGraphics := true;
+{$ELSE}
+ if (not g_holmes_imfunctional) then
+ begin
+ uiInitialize();
+ uiContext.font := 'win14';
+ end;
{$ENDIF}
idx := 1;
{.$ENDIF}
if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
+
if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
begin
if (idx <= ParamCount) then
begin
- if not conParseFloat(gh_ui_scale, ParamStr(idx)) then gh_ui_scale := 1.0;
+ if not conParseFloat(fuiRenderScale, ParamStr(idx)) then fuiRenderScale := 1.0;
+ Inc(idx);
+ end;
+ end;
+
+ if (arg = '--holmes-font') or (arg = '-holmes-font') then
+ begin
+ if (idx <= ParamCount) then
+ begin
+ itmp := 0;
+ val(ParamStr(idx), itmp, valres);
+ {$IFNDEF HEADLESS}
+ if (valres = 0) and (not g_holmes_imfunctional) then
+ begin
+ case itmp of
+ 8: uiContext.font := 'win8';
+ 14: uiContext.font := 'win14';
+ 16: uiContext.font := 'win16';
+ end;
+ end;
+ {$ELSE}
+ // fuck off, fpc!
+ itmp := itmp;
+ valres := valres;
+ {$ENDIF}
Inc(idx);
end;
end;
while not ProcessMessage() do begin end;
Release();
- KillGLWindow();
+ KillGLWindow(false);
result := 0;
end;