static int old_fullscreen;
static int vout_mode_overlay = -1, vout_mode_gl = -1;
static void *display, *window;
+static int gl_quirks;
-int plat_sdl_change_video_mode(int w, int h)
+/* w, h is layer resolution */
+int plat_sdl_change_video_mode(int w, int h, int force)
{
static int prev_w, prev_h;
else
prev_h = h;
+ // skip GL recreation if window doesn't change - avoids flicker
+ if (plat_target.vout_method == vout_mode_gl && plat_sdl_gl_active
+ && plat_target.vout_fullscreen == old_fullscreen && !force)
+ {
+ return 0;
+ }
+
if (plat_sdl_overlay != NULL) {
SDL_FreeYUVOverlay(plat_sdl_overlay);
plat_sdl_overlay = NULL;
}
}
else if (plat_target.vout_method == vout_mode_gl) {
- plat_sdl_gl_active = (gl_init(display, window) == 0);
+ plat_sdl_gl_active = (gl_init(display, window, &gl_quirks) == 0);
if (!plat_sdl_gl_active) {
fprintf(stderr, "warning: could not init GL.\n");
plat_target.vout_method = 0;
void plat_sdl_event_handler(void *event_)
{
+ static int was_active;
SDL_Event *event = event_;
if (event->type == SDL_VIDEORESIZE) {
{
window_w = event->resize.w;
window_h = event->resize.h;
- plat_sdl_change_video_mode(0, 0);
+ plat_sdl_change_video_mode(0, 0, 1);
+ }
+ }
+ else if (event->type == SDL_ACTIVEEVENT) {
+ if (event->active.gain && !was_active) {
+ if (plat_sdl_overlay != NULL) {
+ SDL_Rect dstrect = { 0, 0, plat_sdl_screen->w, plat_sdl_screen->h };
+ SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect);
+ }
+ else if (plat_sdl_gl_active) {
+ if (gl_quirks & GL_QUIRK_ACTIVATE_RECREATE) {
+ gl_finish();
+ plat_sdl_gl_active = (gl_init(display, window, &gl_quirks) == 0);
+ }
+ gl_flip(NULL, 0, 0);
+ }
+ // else SDL takes care of it
}
+ was_active = event->active.gain;
}
}
g_menuscreen_h = h;
}
- ret = plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h);
+ ret = plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 1);
if (ret != 0) {
plat_sdl_screen = SDL_SetVideoMode(0, 0, 16, SDL_SWSURFACE);
if (plat_sdl_screen == NULL) {
display = wminfo.info.x11.display;
window = (void *)wminfo.info.x11.window;
- ret = gl_init(display, window);
+ ret = gl_init(display, window, &gl_quirks);
if (ret == 0) {
gl_works = 1;
gl_finish();