lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More window state logging in SDL2 backend

Browse source
This commit is contained in:
Nikita Lisitsa 2023-12-03 18:28:54 +03:00
parent a8c89f84bd
commit 8038da6987
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libs/sdl2/source/window.cpp
View file

@ -1,6 +1,8 @@
#include <psemek/sdl2/window.hpp> #include <psemek/sdl2/window.hpp>
#include <psemek/sdl2/init.hpp> #include <psemek/sdl2/init.hpp>
#include <psemek/gfx/gl.hpp> #include <psemek/gfx/gl.hpp>
#include <psemek/geom/box.hpp>
#include <psemek/log/log.hpp>
namespace psemek::sdl2 namespace psemek::sdl2
{ {
@ -64,12 +66,14 @@ namespace psemek::sdl2
void window::show_cursor(bool show) void window::show_cursor(bool show)
{ {
log::info() << (show ? "Cursor shown" : "Cursor hidden");
SDL_ShowCursor(show ? SDL_TRUE : SDL_FALSE); SDL_ShowCursor(show ? SDL_TRUE : SDL_FALSE);
SDL_SetRelativeMouseMode(show ? SDL_FALSE : SDL_TRUE); SDL_SetRelativeMouseMode(show ? SDL_FALSE : SDL_TRUE);
} }
void window::vsync(bool on) void window::vsync(bool on)
{ {
log::info() << "Turning VSync " << (on ? "on" : "off");
if (on) if (on)
{ {
// try adaptive vsync // try adaptive vsync
@ -87,22 +91,36 @@ namespace psemek::sdl2
void window::windowed(bool on) void window::windowed(bool on)
{ {
SDL_DisplayMode display_mode; log::info() << "Entering " << (on ? "windowed" : "fullscreen") << " mode";
SDL_GetCurrentDisplayMode(0, &display_mode);
SDL_Rect display_usable_bounds;
SDL_GetDisplayUsableBounds(0, &display_usable_bounds);
SDL_SetWindowFullscreen(window_, on ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP); SDL_SetWindowFullscreen(window_, on ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP);
SDL_SetWindowBordered(window_, on ? SDL_TRUE : SDL_FALSE); SDL_SetWindowBordered(window_, on ? SDL_TRUE : SDL_FALSE);
SDL_RestoreWindow(window_); SDL_RestoreWindow(window_);
if (on) if (on)
{ {
SDL_Rect display_usable_bounds;
SDL_GetDisplayUsableBounds(0, &display_usable_bounds);
int top_border, left_border, bottom_border, right_border; int top_border, left_border, bottom_border, right_border;
SDL_GetWindowBordersSize(window_, &top_border, &left_border, &bottom_border, &right_border); SDL_GetWindowBordersSize(window_, &top_border, &left_border, &bottom_border, &right_border);
SDL_SetWindowSize(window_, display_usable_bounds.w - left_border - right_border, display_usable_bounds.h - top_border - bottom_border); geom::box<int, 2> bounds_rect;
SDL_SetWindowPosition(window_, left_border, top_border); bounds_rect[0] = {display_usable_bounds.x, display_usable_bounds.x + display_usable_bounds.w};
bounds_rect[1] = {display_usable_bounds.y, display_usable_bounds.y + display_usable_bounds.h};
log::info() << "Display usable bounds: " << bounds_rect;
log::info() << "Window borders: left " << left_border << ", right " << right_border << ", top " << top_border << ", bottom " << bottom_border;
geom::box<int, 2> window_rect = bounds_rect;
window_rect[0].min += left_border;
window_rect[0].max -= right_border;
window_rect[1].min += top_border;
window_rect[1].max -= bottom_border;
log::info() << "Computed window rect: " << window_rect;
SDL_SetWindowSize(window_, window_rect.dimensions()[0], window_rect.dimensions()[1]);
SDL_SetWindowPosition(window_, window_rect[0].min, window_rect[1].min);
} }
} }