index 6750d68e6364570a0485647bc8c61d7e1bf832d4..44fa1c8b972c2a49767bf6ebbc4e35b7f0d4f01c 100644 (file)
(* --- 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_Init;
procedure sys_Final;
+ var (* hooks *)
+ sys_CharPress: procedure (ch: AnsiChar) = nil;
+ sys_ScreenResize: procedure (w, h: Integer) = nil;
+
implementation
uses
- SysUtils, SDL2, Math,
- e_log, e_graphics, e_input, e_sound,
- {$INCLUDE ../nogl/noGLuses.inc}
+ SysUtils, SDL2, Math, ctypes,
+ e_log, e_input, e_sound,
{$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_basic;
+ g_touch, g_options, g_console, g_game, g_menu, g_gui, g_basic;
const
GameTitle = 'Doom 2D: Forever (SDL 2, %s)';
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;
(* --------- Graphics --------- *)
- procedure UpdateSize (w, h: Integer);
- begin
- gWinSizeX := w;
- gWinSizeY := h;
- gWinRealPosX := 0;
- gWinRealPosY := 0;
- gScreenWidth := w;
- gScreenHeight := h;
- {$IFDEF ENABLE_HOLMES}
- fuiScrWdt := w;
- fuiScrHgt := h;
- {$ENDIF}
- e_ResizeWindow(w, h);
- e_InitGL;
- g_Game_SetupScreenSize;
- {$IFNDEF ANDOIRD}
- (* This will fix menu reset on keyboard showing *)
- g_Menu_Reset;
- {$ENDIF}
- g_Game_ClearLoading;
- {$IFDEF ENABLE_HOLMES}
- if assigned(oglInitCB) then oglInitCB;
- {$ENDIF}
- end;
-
- function GetTitle (): PChar;
+ function GetTitle (): AnsiString;
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]))
+ result := Format(GameTitle, [info]);
end;
- function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean;
- var flags: UInt32;
+ function InitWindow (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean;
+ var flags: UInt32; x, y: cint; title: AnsiString;
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;
- window := SDL_CreateWindow(GetTitle(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, flags);
+ 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;
+ title := GetTitle();
+ window := SDL_CreateWindow(PChar(title), x, y, w, h, flags);
if window <> nil then
begin
context := SDL_GL_CreateContext(window);
if context <> nil then
begin
- {$IFDEF NOGL_INIT}
- nogl_Init;
- {$ENDIF}
- UpdateSize(w, h);
+ 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;
+ if @sys_ScreenResize <> nil then
+ sys_ScreenResize(w, h);
result := true
end
else
begin
+ // SDL_DestroyWindow(window);
e_LogWritefln('SDL: unable to create OpenGL context: %s', [SDL_GetError])
end
end
else
begin
if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
- SDL_SetWindowSize(window, w, h);
SDL_SetWindowFullscreen(window, flags);
- UpdateSize(w, h);
+ SDL_SetWindowSize(window, w, h);
+ if maximized then SDL_MaximizeWindow(window);
+ // always reset to center when changing fullscreen->windowed for safety purposes
+ if wc or (gFullscreen and not fullscreen) or (gWinMaximized and not maximized) 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;
+ gFullScreen := fullscreen;
+ gWinMaximized := maximized;
+ gRC_FullScreen := fullscreen;
+ gRC_Maximized := maximized;
+ if @sys_ScreenResize <> nil then
+ sys_ScreenResize(w, h);
result := true
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
- result := InitWindow(w, h, bpp, fullScreen)
+ result := InitWindow(w, h, bpp, fullScreen, maximized)
end;
(* --------- Joystick --------- *)
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_RESIZED:
+ if @sys_ScreenResize <> nil then
+ sys_ScreenResize(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;
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;
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
end
- else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+ else
begin
- KeyPress(key) // key repeat in menus and shit
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: keyrep, scancode=%s', [key]);
+ g_Console_ProcessBindRepeat(key);
end
end;
sch := AnsiChar(wchar2win(ch));
if g_dbg_input then
e_LogWritefln('Input Debug: text, text="%s", ch = %s, sch = %s', [ev.text, Ord(ch), Ord(sch)]);
- if IsValid1251(Word(ch)) and IsPrintable1251(ch) then
- CharPress(sch);
+ if @sys_CharPress <> nil then
+ if IsValid1251(Word(ch)) and IsPrintable1251(ch) then
+ sys_CharPress(sch)
end;
function sys_HandleInput (): Boolean;
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;
e_WriteLog('Releasing SDL2', TMsgType.Notify);
if context <> nil then
begin
- {$IFDEF NOGL_INIT}
- nogl_Quit;
- {$ENDIF}
SDL_GL_DeleteContext(context);
context := nil;
end;
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.