SDL_Surface *plat_sdl_screen;
SDL_Overlay *plat_sdl_overlay;
int plat_sdl_gl_active;
+void (*plat_sdl_resize_cb)(int w, int h);
+void (*plat_sdl_quit_cb)(void);
+static char vid_drv_name[32];
static int window_w, window_h;
static int fs_w, fs_h;
static int old_fullscreen;
else
prev_h = h;
+ // invalid method might come from config..
+ if (plat_target.vout_method != 0
+ && plat_target.vout_method != vout_mode_overlay
+ && plat_target.vout_method != vout_mode_gl)
+ {
+ fprintf(stderr, "invalid vout_method: %d\n", plat_target.vout_method);
+ plat_target.vout_method = 0;
+ }
+
// 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)
}
// XXX: workaround some occasional mysterious deadlock in SDL_SetVideoMode
+ // (seen on r-pi)
SDL_PumpEvents();
plat_sdl_screen = SDL_SetVideoMode(win_w, win_h, 0, flags);
}
old_fullscreen = plat_target.vout_fullscreen;
+ if (plat_sdl_resize_cb != NULL)
+ plat_sdl_resize_cb(plat_sdl_screen->w, plat_sdl_screen->h);
+
return 0;
}
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_h = event->resize.h;
plat_sdl_change_video_mode(0, 0, 1);
}
- }
- else if (event->type == SDL_ACTIVEEVENT) {
+ 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 };
// 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;
}
}
if (info != NULL) {
fs_w = info->current_w;
fs_h = info->current_h;
+ printf("plat_sdl: using %dx%d as fullscreen resolution\n", fs_w, fs_h);
}
g_menuscreen_w = 640;
g_menuscreen_w = window_w = plat_sdl_screen->w;
g_menuscreen_h = window_h = plat_sdl_screen->h;
+ // overlay/gl require native bpp in some cases..
+ plat_sdl_screen = SDL_SetVideoMode(g_menuscreen_w, g_menuscreen_h,
+ 0, SDL_SWSURFACE);
+ if (plat_sdl_screen == NULL) {
+ fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
+ goto fail;
+ }
+
plat_sdl_overlay = SDL_CreateYUVOverlay(plat_sdl_screen->w, plat_sdl_screen->h,
SDL_UYVY_OVERLAY, plat_sdl_screen);
if (plat_sdl_overlay != NULL) {
- printf("overlay: fmt %x, planes: %d, pitch: %d, hw: %d\n",
+ printf("plat_sdl: overlay: fmt %x, planes: %d, pitch: %d, hw: %d\n",
plat_sdl_overlay->format, plat_sdl_overlay->planes, *plat_sdl_overlay->pitches,
plat_sdl_overlay->hw_overlay);
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;
+ }
+ }
+#else
+ (void)wminfo;
+#endif
ret = gl_init(display, window, &gl_quirks);
if (ret == 0) {
gl_finish();
plat_sdl_gl_active = 0;
}
+ // restore back to initial resolution
+ // resolves black screen issue on R-Pi
+ if (strcmp(vid_drv_name, "x11") != 0)
+ SDL_SetVideoMode(fs_w, fs_h, 16, SDL_SWSURFACE);
SDL_Quit();
}