RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 06:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sdl: handle activate events

Browse source
This commit is contained in:
notaz 2012-12-22 21:14:50 +02:00
parent e81b987fc1
commit e54719efea
3 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gl.c
View file

@ -136,21 +136,23 @@ int gl_flip(const void *fb, int w, int h)
{ {
static int old_w, old_h; static int old_w, old_h;
if (w != old_w || h != old_h) { if (fb != NULL) {
float f_w = (float)w / 1024.0f; if (w != old_w || h != old_h) {
float f_h = (float)h / 512.0f; float f_w = (float)w / 1024.0f;
texture[1*2 + 0] = f_w; float f_h = (float)h / 512.0f;
texture[2*2 + 1] = f_h; texture[1*2 + 0] = f_w;
texture[3*2 + 0] = f_w; texture[2*2 + 1] = f_h;
texture[3*2 + 1] = f_h; texture[3*2 + 0] = f_w;
old_w = w; texture[3*2 + 1] = f_h;
old_h = h; old_w = w;
} old_h = h;
}
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h,
GL_RGB, GL_UNSIGNED_SHORT_5_6_5, fb); GL_RGB, GL_UNSIGNED_SHORT_5_6_5, fb);
if (gl_have_error("glTexSubImage2D")) if (gl_have_error("glTexSubImage2D"))
return -1; return -1;
}
glVertexPointer(3, GL_FLOAT, 0, vertices); glVertexPointer(3, GL_FLOAT, 0, vertices);
glTexCoordPointer(2, GL_FLOAT, 0, texture); glTexCoordPointer(2, GL_FLOAT, 0, texture);

28
plat_sdl.c
View file

@ -31,7 +31,8 @@ static int old_fullscreen;
static int vout_mode_overlay = -1, vout_mode_gl = -1; static int vout_mode_overlay = -1, vout_mode_gl = -1;
static void *display, *window; static void *display, *window;
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; static int prev_w, prev_h;
@ -44,6 +45,13 @@ int plat_sdl_change_video_mode(int w, int h)
else else
prev_h = h; 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) { if (plat_sdl_overlay != NULL) {
SDL_FreeYUVOverlay(plat_sdl_overlay); SDL_FreeYUVOverlay(plat_sdl_overlay);
plat_sdl_overlay = NULL; plat_sdl_overlay = NULL;
@ -111,6 +119,7 @@ int plat_sdl_change_video_mode(int w, int h)
void plat_sdl_event_handler(void *event_) void plat_sdl_event_handler(void *event_)
{ {
static int was_active;
SDL_Event *event = event_; SDL_Event *event = event_;
if (event->type == SDL_VIDEORESIZE) { if (event->type == SDL_VIDEORESIZE) {
@ -120,9 +129,22 @@ void plat_sdl_event_handler(void *event_)
{ {
window_w = event->resize.w; window_w = event->resize.w;
window_h = event->resize.h; 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) {
gl_flip(NULL, 0, 0);
}
// else SDL takes care of it
}
was_active = event->active.gain;
}
} }
int plat_sdl_init(void) int plat_sdl_init(void)
@ -158,7 +180,7 @@ int plat_sdl_init(void)
g_menuscreen_h = h; 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) { if (ret != 0) {
plat_sdl_screen = SDL_SetVideoMode(0, 0, 16, SDL_SWSURFACE); plat_sdl_screen = SDL_SetVideoMode(0, 0, 16, SDL_SWSURFACE);
if (plat_sdl_screen == NULL) { if (plat_sdl_screen == NULL) {

2
plat_sdl.h
View file

@ -5,7 +5,7 @@ extern SDL_Overlay *plat_sdl_overlay;
extern int plat_sdl_gl_active; extern int plat_sdl_gl_active;
int plat_sdl_init(void); int plat_sdl_init(void);
int plat_sdl_change_video_mode(int w, int h); int plat_sdl_change_video_mode(int w, int h, int force);
void plat_sdl_overlay_clear(void); void plat_sdl_overlay_clear(void);
void plat_sdl_event_handler(void *event_); void plat_sdl_event_handler(void *event_);
void plat_sdl_finish(void); void plat_sdl_finish(void);