libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-01 12:11:03 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Do not reinvent screensaver wheel in sdl_gfx.c.

Browse Source
This commit is contained in:
Themaister 2012-07-28 02:54:58 +02:00
parent b61720ab4d
commit e3a846ba54
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gfx/sdl_gfx.c
View File

@ -20,10 +20,7 @@
#include "../general.h" #include "../general.h"
#include "../input/rarch_sdl_input.h" #include "../input/rarch_sdl_input.h"
#include "gfx_common.h" #include "gfx_common.h"
#include "gfx_context.h"
#ifdef IS_LINUX
#include "SDL_syswm.h"
#endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -247,22 +244,6 @@ static void sdl_render_msg_32(sdl_video_t *vid, SDL_Surface *buffer, const char
#endif #endif
} }
#ifdef HAVE_X11
static Window sdl_get_window_id(void)
{
SDL_SysWMinfo sys_info;
SDL_VERSION(&sys_info.version);
if (SDL_GetWMInfo(&sys_info) <= 0)
{
RARCH_WARN("%s\n", SDL_GetError());
return -1;
}
return sys_info.info.x11.window;
}
#endif
static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data) static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -290,12 +271,6 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
vid->render32 = video->rgb32 && !g_settings.video.force_16bit; vid->render32 = video->rgb32 && !g_settings.video.force_16bit;
vid->screen = SDL_SetVideoMode(video->width, video->height, vid->render32 ? 32 : 15, SDL_HWSURFACE | SDL_HWACCEL | SDL_DOUBLEBUF | (video->fullscreen ? SDL_FULLSCREEN : 0)); vid->screen = SDL_SetVideoMode(video->width, video->height, vid->render32 ? 32 : 15, SDL_HWSURFACE | SDL_HWACCEL | SDL_DOUBLEBUF | (video->fullscreen ? SDL_FULLSCREEN : 0));
#ifdef HAVE_X11
int wid = sdl_get_window_id();
if (wid > 0)
gfx_suspend_screensaver(wid);
#endif
if (!vid->screen && !g_settings.video.force_16bit && !video->rgb32) if (!vid->screen && !g_settings.video.force_16bit && !video->rgb32)
{ {
vid->upsample = true; vid->upsample = true;
@ -312,6 +287,15 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
#ifdef HAVE_X11
RARCH_LOG("Suspending screensaver (X11).\n");
SDL_SysWMinfo wm_info;
if (gfx_ctx_get_wm_info(&wm_info))
gfx_suspend_screensaver(wm_info.info.x11.window);
else
RARCH_ERR("Failed to suspend screensaver.\n");
#endif
fmt = vid->screen->format; fmt = vid->screen->format;
if (vid->render32) if (vid->render32)
{ {