index f46c3278669f208ae7258eef957b5caab3991d89..511e06200dd020c08d950a998c3025cc97c08b05 100644 (file)
(* --- Graphics --- *)
function sys_GetDisplayModes (bpp: Integer): SSArray;
(* --- 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;
procedure sys_EnableVSync (yes: Boolean);
procedure sys_Repaint;
{$IFDEF ENABLE_HOLMES}
g_holmes, sdlcarcass, fui_ctls,
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
g_holmes, sdlcarcass, fui_ctls,
{$ENDIF}
- g_touch, g_options, g_window, g_console, g_game, g_menu, g_gui, g_main;
+ g_touch, g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic;
const
const
- GameTitle = 'Doom 2D: Forever (SDL 2)';
+ GameTitle = 'Doom 2D: Forever (SDL 2, %s)';
var
window: PSDL_Window;
var
window: PSDL_Window;
begin
gWinSizeX := w;
gWinSizeY := h;
begin
gWinSizeX := w;
gWinSizeY := h;
- gWinRealPosX := 0;
- gWinRealPosY := 0;
gScreenWidth := w;
gScreenHeight := h;
gScreenWidth := w;
gScreenHeight := h;
+ gRC_Width := w;
+ gRC_Height := h;
{$IFDEF ENABLE_HOLMES}
fuiScrWdt := w;
fuiScrHgt := h;
{$IFDEF ENABLE_HOLMES}
fuiScrWdt := w;
fuiScrHgt := h;
{$ENDIF}
end;
{$ENDIF}
end;
- function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean;
- var flags: UInt32;
+ function GetTitle (): PChar;
+ var info: AnsiString;
+ begin
+ info := g_GetBuildHash(false);
+ if info = 'custom build' then
+ info := info + ' by ' + g_GetBuilderName() + ' ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME;
+ result := PChar(Format(GameTitle, [info]))
+ end;
+
+ function InitWindow (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean;
+ var flags: UInt32; x, y: Integer;
begin
// note: on window close make: if assigned(oglDeinitCB) then oglDeinitCB;
e_LogWritefln('InitWindow %s %s %s %s', [w, h, bpp, fullScreen]);
begin
// note: on window close make: if assigned(oglDeinitCB) then oglDeinitCB;
e_LogWritefln('InitWindow %s %s %s %s', [w, h, bpp, fullScreen]);
{$ENDIF}
flags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE;
if fullScreen then flags := flags or SDL_WINDOW_FULLSCREEN;
{$ENDIF}
flags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE;
if fullScreen then flags := flags or SDL_WINDOW_FULLSCREEN;
- window := SDL_CreateWindow(GameTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, flags);
+ if maximized then flags := flags or SDL_WINDOW_MAXIMIZED;
+ x := SDL_WINDOWPOS_CENTERED;
+ y := SDL_WINDOWPOS_CENTERED;
+ window := SDL_CreateWindow(GetTitle(), x, y, w, h, flags);
if window <> nil then
begin
context := SDL_GL_CreateContext(window);
if window <> nil then
begin
context := SDL_GL_CreateContext(window);
{$IFDEF NOGL_INIT}
nogl_Init;
{$ENDIF}
{$IFDEF NOGL_INIT}
nogl_Init;
{$ENDIF}
+ gFullScreen := fullscreen;
+ gWinMaximized := maximized;
+ gRC_FullScreen := fullscreen;
+ gRC_Maximized := maximized;
UpdateSize(w, h);
result := true
end
UpdateSize(w, h);
result := true
end
end
else
begin
end
else
begin
- if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
SDL_SetWindowSize(window, w, h);
SDL_SetWindowSize(window, w, h);
+ if maximized then
+ SDL_MaximizeWindow(window);
+ if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
SDL_SetWindowFullscreen(window, flags);
SDL_SetWindowFullscreen(window, flags);
+ gFullScreen := fullscreen;
+ gWinMaximized := maximized;
+ gRC_FullScreen := fullscreen;
+ gRC_Maximized := maximized;
UpdateSize(w, h);
result := true
end
UpdateSize(w, h);
result := true
end
end
end;
end
end;
- function sys_SetDisplayMode (w, h, bpp: Integer; fullScreen: Boolean): Boolean;
+ function sys_SetDisplayMode (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean;
begin
begin
- result := InitWindow(w, h, bpp, fullScreen)
+ result := InitWindow(w, h, bpp, fullScreen, maximized)
end;
(* --------- Joystick --------- *)
end;
(* --------- Joystick --------- *)
function HandleWindow (var ev: TSDL_WindowEvent): Boolean;
begin
result := false;
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;
case ev.event of
SDL_WINDOWEVENT_RESIZED: UpdateSize(ev.data1, ev.data2);
SDL_WINDOWEVENT_EXPOSED: sys_Repaint;
end;
SDL_WINDOWEVENT_FOCUS_GAINED, SDL_WINDOWEVENT_MAXIMIZED, SDL_WINDOWEVENT_RESTORED:
begin
end;
SDL_WINDOWEVENT_FOCUS_GAINED, SDL_WINDOWEVENT_MAXIMIZED, SDL_WINDOWEVENT_RESTORED:
begin
+ if ev.event = SDL_WINDOWEVENT_MAXIMIZED then
+ gRC_Maximized := true
+ else if ev.event = SDL_WINDOWEVENT_RESTORED then
+ gRC_Maximized := false;
e_MuteChannels(false);
{$IFDEF ENABLE_HOLMES}
if assigned(winFocusCB) then winFocusCB;
e_MuteChannels(false);
{$IFDEF ENABLE_HOLMES}
if assigned(winFocusCB) then winFocusCB;