X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plat_sdl.c;h=1f304aadde7025366b298400cd17f296df77156c;hb=1f84ba9f30b0177a99939f004ad1fed20f689851;hp=c5cf64cd20177ec6a0203af4fadc2650d72d043c;hpb=e81b987fc1e567f92298087e32e5d9f01fce0aa7;p=libpicofe.git

diff --git a/plat_sdl.c b/plat_sdl.c
index c5cf64c..1f304aa 100644
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -24,14 +24,17 @@
 SDL_Surface *plat_sdl_screen;
 SDL_Overlay *plat_sdl_overlay;
 int plat_sdl_gl_active;
+void (*plat_sdl_quit_cb)(void);
 
 static int window_w, window_h;
 static int fs_w, fs_h;
 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;
 
@@ -44,6 +47,13 @@ int plat_sdl_change_video_mode(int w, int 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;
@@ -88,7 +98,7 @@ int plat_sdl_change_video_mode(int w, int h)
     }
   }
   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;
@@ -111,17 +121,41 @@ int plat_sdl_change_video_mode(int w, int h)
 
 void plat_sdl_event_handler(void *event_)
 {
+  static int was_active;
   SDL_Event *event = event_;
 
-  if (event->type == SDL_VIDEORESIZE) {
+  switch (event->type) {
+  case SDL_VIDEORESIZE:
     //printf("resize %dx%d\n", event->resize.w, event->resize.h);
     if (plat_target.vout_method != 0
         && !plat_target.vout_fullscreen && !old_fullscreen)
     {
       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);
+    }
+    break;
+  case 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;
+    break;
+  case SDL_QUIT:
+    if (plat_sdl_quit_cb != NULL)
+      plat_sdl_quit_cb();
+    break;
   }
 }
 
@@ -130,6 +164,7 @@ int plat_sdl_init(void)
   static const char *vout_list[] = { NULL, NULL, NULL, NULL };
   const SDL_VideoInfo *info;
   SDL_SysWMinfo wminfo;
+  char vid_drv_name[64];
   int overlay_works = 0;
   int gl_works = 0;
   int i, ret, h;
@@ -158,7 +193,7 @@ int plat_sdl_init(void)
       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) {
@@ -193,12 +228,20 @@ int plat_sdl_init(void)
   else
     fprintf(stderr, "overlay is not available.\n");
 
-  SDL_VERSION(&wminfo.version);
-  SDL_GetWMInfo(&wminfo);
-  display = wminfo.info.x11.display;
-  window = (void *)wminfo.info.x11.window;
+  // get x11 display/window for GL
+  SDL_VideoDriverName(vid_drv_name, sizeof(vid_drv_name));
+#ifdef SDL_VIDEO_DRIVER_X11
+  if (strcmp(vid_drv_name, "x11") == 0) {
+    SDL_VERSION(&wminfo.version);
+    ret = SDL_GetWMInfo(&wminfo);
+    if (ret > 0) {
+      display = wminfo.info.x11.display;
+      window = (void *)wminfo.info.x11.window;
+    }
+  }
+#endif
 
-  ret = gl_init(display, window);
+  ret = gl_init(display, window, &gl_quirks);
   if (ret == 0) {
     gl_works = 1;
     gl_finish();