Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grab mouse after SDL_SetVideoMode

Browse Source 
Fixes mouse cursor not being grabbed on macOS. Also sets the
`ddio_mouseGrabbed` flag correctly so it can be detected later on.

Fixes #201
This commit is contained in:
Jacob Coby 2024-04-28 10:14:26 -04:00
parent f001d82b80
commit 988653e01e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renderer/HardwareOpenGL.cpp
View File

@ -1,5 +1,5 @@
/*
* Descent 3
* Descent 3
* Copyright (C) 2024 Parallax Software
*
* This program is free software: you can redistribute it and/or modify
@ -693,18 +693,20 @@ int opengl_Setup(oeApplication *app, int *width, int *height) {
flags |= SDL_FULLSCREEN;
}
// Should we shoot for 32-bpp if available? !!!
SDL_Surface *surface = SDL_SetVideoMode(*width, *height, 32, flags);
mprintf((0, "OpenGL: SDL GL surface is %sNULL.", (surface == NULL) ? "" : "NOT "));
if (!FindArg("-nomousecap")) {
// ShowCursor(0) and input grabbing need to be done before setting
// the video mode, or the Voodoo 3 gets a hardware cursor stuck
// on the screen.
// On modern systems this is not necessary and must be done after to take effect.
SDL_ShowCursor(0);
SDL_WM_GrabInput(SDL_GRAB_ON);
ddio_mouseGrabbed = true;
}
// Should we shoot for 32-bpp if available? !!!
SDL_Surface *surface = SDL_SetVideoMode(*width, *height, 32, flags);
mprintf((0, "OpenGL: SDL GL surface is %sNULL.", (surface == NULL) ? "" : "NOT "));
if (ddio_mouseGrabbed == false) {
SDL_WM_GrabInput(SDL_GRAB_OFF);
}