mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split window from main event handler

Browse Source 
Two globals can be removed.
This commit is contained in:
phosit
2025-04-16 19:49:51 +02:00
parent 3af4287f6d
commit 464d40ab61
4 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/main.cpp
+1 -32
View File
@@ -168,14 +168,6 @@ enum ShutdownType
static ShutdownType g_Shutdown = ShutdownType::None;
static int g_ExitStatus{EXIT_SUCCESS};
// to avoid redundant and/or recursive resizing, we save the new
// size after VIDEORESIZE messages and only update the video mode
// once per frame.
// these values are the latest resize message, and reset to 0 once we've
// updated the video mode
static int g_ResizedW;
static int g_ResizedH;
static std::chrono::high_resolution_clock::time_point lastFrameTime;
bool IsQuitRequested()
@@ -199,18 +191,6 @@ static Input::Reaction MainInputHandler(const SDL_Event& ev)
{
switch(ev.type)
{
case SDL_WINDOWEVENT:
switch(ev.window.event)
{
case SDL_WINDOWEVENT_RESIZED:
g_ResizedW = ev.window.data1;
g_ResizedH = ev.window.data2;
break;
case SDL_WINDOWEVENT_MOVED:
g_VideoMode.UpdatePosition(ev.window.data1, ev.window.data2);
}
break;
case SDL_QUIT:
QuitEngine(EXIT_SUCCESS);
break;
@@ -261,12 +241,6 @@ static Input::Reaction MainInputHandler(const SDL_Event& ev)
g_Profiler2.Toggle();
return Input::Reaction::HANDLED;
}
else if (hotkey == "mousegrabtoggle")
{
SDL_Window* const window{g_VideoMode.GetWindow()};
const SDL_bool willGrabMouse{SDL_GetWindowGrab(window) ? SDL_FALSE : SDL_TRUE};
SDL_SetWindowGrab(window, willGrabMouse);
}
break;
}
@@ -449,12 +423,7 @@ static void Frame(RL::Interface* rlInterface, const int fixedFrameFrequency)
if (g_Shutdown != ShutdownType::None)
return;
// respond to pumped resize events
if (g_ResizedW || g_ResizedH)
{
g_VideoMode.ResizeWindow(g_ResizedW, g_ResizedH);
g_ResizedW = g_ResizedH = 0;
}
g_VideoMode.OnceAFrameWork();
if (g_NetClient)
g_NetClient->Poll();