Skip to content

More fixes for SDL2 window management #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

More fixes for SDL2 window management #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
766a58f
In addition to (un)grabMouse() (which is a no-op in our SDL 2 code), …
macsforme Oct 27, 2020
4735b27
Work around a bug in SDL2 that was causing an offset viewport in macOS.
blast007 Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/bzflag/playing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ static void mouseClamp()
{
// only clamp when it might be useful
if (HUDDialogStack::get()->isActive() || (myTank == NULL) || !myTank->isAlive() ||
myTank->isPaused() || (myTank->getTeam() == ObserverTeam))
myTank->isPaused() || (myTank->getTeam() == ObserverTeam) || unmapped)
{
mainWindow->disableConfineToMotionbox();
return;
Expand Down Expand Up @@ -1133,6 +1133,9 @@ static void doEvent(BzfDisplay *disply)
unmapped = false;
if (shouldGrabMouse())
mainWindow->grabMouse();
if(mainWindow->isGrabEnabled())
mainWindow->getWindow()->enableGrabMouse(true); // distinct from grabMouse(), for some reason
mouseClamp();
break;

case BzfEvent::Unmap:
Expand Down Expand Up @@ -1175,6 +1178,7 @@ static void doEvent(BzfDisplay *disply)

unmapped = true;
mainWindow->ungrabMouse();
mainWindow->getWindow()->enableGrabMouse(false); // distinct from ungrabMouse(), for some reason
break;

case BzfEvent::KeyUp:
Expand Down
16 changes: 16 additions & 0 deletions src/platform/SDL2Display.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,22 @@ bool SDLDisplay::setupEvent(BzfEvent& _event, const SDL_Event& event) const
case SDL_WINDOWEVENT:
switch (event.window.event)
{
#ifdef __APPLE__
case SDL_WINDOWEVENT_MOVED:
{
// Work around a bug in SDL2 that was causing an offset viewport on macOS when restoring a fullscreen window
// running at a resolution different from the desktop resolution. The issue only occurred when clicking on
// the application icon, not the minimized window. The window moves to a negative position, so we'll
// detect that and toggle windowed/full screen to fix it.
SDL_Window *window = SDL_GetWindowFromID(event.window.windowID);
if ((event.window.data1 < 0 || event.window.data2 < 0) && SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN)
{
SDL_SetWindowFullscreen(window, 0);
SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN);
}
}
break;
#endif
case SDL_WINDOWEVENT_RESIZED:
_event.type = BzfEvent::Resize;
_event.resize.width = event.window.data1;
Expand Down