diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 62e5574b749b50a95a74032ba54afbb6fede2748..88b229aa220b888697903da121c21f01e0bbe0f4 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 ();
function GetDisplayModes (dbpp: LongWord; var selres: LongWord): SSArray;
function g_Window_SetDisplay (preserveGL: Boolean=false): Boolean;
function g_Window_SetSize (w, h: Word; fullscreen: Boolean): Boolean;
+procedure g_SetVSync (vsync: Boolean);
procedure ProcessLoading (forceUpdate: Boolean=false);
+// returns `true` if quit event was received
+function g_ProcessMessages (): Boolean;
+
var
gwin_dump_extensions: Boolean = false;
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
g_dbg_aimline_on: Boolean = false;
+ g_dbg_input: Boolean = False;
implementation
uses
{$IFDEF WINDOWS}Windows,{$ENDIF}
- SysUtils, Classes, MAPDEF,
- SDL2, GL, GLExt, e_graphics, e_log, e_texture, g_main,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+ g_holmes, sdlcarcass, fui_ctls,
+{$ENDIF}
+ SysUtils, Classes, MAPDEF, Math,
+ SDL2, e_graphics, e_log, e_texture, g_main,
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;
+ g_map, g_gfx, g_monsters, xprofiler,
+ g_touch, g_gui;
const
- ProgressUpdateMSecs = 100;
+ ProgressUpdateMSecs = 1;//100;
var
h_Wnd: PSDL_Window = nil;
flag: Boolean;
{$IF not DEFINED(HEADLESS)}
wTitle: PChar = nil;
+ wasFullscreen: Boolean = true; // so we need to recreate the window
{$ENDIF}
wNeedTimeReset: Boolean = false;
wMinimized: Boolean = false;
+ wMaximized: Boolean = false;
wLoadingProgress: Boolean = false;
wLoadingQuit: Boolean = false;
{$IFNDEF WINDOWS}
ticksOverflow: Int64 = -1;
lastTicks: Uint32 = 0; // to detect overflow
{$ENDIF}
-{$IF not DEFINED(HEADLESS)}
- curMsButState: Word = 0;
- curKbState: Word = 0;
- curMsX: Integer = 0;
- curMsY: Integer = 0;
+ 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;
+
+procedure KillGLWindow (preserveGL: Boolean);
+begin
+{$IFDEF ENABLE_HOLMES}
+ if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end;
+{$ENDIF}
+ if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);
+ if (h_GL <> nil) and (not preserveGL) then
+ begin
+
+{$IFDEF USE_NANOGL}
+ nanoGL_Destroy;
{$ENDIF}
+{$IFDEF USE_NOGL}
+ nogl_Quit;
+{$ENDIF}
+
+ SDL_GL_DeleteContext(h_GL);
+ end;
+ h_Wnd := nil;
+ if (not preserveGL) then h_GL := nil;
+end;
+
function g_Window_SetDisplay (preserveGL: Boolean = false): Boolean;
{$IF not DEFINED(HEADLESS)}
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;
-
- if (h_Wnd <> nil) then
- begin
- SDL_DestroyWindow(h_Wnd);
- h_Wnd := nil;
- end;
+ 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 (not preserveGL) and gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED else gWinMaximized := false;
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 (not gFullscreen) and (not wasFullscreen) then
+ begin
+ //SDL_SetWindowMaximumSize(h_Wnd, gScreenWidth, gScreenHeight);
+ //SDL_SetWindowDisplayMode(h_Wnd, @cmode);
+ if (wMaximized) then SDL_RestoreWindow(h_Wnd);
+ wMaximized := false;
+ gWinMaximized := false;
+ SDL_SetWindowSize(h_Wnd, gScreenWidth, gScreenHeight);
+ //SDL_SetWindowFullscreen(h_Wnd, SDL_WINDOW_FULLSCREEN);
+ //SDL_SetWindowFullscreen(h_Wnd, 0);
+ end
+ else
+ begin
+ KillGLWindow(preserveGL);
+ h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
+ if gFullscreen then
+ SDL_SetWindowFullscreen(h_Wnd, SDL_WINDOW_FULLSCREEN);
+ if (h_Wnd = nil) then exit;
+ end;
+ wasFullscreen := gFullscreen;
SDL_GL_MakeCurrent(h_Wnd, h_GL);
SDL_ShowCursor(SDL_DISABLE);
+ if (h_GL <> nil) then g_SetVSync(gVSync);
+ 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;
+
+ {$IFDEF ENABLE_HOLMES}
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end;
+ {$ENDIF}
{$ENDIF}
result := true;
end;
-function GetDisplayModes(dbpp: LongWord; var selres: LongWord): SSArray;
+function GetDisplayModes (dbpp: LongWord; var selres: LongWord): SSArray;
var
mode: TSDL_DisplayMode;
res, i, k, n, pw, ph: Integer;
end;
-procedure ChangeWindowSize ();
+procedure ChangeWindowSize (requested: Boolean);
begin
+ e_LogWritefln(' ChangeWindowSize: (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]);
gWinSizeX := gScreenWidth;
gWinSizeY := gScreenHeight;
{$IF not DEFINED(HEADLESS)}
+ {$IFDEF ENABLE_HOLMES}
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ {$ENDIF}
e_ResizeWindow(gScreenWidth, gScreenHeight);
g_Game_SetupScreenSize();
- g_Menu_Reset();
+ {$IF DEFINED(ANDROID)}
+ (* This will fix menu reset on keyboard showing *)
+ if requested then
+ g_Menu_Reset;
+ {$ELSE}
+ g_Menu_Reset;
+ {$ENDIF}
g_Game_ClearLoading();
- g_Holmes_VidModeChanged();
{$ENDIF}
end;
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;
if result then
begin
g_Window_SetDisplay(preserve);
- ChangeWindowSize();
+ ChangeWindowSize(true);
end;
{$ENDIF}
end;
-procedure resetKMState ();
-begin
-{$IF not DEFINED(HEADLESS)}
- curMsButState := 0;
- curKbState := 0;
-{$ENDIF}
-end;
-
-
function WindowEventHandler (constref ev: TSDL_WindowEvent): Boolean;
var
wActivate, wDeactivate: Boolean;
SDL_WINDOWEVENT_MINIMIZED:
begin
- resetKMState();
e_UnpressAllKeys();
if not wMinimized then
begin
SDL_WINDOWEVENT_RESIZED:
begin
- resetKMState();
- gScreenWidth := ev.data1;
- gScreenHeight := ev.data2;
- ChangeWindowSize();
+ 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(false);
SwapBuffers();
if g_debug_WinMsgs then
begin
SDL_WINDOWEVENT_MAXIMIZED:
begin
- resetKMState();
+ wMaximized := true;
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
wMinimized := false;
wActivate := true;
end;
- if not gWinMaximized then
+ if (not gWinMaximized) and (not gFullscreen) then
begin
gWinMaximized := true;
if g_debug_WinMsgs then
SDL_WINDOWEVENT_RESTORED:
begin
- resetKMState();
+ wMaximized := false;
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
wMinimized := false;
wActivate := true;
end;
- if gWinMaximized then
- gWinMaximized := false;
+ gWinMaximized := false;
if g_debug_WinMsgs then
begin
g_Console_Add('Now restored');
SDL_WINDOWEVENT_FOCUS_GAINED:
begin
- resetKMState();
wActivate := true;
//e_WriteLog('window gained focus!', MSG_NOTIFY);
- g_Holmes_WindowFocused();
end;
SDL_WINDOWEVENT_FOCUS_LOST:
begin
- resetKMState();
wDeactivate := true;
e_UnpressAllKeys();
//e_WriteLog('window lost focus!', MSG_NOTIFY);
- g_Holmes_WindowBlured();
end;
end;
if gWinActive then
begin
e_WriteLog('deactivating window', TMsgType.Notify);
- e_EnableInput := false;
- e_ClearInputBuffer();
+ e_UnpressAllKeys;
if gMuteWhenInactive then
begin
end;
gWinActive := false;
+
+ {$IFDEF ENABLE_HOLMES}
+ if assigned(winBlurCB) then winBlurCB();
+ {$ENDIF}
end;
end
else if wActivate then
if not gWinActive then
begin
//e_WriteLog('activating window', MSG_NOTIFY);
- e_EnableInput := true;
if gMuteWhenInactive then
begin
end;
gWinActive := true;
+
+ {$IFDEF ENABLE_HOLMES}
+ if assigned(winFocusCB) then winFocusCB();
+ {$ENDIF}
end;
end;
end;
function EventHandler (var ev: TSDL_Event): Boolean;
var
- key, keychr: Word;
+ key, keychr, minuskey: Word;
uc: UnicodeChar;
- {$IF not DEFINED(HEADLESS)}
- msev: THMouseEvent;
- kbev: THKeyEvent;
- {$ENDIF}
-
- function buildBut (b: Byte): Word;
- begin
- result := 0;
- case b of
- SDL_BUTTON_LEFT: result := result or THMouseEvent.Left;
- SDL_BUTTON_MIDDLE: result := result or THMouseEvent.Middle;
- SDL_BUTTON_RIGHT: result := result or THMouseEvent.Right;
- end;
- end;
-
- {$IF not DEFINED(HEADLESS)}
- procedure updateKBState ();
- var
- kbstate: PUint8;
- begin
- curKbState := 0;
- kbstate := SDL_GetKeyboardState(nil);
- if (kbstate[SDL_SCANCODE_LCTRL] <> 0) or (kbstate[SDL_SCANCODE_RCTRL] <> 0) then curKbState := curKbState or THKeyEvent.ModCtrl;
- if (kbstate[SDL_SCANCODE_LALT] <> 0) or (kbstate[SDL_SCANCODE_RALT] <> 0) then curKbState := curKbState or THKeyEvent.ModAlt;
- if (kbstate[SDL_SCANCODE_LSHIFT] <> 0) or (kbstate[SDL_SCANCODE_RSHIFT] <> 0) then curKbState := curKbState or THKeyEvent.ModShift;
- end;
- {$ENDIF}
-
+ down: Boolean;
+ i: Integer;
+ hat: array [HAT_LEFT..HAT_DOWN] of Boolean;
begin
result := false;
- {$IF not DEFINED(HEADLESS)}
- updateKBState();
- {$ENDIF}
case ev.type_ of
SDL_WINDOWEVENT:
SDL_QUITEV:
begin
- if gExit <> EXIT_QUIT then
+ if (gExit <> EXIT_QUIT) then
begin
if not wLoadingProgress then
begin
g_Game_Quit();
end
else
+ begin
wLoadingQuit := true;
+ end;
end;
result := true;
end;
SDL_KEYDOWN, SDL_KEYUP:
begin
key := ev.key.keysym.scancode;
- {$IF not DEFINED(HEADLESS)}
- if (g_holmes_enabled) then
+ if key = SDL_SCANCODE_AC_BACK then
+ key := SDL_SCANCODE_ESCAPE;
+ down := (ev.type_ = SDL_KEYDOWN);
+ {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
+ if fuiOnSDLEvent(ev) then
begin
- if (ev.type_ = SDL_KEYDOWN) then kbev.kind := THKeyEvent.Press else kbev.kind := THKeyEvent.Release;
- kbev.scan := ev.key.keysym.scancode;
- kbev.sym := ev.key.keysym.sym;
- kbev.bstate := curMsButState;
- kbev.kstate := curKbState;
- if g_Holmes_keyEvent(kbev) then
- begin
- if (ev.type_ <> SDL_KEYDOWN) then e_KeyUpDown(ev.key.keysym.scancode, false);
- exit;
- end;
+ // event eaten, but...
+ if not down then e_KeyUpDown(key, false);
+ exit;
end;
{$ENDIF}
- if (ev.type_ = SDL_KEYDOWN) then KeyPress(key);
- e_KeyUpDown(ev.key.keysym.scancode, (ev.type_ = SDL_KEYDOWN));
+ if ev.key._repeat = 0 then
+ begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: keysym, press=%s, scancode=%s', [down, key]);
+ e_KeyUpDown(key, down);
+ g_Console_ProcessBind(key, down);
+ end
+ else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+ begin
+ // key repeat in menus and shit
+ KeyPress(key);
+ end;
+ end;
+
+ SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP:
+ if (ev.jbutton.which < e_MaxJoys) and (ev.jbutton.button < e_MaxJoyBtns) then
+ begin
+ key := e_JoyButtonToKey(ev.jbutton.which, ev.jbutton.button);
+ down := ev.type_ = SDL_JOYBUTTONDOWN;
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: jbutton, joy=%s, button=%s, keycode=%s, press=%s', [ev.jbutton.which, ev.jbutton.button, key, down]);
+ e_KeyUpDown(key, down);
+ g_Console_ProcessBind(key, down);
+ end
+ else
+ begin
+ if g_dbg_input then
+ begin
+ down := ev.type_ = SDL_JOYBUTTONDOWN;
+ e_LogWritefln('Input Debug: NOT IN RANGE! jbutton, joy=%s, button=%s, press=%s', [ev.jbutton.which, ev.jbutton.button, down])
+ end
end;
- {$IF not DEFINED(HEADLESS)}
- SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP:
+ SDL_JOYAXISMOTION:
+ if (ev.jaxis.which < e_MaxJoys) and (ev.jaxis.axis < e_MaxJoyAxes) then
begin
- msev.dx := ev.button.x-curMsX;
- msev.dy := ev.button.y-curMsY;
- curMsX := ev.button.x;
- curMsY := ev.button.y;
- if (ev.type_ = SDL_MOUSEBUTTONDOWN) then msev.kind := THMouseEvent.Press else msev.kind := THMouseEvent.Release;
- msev.but := buildBut(ev.button.button);
- msev.x := curMsX;
- msev.y := curMsY;
- if (msev.but <> 0) then
+ key := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_PLUS);
+ minuskey := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_MINUS);
+
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: jaxis, joy=%s, axis=%s, value=%s, zeroaxes=%s, deadzone=%s', [ev.jaxis.which, ev.jaxis.axis, ev.jaxis.value, JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis], e_JoystickDeadzones[ev.jaxis.which]]);
+
+ if ev.jaxis.value < JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis] - e_JoystickDeadzones[ev.jaxis.which] then
+ begin
+ if (e_KeyPressed(key)) then
+ begin
+ e_KeyUpDown(key, False);
+ g_Console_ProcessBind(key, False);
+ end;
+ e_KeyUpDown(minuskey, True);
+ g_Console_ProcessBind(minuskey, True);
+ end
+ else if ev.jaxis.value > JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis] + e_JoystickDeadzones[ev.jaxis.which] then
+ begin
+ if (e_KeyPressed(minuskey)) then
+ begin
+ e_KeyUpDown(minuskey, False);
+ g_Console_ProcessBind(minuskey, False);
+ end;
+ e_KeyUpDown(key, True);
+ g_Console_ProcessBind(key, True);
+ end
+ else
begin
- // ev.button.clicks: Byte
- if (ev.type_ = SDL_MOUSEBUTTONDOWN) then curMsButState := curMsButState or msev.but else curMsButState := curMsButState and (not msev.but);
- msev.bstate := curMsButState;
- msev.kstate := curKbState;
- if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
+ if (e_KeyPressed(minuskey)) then
+ begin
+ e_KeyUpDown(minuskey, False);
+ g_Console_ProcessBind(minuskey, False);
+ end;
+ if (e_KeyPressed(key)) then
+ begin
+ e_KeyUpDown(key, False);
+ g_Console_ProcessBind(key, False);
+ end;
end;
+ end
+ else
+ begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: NOT IN RANGE! jaxis, joy=%s, axis=%s, value=%s, zeroaxes=%s, deadzone=%s', [ev.jaxis.which, ev.jaxis.axis, ev.jaxis.value, JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis], e_JoystickDeadzones[ev.jaxis.which]])
end;
- SDL_MOUSEWHEEL:
+
+ SDL_JOYHATMOTION:
+ if (ev.jhat.which < e_MaxJoys) and (ev.jhat.hat < e_MaxJoyHats) then
begin
- if (ev.wheel.y <> 0) then
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: jhat, joy=%s, hat=%s, value=%s', [ev.jhat.which, ev.jhat.hat, ev.jhat.value]);
+ hat[HAT_UP] := LongBool(ev.jhat.value and SDL_HAT_UP);
+ hat[HAT_DOWN] := LongBool(ev.jhat.value and SDL_HAT_DOWN);
+ hat[HAT_LEFT] := LongBool(ev.jhat.value and SDL_HAT_LEFT);
+ hat[HAT_RIGHT] := LongBool(ev.jhat.value and SDL_HAT_RIGHT);
+ for i := HAT_LEFT to HAT_DOWN do
begin
- msev.dx := 0;
- msev.dy := ev.wheel.y;
- msev.kind := THMouseEvent.Press;
- if (ev.wheel.y < 0) then msev.but := THMouseEvent.WheelUp else msev.but := THMouseEvent.WheelDown;
- msev.x := curMsX;
- msev.y := curMsY;
- msev.bstate := curMsButState;
- msev.kstate := curKbState;
- if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
+ if JoystickHatState[ev.jhat.which, ev.jhat.hat, i] <> hat[i] then
+ begin
+ down := hat[i];
+ key := e_JoyHatToKey(ev.jhat.which, ev.jhat.hat, i);
+ e_KeyUpDown(key, down);
+ g_Console_ProcessBind(key, down);
+ end
end;
+ JoystickHatState[ev.jhat.which, ev.jhat.hat] := hat
+ end
+ else
+ begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: NOT IN RANGE! jhat, joy=%s, hat=%s, value=%s', [ev.jhat.which, ev.jhat.hat, ev.jhat.value])
end;
- SDL_MOUSEMOTION:
+
+ SDL_JOYDEVICEADDED:
+ if (ev.jdevice.which < e_MaxJoys) then
begin
- msev.dx := ev.button.x-curMsX;
- msev.dy := ev.button.y-curMsY;
- curMsX := ev.button.x;
- curMsY := ev.button.y;
- msev.kind := THMouseEvent.Motion;
- msev.but := 0;
- msev.x := curMsX;
- msev.y := curMsY;
- msev.bstate := curMsButState;
- msev.kstate := curKbState;
- if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
+ JoystickHandle[ev.jdevice.which] := SDL_JoystickOpen(ev.jdevice.which);
+ if JoystickHandle[ev.jdevice.which] <> nil then
+ begin
+ e_LogWritefln('Added Joystick %s', [ev.jdevice.which]);
+ e_JoystickAvailable[ev.jdevice.which] := True;
+ for i := 0 to Min(SDL_JoystickNumAxes(JoystickHandle[ev.jdevice.which]), e_MaxJoyAxes) - 1 do
+ JoystickZeroAxes[ev.jdevice.which, i] := SDL_JoystickGetAxis(JoystickHandle[ev.jdevice.which], i)
+ end
+ else
+ e_LogWritefln('Warning! Failed to open Joystick %s', [ev.jdevice.which])
+ end
+ else
+ begin
+ e_LogWritefln('Warning! Added Joystick %s, but we support only <= %s', [ev.jdevice.which, e_MaxJoys])
+ end;
+
+ SDL_JOYDEVICEREMOVED:
+ begin
+ e_LogWritefln('Removed Joystick %s', [ev.jdevice.which]);
+ if (ev.jdevice.which < e_MaxJoys) then
+ begin
+ e_JoystickAvailable[ev.jdevice.which] := False;
+ if JoystickHandle[ev.jdevice.which] <> nil then
+ SDL_JoystickClose(JoystickHandle[ev.jdevice.which]);
+ JoystickHandle[ev.jdevice.which] := nil
+ end
end;
+
+ {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
+ SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION:
+ fuiOnSDLEvent(ev);
{$ENDIF}
SDL_TEXTINPUT:
begin
+ if g_dbg_input then
+ e_LogWritefln('Input Debug: text, text=%s', [ev.text.text]);
Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
keychr := Word(uc);
if (keychr > 127) then keychr := Word(wchar2win(WideChar(keychr)));
- CharPress(AnsiChar(keychr));
+ if (keychr > 0) and (keychr <= 255) then CharPress(AnsiChar(keychr));
end;
+ SDL_FINGERMOTION, SDL_FINGERDOWN, SDL_FINGERUP:
+ g_Touch_HandleEvent(ev.tfinger);
+
// other key presses and joysticks are handled in e_input
end;
end;
end;
-procedure KillGLWindow();
-begin
- if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);
- if (h_GL <> nil) then SDL_GL_DeleteContext(h_GL);
- h_Wnd := nil;
- h_GL := nil;
-end;
-
-
function CreateGLWindow (Title: PChar): Boolean;
begin
result := false;
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;
+ {$IFDEF ENABLE_HOLMES}
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ {$ENDIF}
+ SDL_GL_MakeCurrent(h_Wnd, h_GL);
+{$IFDEF USE_NANOGL}
+ if nanoGL_Init() = 0 then
+ begin
+ KillGLWindow(false);
+ e_WriteLog('nanoGL initialization error', TMsgType.Fatal);
+ exit;
+ end;
+{$ENDIF}
+{$IFDEF USE_NOGL}
+ nogl_Init;
+{$ENDIF}
+ {$IFDEF ENABLE_HOLMES}
+ if (assigned(oglInitCB)) then oglInitCB();
+ {$ENDIF}
+ if (h_GL <> nil) then g_SetVSync(gVSync);
{$ENDIF}
e_ResizeWindow(gScreenWidth, gScreenHeight);
procedure ProcessLoading (forceUpdate: Boolean=false);
var
ev: TSDL_Event;
- ID: LongWord;
stt: UInt64;
begin
FillChar(ev, sizeof(ev), 0);
while (SDL_PollEvent(@ev) > 0) do
begin
+ EventHandler(ev);
if (ev.type_ = SDL_QUITEV) then break;
end;
+ //e_PollJoysticks();
if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then
begin
if forceUpdate then
begin
- if g_Texture_Get('INTER', ID) then
- begin
- e_DrawSize(ID, 0, 0, 0, false, false, gScreenWidth, gScreenHeight)
- end
- else
- begin
- e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
- end;
+ DrawMenuBackground('INTER');
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
DrawLoadingStat();
+ g_Console_Draw(True);
SwapBuffers();
end;
end;
end;
-function ProcessMessage (): Boolean;
+function g_ProcessMessages (): Boolean;
var
- i, t: Integer;
ev: TSDL_Event;
begin
result := false;
FillChar(ev, SizeOf(ev), 0);
-
while (SDL_PollEvent(@ev) > 0) do
begin
result := EventHandler(ev);
if (ev.type_ = SDL_QUITEV) then exit;
end;
+ //e_PollJoysticks();
+end;
+
+
+function ProcessMessage (): Boolean;
+var
+ i, t: Integer;
+begin
+ result := g_ProcessMessages();
Time := GetTimer();
Time_Delta := Time-Time_Old;
end;
-procedure InitOpenGL (vsync: Boolean);
+procedure g_SetVSync (vsync: Boolean);
{$IF not DEFINED(HEADLESS)}
var
v: Byte;
begin
{$IF not DEFINED(HEADLESS)}
if vsync then v := 1 else v := 0;
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
- SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); // lights; it is enough to have 1-bit stencil buffer for lighting, but...
- SDL_GL_SetSwapInterval(v);
+ if (SDL_GL_SetSwapInterval(v) <> 0) then
+ begin
+ e_WriteLog('oops; can''t change vsync option, restart required', TMsgType.Warning);
+ end
+ else
+ begin
+ if vsync then e_WriteLog('VSync: ON', TMsgType.Notify) else e_WriteLog('VSync: OFF', TMsgType.Notify);
+ end;
+{$ENDIF}
+end;
+
+
+procedure InitOpenGL ();
+begin
+{$IF not DEFINED(HEADLESS)}
+ {$IFDEF USE_GLES1}
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+ {$ELSE}
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+ SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); // lights; it is enough to have 1-bit stencil buffer for lighting, but...
+ {$ENDIF}
{$ENDIF}
end;
{$ENDIF}
arg: AnsiString;
mdfo: TStream;
+ {$IFDEF ENABLE_HOLMES}
+ itmp: Integer;
+ valres: Word;
+ {$ENDIF}
begin
{$IFDEF HEADLESS}
e_NoGraphics := true;
+{$ELSE}
+ {$IFDEF ENABLE_HOLMES}
+ if (not g_holmes_imfunctional) then
+ begin
+ uiInitialize();
+ uiContext.font := 'win14';
+ end;
+ {$ENDIF}
{$ENDIF}
idx := 1;
if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
+ if arg = '--debug-input' then g_dbg_input := True;
+
{.$IF DEFINED(D2F_DEBUG)}
if arg = '--aimline' then g_dbg_aimline_on := true;
{.$ENDIF}
+{$IFDEF ENABLE_HOLMES}
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(g_holmes_ui_scale, ParamStr(idx)) then g_holmes_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;
+{$ENDIF}
if (arg = '--game-scale') or (arg = '-game-scale') then
begin
end;
e_WriteLog('Initializing OpenGL', TMsgType.Notify);
- InitOpenGL(gVSync);
+ InitOpenGL();
e_WriteLog('Creating GL window', TMsgType.Notify);
if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then
begin
result := 0;
+ e_WriteLog('Unable to create GL window: ' + SDL_GetError(), TMsgType.Fatal);
exit;
end;
e_LogWritefln('stencil buffer size: %s', [ltmp]);
gwin_has_stencil := (ltmp > 0);
- if not glHasExtension('GL_ARB_texture_non_power_of_two') then
+ if glHasExtension('GL_ARB_texture_non_power_of_two') or
+ glHasExtension('GL_OES_texture_npot') then
begin
- e_WriteLog('Driver DID''T advertised NPOT textures support', TMsgType.Warning);
- glLegacyNPOT := true;
+ e_WriteLog('NPOT textures: YES', TMsgType.Notify);
+ glLegacyNPOT := false;
end
else
begin
- e_WriteLog('Driver advertised NPOT textures support', TMsgType.Notify);
- glLegacyNPOT := false;
+ e_WriteLog('NPOT textures: NO', TMsgType.Warning);
+ glLegacyNPOT := true;
end;
gwin_dump_extensions := false;
{$ENDIF}
while not ProcessMessage() do begin end;
Release();
- KillGLWindow();
+ KillGLWindow(false);
result := 0;
end;
+initialization
+ conRegVar('d_input', @g_dbg_input, '', '')
end.