scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 04:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable fullscreen key event on Macs (temporarily)

Browse Source 
* it was unstable somehow, anyway cmdline string still works
This commit is contained in:
Martin Pulec
2011-07-29 14:12:58 +02:00
parent a24510d82b
commit 4f3f62adfe
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ultragrid/src/video_display/sdl.c
View File

@@ -36,7 +36,7 @@
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
* EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
/ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -257,6 +257,7 @@ static void loadSplashscreen(struct state_sdl *s) {
* @return zero value everytime
*/
static void toggleFullscreen(struct state_sdl *s) {
#ifndef HAVE_MACOSX
if(s->fs) {
s->fs = 0;
}
@@ -265,6 +266,7 @@ static void toggleFullscreen(struct state_sdl *s) {
}
/* and post for reconfiguration */
s->frame.width = 0;
#endif
}
/**
@@ -303,7 +305,6 @@ int display_sdl_handle_events(void *arg, int post)
}
if (!strcmp(SDL_GetKeyName(sdl_event.key.keysym.sym), "f")) {
/* prevent segfault/leaks */
toggleFullscreen(s);
if(post)
SDL_SemPost(s->semaphore);
@@ -330,14 +331,17 @@ void display_sdl_run(void *arg)
gettimeofday(&s->tv, NULL);
while (!should_exit) {
display_sdl_handle_events(s, 0);
#ifndef HAVE_MACOSX
/* set flag to prevent dangerous actions */
if(SDL_SemWaitTimeout(s->semaphore, 200) == SDL_MUTEX_TIMEDOUT) {
display_sdl_handle_events(s, 0); /* Only handle events */
continue;
}
#else
SDL_SemWait(s->semaphore);
if(SDL_SemTryWait(s->semaphore) == SDL_MUTEX_TIMEDOUT) {
usleep(1000);
continue;
}
#endif
if (s->deinterlace) {
@@ -378,8 +382,6 @@ void display_sdl_run(void *arg)
SDL_CondSignal(s->buffer_writable_cond);
SDL_mutexV(s->buffer_writable_lock);
display_sdl_handle_events(s, 0);
s->frames++;
gettimeofday(&tv, NULL);
double seconds = tv_diff(tv, s->tv);