index bfb76fb5bae1f5a69f01ff3f575ade72c80c2810..c6f2cbf9f1c5e127aa62fe2309eb3be4ade48b02 100644 (file)
procedure sys_Init;
procedure sys_Final;
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, ctypes,
implementation
uses
SysUtils, SDL2, Math, ctypes,
- e_log, e_graphics, e_input, e_sound,
- {$INCLUDE ../nogl/noGLuses.inc}
+ e_log, e_input, e_sound,
{$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_basic;
+ g_touch, g_options, g_console, g_game, g_menu, g_gui, g_basic;
const
GameTitle = 'Doom 2D: Forever (SDL 2, %s)';
const
GameTitle = 'Doom 2D: Forever (SDL 2, %s)';
(* --------- Graphics --------- *)
(* --------- Graphics --------- *)
- procedure UpdateSize (w, h: Integer);
- begin
- gWinSizeX := w;
- gWinSizeY := h;
- gScreenWidth := w;
- gScreenHeight := h;
- gRC_Width := w;
- gRC_Height := 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;
var info: AnsiString;
begin
function GetTitle (): PChar;
var info: AnsiString;
begin
context := SDL_GL_CreateContext(window);
if context <> nil then
begin
context := SDL_GL_CreateContext(window);
if context <> nil then
begin
- {$IFDEF NOGL_INIT}
- nogl_Init;
- {$ENDIF}
if (fullscreen = false) and (maximized = false) and (wc = false) then
begin
SDL_GetWindowPosition(window, @x, @y);
if (fullscreen = false) and (maximized = false) and (wc = false) then
begin
SDL_GetWindowPosition(window, @x, @y);
gWinMaximized := maximized;
gRC_FullScreen := fullscreen;
gRC_Maximized := maximized;
gWinMaximized := maximized;
gRC_FullScreen := fullscreen;
gRC_Maximized := maximized;
- UpdateSize(w, h);
+ if @sys_ScreenResize <> nil then
+ sys_ScreenResize(w, h);
result := true
end
else
result := true
end
else
end
else
begin
end
else
begin
+ if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
+ SDL_SetWindowFullscreen(window, flags);
SDL_SetWindowSize(window, w, h);
SDL_SetWindowSize(window, w, h);
- if wc then
+ 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
begin
x := SDL_WINDOWPOS_CENTERED;
y := SDL_WINDOWPOS_CENTERED
SDL_GetWindowPosition(window, @x, @y);
wx := x; wy := y
end;
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;
gFullScreen := fullscreen;
gWinMaximized := maximized;
gRC_FullScreen := fullscreen;
gRC_Maximized := maximized;
- UpdateSize(w, h);
+ if @sys_ScreenResize <> nil then
+ sys_ScreenResize(w, h);
result := true
end
end;
result := true
end
end;
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
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:
SDL_WINDOWEVENT_EXPOSED: sys_Repaint;
SDL_WINDOWEVENT_CLOSE: result := true;
SDL_WINDOWEVENT_MOVED:
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
end
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
end
- else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+ else
begin
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;
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)]);
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;
end;
function sys_HandleInput (): Boolean;
flags := SDL_INIT_TIMER or $00004000;
{$ENDIF}
{$ELSE}
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);
{$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;
SDL_ShowCursor(SDL_DISABLE);
end;
e_WriteLog('Releasing SDL2', TMsgType.Notify);
if context <> nil then
begin
e_WriteLog('Releasing SDL2', TMsgType.Notify);
if context <> nil then
begin
- {$IFDEF NOGL_INIT}
- nogl_Quit;
- {$ENDIF}
SDL_GL_DeleteContext(context);
context := nil;
end;
SDL_GL_DeleteContext(context);
context := nil;
end;