mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 18:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

better sdl_x11 detection, don't resize on non-x11 video

Browse Source
This commit is contained in:
Toad King 2012-06-27 00:54:42 -04:00
parent 0a64640303
commit c32b5985b8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/context/sdl_ctx.c
View File

@ -263,8 +263,8 @@ bool gfx_ctx_key_pressed(int key)
// 1.2 specific workaround for tiling WMs. In 1.3 we call GetSize directly, so we don't need to rely on // 1.2 specific workaround for tiling WMs. In 1.3 we call GetSize directly, so we don't need to rely on
// proper event handling (I hope). // proper event handling (I hope).
#if !defined(__APPLE__) && !defined(_WIN32) && !SDL_MODERN && !defined(XENON) #if !SDL_MODERN && defined(SDL_VIDEO_DRIVER_X11)
static void gfx_ctx_get_window_size(unsigned *width, unsigned *height) static bool gfx_ctx_get_window_size(unsigned *width, unsigned *height)
{ {
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);
@ -280,6 +280,12 @@ static void gfx_ctx_get_window_size(unsigned *width, unsigned *height)
*width = target.width; *width = target.width;
*height = target.height; *height = target.height;
return true;
}
else
{
return false;
} }
} }
#endif #endif
@ -344,13 +350,14 @@ void gfx_ctx_check_window(bool *quit,
} }
} }
#if !defined(__APPLE__) && !defined(_WIN32) && !defined(XENON) #ifdef SDL_VIDEO_DRIVER_X11
// Hack to workaround limitations in tiling WMs ... // Hack to workaround limitations in tiling WMs ...
if (!*resize && !g_fullscreen) if (!*resize && !g_fullscreen)
{ {
unsigned new_width, new_height; unsigned new_width, new_height;
gfx_ctx_get_window_size(&new_width, &new_height);
if ((new_width != *width || new_height != *height) || (frame_count == 10)) // Ugly hack :D if (gfx_ctx_get_window_size(&new_width, &new_height) &&
((new_width != *width || new_height != *height) || (frame_count == 10))) // Ugly hack :D
{ {
*resize = true; *resize = true;
*width = new_width; *width = new_width;