X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=a40441b492a7d6fee0db0eb2a6c206aafb031e3f;hb=1f93eba25d342649a8eaccdf8f690ff4d8cc0dfc;hp=79fb99fc963b7b005f38f82edc40b81f11eba6ff;hpb=72c94c713a86da5372ab1f09c185ec0d8cc4499d;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 79fb99f..a40441b 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -1,4 +1,4 @@ -(* 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 @@ -19,22 +19,25 @@ unit g_window; interface uses - wadreader; - -function SDLMain(): Integer; -function GetTimer(): Int64; -procedure ResetTimer(); -function CreateGLWindow(Title: PChar): Boolean; -procedure KillGLWindow(); -procedure PushExitEvent(); -function ProcessMessage(): Boolean; + utils; + +function SDLMain (): Integer; +function GetTimer (): Int64; +procedure ResetTimer (); +procedure PushExitEvent (); +function ProcessMessage (): Boolean; +procedure ReDrawWindow (); +procedure SwapBuffers (); +procedure Sleep (ms: LongWord); +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 ProcessLoading (forceUpdate: Boolean=false); -procedure ReDrawWindow(); -procedure SwapBuffers(); -procedure Sleep(ms: LongWord); -function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SArray; -function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean; -function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean; + +// returns `true` if quit event was received +function g_ProcessMessages (): Boolean; + var gwin_dump_extensions: Boolean = false; @@ -51,56 +54,57 @@ uses SDL2, GL, GLExt, 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, utils; + g_map, g_gfx, g_monsters, g_holmes, xprofiler, + sdlcarcass, fui_ctls; + + +const + ProgressUpdateMSecs = 1;//100; var - h_Wnd: PSDL_Window; - h_GL: TSDL_GLContext; - wFlags: LongWord = 0; + h_Wnd: PSDL_Window = nil; + h_GL: TSDL_GLContext = nil; Time, Time_Delta, Time_Old: Int64; flag: Boolean; +{$IF not DEFINED(HEADLESS)} wTitle: PChar = nil; - wNeedTimeReset: Boolean = False; - //wWindowCreated: Boolean = False; - //wCursorShown: Boolean = False; - wMinimized: Boolean = False; - //wNeedFree: Boolean = True; - wLoadingProgress: Boolean = False; - wLoadingQuit: Boolean = False; - {wWinPause: Byte = 0;} +{$ENDIF} + wNeedTimeReset: Boolean = false; + wMinimized: 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; -{$ENDIF} -function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean; + +procedure KillGLWindow (preserveGL: Boolean); +begin + 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) and (not preserveGL) then SDL_GL_DeleteContext(h_GL); + 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; -begin -{$IFDEF HEADLESS} - Result := True; - Exit; + wFlags: LongWord = 0; + nw, nh: Integer; {$ENDIF} - - Result := False; +begin +{$IF not DEFINED(HEADLESS)} + result := false; 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 or SDL_WINDOW_BORDERLESS else wFlags := wFlags or SDL_WINDOW_RESIZABLE; + //if gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED; if gFullscreen then begin @@ -109,40 +113,60 @@ begin mode.format := 0; mode.refresh_rate := 0; mode.driverdata := nil; - if SDL_GetClosestDisplayMode(0, @mode, @cmode) = nil then + 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; + if (h_Wnd = nil) then exit; SDL_GL_MakeCurrent(h_Wnd, h_GL); SDL_ShowCursor(SDL_DISABLE); + 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; + fuiScrWdt := gScreenWidth; + fuiScrHgt := gScreenHeight; + if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end; +{$ENDIF} - Result := True; + result := true; end; -procedure ReShowCursor(); -begin - // TODO: what was this for? -end; -function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SArray; +function GetDisplayModes (dbpp: LongWord; var selres: LongWord): SSArray; var mode: TSDL_DisplayMode; res, i, k, n, pw, ph: Integer; begin - SetLength(Result, 0); - {$IFDEF HEADLESS}Exit;{$ENDIF} - k := 0; SelRes := 0; + SetLength(result, 0); + {$IFDEF HEADLESS}exit;{$ENDIF} + k := 0; selres := 0; n := SDL_GetNumDisplayModes(0); pw := 0; ph := 0; for i := 0 to n do @@ -152,77 +176,80 @@ begin if SDL_BITSPERPIXEL(mode.format) = gBPP then continue; if (mode.w = pw) and (mode.h = ph) then continue; if (mode.w = gScreenWidth) and (mode.h = gScreenHeight) then - SelRes := k; + selres := k; Inc(k); - SetLength(Result, k); - Result[k-1] := IntToStr(mode.w) + 'x' + IntToStr(mode.h); + SetLength(result, k); + result[k-1] := IntToStr(mode.w) + 'x' + IntToStr(mode.h); pw := mode.w; ph := mode.h end; e_WriteLog('SDL: Got ' + IntToStr(k) + ' resolutions.', TMsgType.Notify); end; -procedure Sleep(ms: LongWord); + +procedure Sleep (ms: LongWord); begin SDL_Delay(ms); end; -procedure ChangeWindowSize(); + +procedure ChangeWindowSize (); begin gWinSizeX := gScreenWidth; gWinSizeY := gScreenHeight; - {$IFDEF HEADLESS}Exit;{$ENDIF} +{$IF not DEFINED(HEADLESS)} + fuiScrWdt := gScreenWidth; + fuiScrHgt := gScreenHeight; e_ResizeWindow(gScreenWidth, gScreenHeight); g_Game_SetupScreenSize(); g_Menu_Reset(); g_Game_ClearLoading(); - g_Holmes_VidModeChanged(); +{$ENDIF} end; -function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean; + +function g_Window_SetSize (w, h: Word; fullscreen: Boolean): Boolean; +{$IF not DEFINED(HEADLESS)} var - Preserve: Boolean; + preserve: Boolean; +{$ENDIF} begin - Result := False; - {$IFDEF HEADLESS}Exit;{$ENDIF} - Preserve := False; + result := false; +{$IF not DEFINED(HEADLESS)} + preserve := false; - if (gScreenWidth <> W) or (gScreenHeight <> H) then + if (gScreenWidth <> w) or (gScreenHeight <> h) then begin - Result := True; - gScreenWidth := W; - gScreenHeight := H; + result := true; + preserve := true; + gScreenWidth := w; + gScreenHeight := h; end; - if gFullscreen <> FScreen then + if (gFullscreen <> fullscreen) then begin - Result := True; - gFullscreen := FScreen; - Preserve := True; + result := true; + preserve := true; + gFullscreen := fullscreen; + preserve := true; end; - if Result then + if result then begin - g_Window_SetDisplay(Preserve); + g_Window_SetDisplay(preserve); ChangeWindowSize(); end; -end; - -procedure resetKMState (); -begin -{$IF not DEFINED(HEADLESS)} - curMsButState := 0; - curKbState := 0; {$ENDIF} end; -function WindowEventHandler(ev: TSDL_WindowEvent): Boolean; + +function WindowEventHandler (constref ev: TSDL_WindowEvent): Boolean; var wActivate, wDeactivate: Boolean; begin - Result := False; - wActivate := False; - wDeactivate := False; + result := false; + wActivate := false; + wDeactivate := false; case ev.event of SDL_WINDOWEVENT_MOVED: @@ -236,25 +263,22 @@ begin SDL_WINDOWEVENT_MINIMIZED: begin - resetKMState(); e_UnpressAllKeys(); if not wMinimized then begin e_ResizeWindow(0, 0); - wMinimized := True; - + wMinimized := true; if g_debug_WinMsgs then begin g_Console_Add('Now minimized'); e_WriteLog('[DEBUG] WinMsgs: Now minimized', TMsgType.Notify); end; - wDeactivate := True; + wDeactivate := true; end; end; SDL_WINDOWEVENT_RESIZED: begin - resetKMState(); gScreenWidth := ev.data1; gScreenHeight := ev.data2; ChangeWindowSize(); @@ -271,16 +295,15 @@ begin SDL_WINDOWEVENT_MAXIMIZED: begin - resetKMState(); if wMinimized then begin e_ResizeWindow(gScreenWidth, gScreenHeight); - wMinimized := False; - wActivate := True; + wMinimized := false; + wActivate := true; end; if not gWinMaximized then begin - gWinMaximized := True; + gWinMaximized := true; if g_debug_WinMsgs then begin g_Console_Add('Now maximized'); @@ -291,15 +314,13 @@ begin SDL_WINDOWEVENT_RESTORED: begin - resetKMState(); if wMinimized then begin e_ResizeWindow(gScreenWidth, gScreenHeight); - wMinimized := False; - wActivate := True; + wMinimized := false; + wActivate := true; end; - if gWinMaximized then - gWinMaximized := False; + if gWinMaximized then gWinMaximized := false; if g_debug_WinMsgs then begin g_Console_Add('Now restored'); @@ -309,19 +330,15 @@ begin SDL_WINDOWEVENT_FOCUS_GAINED: begin - resetKMState(); - wActivate := True; + wActivate := true; //e_WriteLog('window gained focus!', MSG_NOTIFY); - g_Holmes_WindowFocused(); end; SDL_WINDOWEVENT_FOCUS_LOST: begin - resetKMState(); - wDeactivate := True; + wDeactivate := true; e_UnpressAllKeys(); //e_WriteLog('window lost focus!', MSG_NOTIFY); - g_Holmes_WindowBlured(); end; end; @@ -330,13 +347,13 @@ begin if gWinActive then begin e_WriteLog('deactivating window', TMsgType.Notify); - e_EnableInput := False; + e_EnableInput := false; e_ClearInputBuffer(); if gMuteWhenInactive then begin //e_WriteLog('deactivating sounds', MSG_NOTIFY); - e_MuteChannels(True); + e_MuteChannels(true); end; if g_debug_WinMsgs then @@ -345,7 +362,9 @@ begin e_WriteLog('[DEBUG] WinMsgs: Now inactive', TMsgType.Notify); end; - gWinActive := False; + gWinActive := false; + + if assigned(winBlurCB) then winBlurCB(); end; end else if wActivate then @@ -353,12 +372,12 @@ begin if not gWinActive then begin //e_WriteLog('activating window', MSG_NOTIFY); - e_EnableInput := True; + e_EnableInput := true; if gMuteWhenInactive then begin //e_WriteLog('activating sounds', MSG_NOTIFY); - e_MuteChannels(False); + e_MuteChannels(false); end; if g_debug_WinMsgs then @@ -367,57 +386,28 @@ begin e_WriteLog('[DEBUG] WinMsgs: Now active', TMsgType.Notify); end; - gWinActive := True; + gWinActive := true; + if assigned(winFocusCB) then winFocusCB(); end; end; end; -function EventHandler(ev: TSDL_Event): Boolean; + +function EventHandler (var ev: TSDL_Event): Boolean; var key, keychr: Word; uc: UnicodeChar; - //joy: Integer; - {$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; begin - Result := False; - {$IF not DEFINED(HEADLESS)} - updateKBState(); - {$ENDIF} + result := false; case ev.type_ of SDL_WINDOWEVENT: - Result := WindowEventHandler(ev.window); + result := WindowEventHandler(ev.window); SDL_QUITEV: begin - if gExit <> EXIT_QUIT then + if (gExit <> EXIT_QUIT) then begin if not wLoadingProgress then begin @@ -425,82 +415,32 @@ begin g_Game_Quit(); end else - wLoadingQuit := True; + begin + wLoadingQuit := true; + end; end; - Result := True; + result := true; end; SDL_KEYDOWN, SDL_KEYUP: begin key := ev.key.keysym.scancode; + down := (ev.type_ = SDL_KEYDOWN); {$IF not DEFINED(HEADLESS)} - if (g_holmes_enabled) then + 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 down then KeyPress(key); + e_KeyUpDown(key, down); end; {$IF not DEFINED(HEADLESS)} - SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP: - 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 - 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); - end; - end; - SDL_MOUSEWHEEL: - begin - if (ev.wheel.y <> 0) then - 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); - end; - end; - SDL_MOUSEMOTION: - 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); - end; + SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION: + fuiOnSDLEvent(ev); {$ENDIF} SDL_TEXTINPUT: @@ -508,85 +448,81 @@ begin 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; // other key presses and joysticks are handled in e_input end; end; -procedure SwapBuffers(); + +procedure SwapBuffers (); begin {$IF not DEFINED(HEADLESS)} SDL_GL_SwapWindow(h_Wnd); {$ENDIF} 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; - //wWindowCreated := False; -end; -function CreateGLWindow(Title: PChar): Boolean; -//var -// flags: LongWord; +function CreateGLWindow (Title: PChar): Boolean; begin - Result := False; + result := false; gWinSizeX := gScreenWidth; gWinSizeY := gScreenHeight; +{$IF not DEFINED(HEADLESS)} wTitle := Title; +{$ENDIF} e_WriteLog('Creating window', TMsgType.Notify); if not g_Window_SetDisplay() then begin - KillGLWindow(); + KillGLWindow(false); e_WriteLog('Window creation error (resolution not supported?)', TMsgType.Fatal); exit; end; -{$IFNDEF HEADLESS} - h_Gl := SDL_GL_CreateContext(h_Wnd); - if h_Gl = nil then Exit; +{$IF not DEFINED(HEADLESS)} + h_GL := SDL_GL_CreateContext(h_Wnd); + if (h_GL = nil) then exit; + fuiScrWdt := gScreenWidth; + fuiScrHgt := gScreenHeight; + if (assigned(oglInitCB)) then oglInitCB(); {$ENDIF} - //wWindowCreated := True; e_ResizeWindow(gScreenWidth, gScreenHeight); e_InitGL(); - Result := True; + result := true; end; + {$IFDEF WINDOWS} // windoze sux; in headless mode `GetTickCount()` (and SDL) returns shit -function GetTimer(): Int64; +function GetTimer (): Int64; var F, C: Int64; begin QueryPerformanceFrequency(F); QueryPerformanceCounter(C); - Result := Round(C/F*1000{000}); + result := Round(C/F*1000{000}); end; {$ELSE} -function GetTimer(): Int64; +function GetTimer (): Int64; var t: Uint32; tt: Int64; begin - t := SDL_GetTicks() {* 1000}; // TODO: do we really need microseconds here? k8: NOPE! - if ticksOverflow = -1 then + t := SDL_GetTicks(); + if (ticksOverflow = -1) then begin ticksOverflow := 0; lastTicks := t; end else begin - if lastTicks > t then + if (lastTicks > t) then begin // overflow, increment overflow ;-) ticksOverflow := ticksOverflow+(Int64($ffffffff)+Int64(1)); @@ -599,12 +535,14 @@ begin end; {$ENDIF} -procedure ResetTimer(); + +procedure ResetTimer (); begin - wNeedTimeReset := True; + wNeedTimeReset := true; end; -procedure PushExitEvent(); + +procedure PushExitEvent (); var ev: TSDL_Event; begin @@ -619,22 +557,22 @@ var procedure ProcessLoading (forceUpdate: Boolean=false); var ev: TSDL_Event; - ID: DWORD; + ID: LongWord; stt: UInt64; begin - FillChar(ev, SizeOf(ev), 0); - //wNeedFree := False; - wLoadingProgress := True; - while SDL_PollEvent(@ev) > 0 do + FillChar(ev, sizeof(ev), 0); + wLoadingProgress := true; + + while (SDL_PollEvent(@ev) > 0) do begin - if (ev.type_ = SDL_QUITEV) then - break; + EventHandler(ev); + if (ev.type_ = SDL_QUITEV) then break; end; - //wNeedFree := True; + e_PollJoysticks(); if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then begin - wLoadingProgress := False; + wLoadingProgress := false; exit; end; @@ -647,7 +585,7 @@ begin else begin stt := getTimeMilli(); - if (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= 400) then + if (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs) then begin prevLoadingUpdateTime := stt; forceUpdate := true; @@ -658,7 +596,8 @@ begin 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 @@ -667,8 +606,6 @@ begin DrawLoadingStat(); SwapBuffers(); - - ReShowCursor(); end; end; @@ -682,52 +619,61 @@ begin begin if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading(); end; - wLoadingProgress := False; + + wLoadingProgress := false; end; -function ProcessMessage(): Boolean; + +function g_ProcessMessages (): Boolean; var - i, t: Integer; ev: TSDL_Event; begin - Result := False; + result := false; FillChar(ev, SizeOf(ev), 0); - - while SDL_PollEvent(@ev) > 0 do + while (SDL_PollEvent(@ev) > 0) do begin - Result := EventHandler(ev); - if ev.type_ = SDL_QUITEV then exit; + 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; + Time_Delta := Time-Time_Old; - flag := False; + flag := false; if wNeedTimeReset then begin - Time_Delta := 28{(27777 div 1000)}; - wNeedTimeReset := False; + Time_Delta := 28; + wNeedTimeReset := false; end; g_Map_ProfilersBegin(); g_Mons_ProfilersBegin(); - t := Time_Delta div 28{(27777 div 1000)}; - if t > 0 then + t := Time_Delta div 28; + if (t > 0) then begin - flag := True; + flag := true; for i := 1 to t do begin - if NetMode = NET_SERVER then g_Net_Host_Update() - else if NetMode = NET_CLIENT then g_Net_Client_Update(); + if (NetMode = NET_SERVER) then g_Net_Host_Update() + else if (NetMode = NET_CLIENT) then g_Net_Client_Update(); Update(); end; end else begin - if NetMode = NET_SERVER then g_Net_Host_Update() - else if NetMode = NET_CLIENT then g_Net_Client_Update(); + if (NetMode = NET_SERVER) then g_Net_Host_Update() + else if (NetMode = NET_CLIENT) then g_Net_Client_Update(); end; g_Map_ProfilersEnd(); @@ -739,41 +685,45 @@ begin g_Game_Quit(); end; - if gExit = EXIT_QUIT then + if (gExit = EXIT_QUIT) then begin - Result := True; - Exit; + result := true; + exit; end; -// Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ: + // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ if flag then begin - Time_Old := Time - (Time_Delta mod 28{(27777 div 1000)}); + Time_Old := Time-(Time_Delta mod 28); if (not wMinimized) then begin Draw(); SwapBuffers(); - ReShowCursor(); end; end else - Sleep(1); + begin + Sleep(1); // release time slice, so we won't eat 100% CPU + end; e_SoundUpdate(); end; -procedure ReDrawWindow; + +procedure ReDrawWindow (); begin SwapBuffers(); - ReShowCursor(); end; -procedure InitOpenGL(VSync: Boolean); + +procedure InitOpenGL (vsync: Boolean); +{$IF not DEFINED(HEADLESS)} var v: Byte; +{$ENDIF} begin - {$IFDEF HEADLESS}Exit;{$ENDIF} - if VSync then v := 1 else v := 0; +{$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); @@ -781,14 +731,13 @@ begin SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - if gwin_k8_enable_light_experiments then - begin - SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1); // lights; it is enough to have 1-bit stencil buffer for lighting - end; + 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); +{$ENDIF} end; -function glHasExtension (name: AnsiString): Boolean; + +function glHasExtension (const name: AnsiString): Boolean; var exts: PChar; i: Integer; @@ -796,11 +745,11 @@ var extName: ShortString; begin result := false; - if length(name) = 0 then exit; + if (Length(name) = 0) then exit; exts := glGetString(GL_EXTENSIONS); - if exts = nil then exit; + if (exts = nil) then exit; while (exts[0] <> #0) and (exts[0] = ' ') do Inc(exts); - while exts[0] <> #0 do + while (exts[0] <> #0) do begin if gwin_dump_extensions then begin @@ -820,16 +769,17 @@ begin found := true; for i := 0 to length(name)-1 do begin - if exts[i] = #0 then begin found := false; break; end; - if exts[i] <> name[i+1] then begin found := false; break; end; + if (exts[i] = #0) then begin found := false; break; end; + if (exts[i] <> name[i+1]) then begin found := false; break; end; end; - if found and ((exts[length(name)] = #0) or (exts[length(name)] = ' ')) then begin result := true; exit; end; + if found and ((exts[Length(name)] = #0) or (exts[Length(name)] = ' ')) then begin result := true; exit; end; while (exts[0] <> #0) and (exts[0] <> ' ') do Inc(exts); while (exts[0] <> #0) and (exts[0] = ' ') do Inc(exts); end; end; -function SDLMain(): Integer; + +function SDLMain (): Integer; var idx: Integer; {$IF not DEFINED(HEADLESS)} @@ -837,9 +787,17 @@ var {$ENDIF} arg: AnsiString; mdfo: TStream; + itmp: Integer; + valres: Word; begin {$IFDEF HEADLESS} - e_NoGraphics := True; + e_NoGraphics := true; +{$ELSE} + if (not g_holmes_imfunctional) then + begin + uiInitialize(); + uiContext.font := 'win14'; + end; {$ENDIF} idx := 1; @@ -848,7 +806,7 @@ begin arg := ParamStr(idx); Inc(idx); if arg = '--opengl-dump-exts' then gwin_dump_extensions := true; - if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true; + //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true; if arg = '--jah' then g_profile_history_size := 100; if arg = '--no-particles' then gpart_dbg_enabled := false; if arg = '--no-los' then gmon_dbg_los_enabled := false; @@ -869,11 +827,36 @@ begin {.$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(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; @@ -902,62 +885,54 @@ begin e_WriteLog('Creating GL window', TMsgType.Notify); if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then begin - Result := 0; + result := 0; exit; end; {EnumDisplayModes();} - {$IFDEF HEADLESS} - gwin_k8_enable_light_experiments := false; +{$IFDEF HEADLESS} + //gwin_k8_enable_light_experiments := false; gwin_has_stencil := false; glLegacyNPOT := false; gwin_dump_extensions := false; - {$ELSE} - if gwin_k8_enable_light_experiments then - begin - SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, @ltmp); - e_WriteLog(Format('stencil buffer size: %d', [ltmp]), TMsgType.Warning); - gwin_has_stencil := (ltmp > 0); - end - else - begin - gwin_has_stencil := false; - end; +{$ELSE} + SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, @ltmp); + e_LogWritefln('stencil buffer size: %s', [ltmp]); + gwin_has_stencil := (ltmp > 0); if not glHasExtension('GL_ARB_texture_non_power_of_two') then begin - e_WriteLog('Driver DID''T advertised NPOT textures support', TMsgType.Warning); + e_WriteLog('NPOT textures: NO', TMsgType.Warning); glLegacyNPOT := true; end else begin - e_WriteLog('Driver advertised NPOT textures support', TMsgType.Notify); + e_WriteLog('NPOT textures: YES', TMsgType.Notify); glLegacyNPOT := false; end; gwin_dump_extensions := false; - {$ENDIF} +{$ENDIF} Init(); Time_Old := GetTimer(); -// Êîìàíäíàÿ ñòðîêà: - if ParamCount > 0 then - g_Game_Process_Params(); + // Êîìàíäíàÿ ñòðîêà + if (ParamCount > 0) then g_Game_Process_Params(); -// Çàïðîñ ÿçûêà: - if (not gGameOn) and gAskLanguage then - g_Menu_AskLanguage(); + // Çàïðîñ ÿçûêà + if (not gGameOn) and gAskLanguage then g_Menu_AskLanguage(); e_WriteLog('Entering the main loop', TMsgType.Notify); - while not ProcessMessage() do - { Main Loop } ; + // main loop + while not ProcessMessage() do begin end; Release(); - KillGLWindow(); + KillGLWindow(false); - Result := 0; + result := 0; end; + end.