kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

trap potential failures of SDL when SDL_WINDOWID is pointing to a

Browse Source 
random window.

This commit is essentially a workaround for some undesirable behaviour of SDL;
we should not be doing this in the application, but in the library.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2008-05-19 15:47:46 +00:00
parent 0894cae92c
commit 775542f753
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
channels/console_gui.c
View File

@@ -575,8 +575,6 @@ static void eventhandler(struct video_desc *env, const char *caption)
break;
case SDL_ACTIVEEVENT:
ast_log(LOG_WARNING, "------ active gain %d state 0x%x\n",
ev[i].active.gain, ev[i].active.state);
if (ev[i].active.gain == 0 && ev[i].active.state & SDL_APPACTIVE) {
ast_log(LOG_WARNING, "/* somebody has killed us ? */");
ast_cli_command(gui->outfd, "stop now");
@@ -781,6 +779,21 @@ static void init_board(struct gui_info *gui, struct board **dst, SDL_Rect *r, in
}
}
#ifdef HAVE_X11
/*
* SDL is not very robust on error handling, so we need to trap ourselves
* at least the most obvious failure conditions, e.g. a bad SDL_WINDOWID.
* As of sdl-1.2.13, SDL_SetVideoMode crashes with bad parameters, so
* we need to do the explicit X calls to make sure the window is correct.
* And around these calls, we must trap X errors.
*/
static int my_x_handler(Display *d, XErrorEvent *e)
{
ast_log(LOG_WARNING, "%s error_code %d\n", __FUNCTION__, e->error_code);
return 0;
}
#endif /* HAVE_X11 */
/*! \brief [re]set the main sdl window, useful in case of resize.
* We can tell the first from subsequent calls from the value of
* env->gui, which is NULL the first time.
@@ -793,6 +806,23 @@ static void sdl_setup(struct video_desc *env)
int kp_w = 0, kp_h = 0; /* keypad width and height */
struct gui_info *gui = env->gui;
#ifdef HAVE_X11
const char *e = getenv("SDL_WINDOWID");
if (!ast_strlen_zero(e)) {
XWindowAttributes a;
int (*old_x_handler)(Display *d, XErrorEvent *e) = XSetErrorHandler(my_x_handler);
Display *d = XOpenDisplay(getenv("DISPLAY"));
long w = atol(e);
int success = w ? XGetWindowAttributes(d, w, &a) : 0;
XSetErrorHandler(old_x_handler);
if (!success) {
ast_log(LOG_WARNING, "%s error in window\n", __FUNCTION__);
return;
}
}
#endif
/*
* initialize the SDL environment. We have one large window
* with local and remote video, and a keypad.
@@ -842,7 +872,7 @@ static void sdl_setup(struct video_desc *env)
maxh = MAX( MAX(env->rem_dpy.h, env->loc_dpy.h), kp_h);
maxw += 4 * BORDER;
maxh += 2 * BORDER;
/* XXX warning, here it might crash if SDL_WINDOWID is set badly */
gui->screen = SDL_SetVideoMode(maxw, maxh, depth, 0);
if (!gui->screen) {
ast_log(LOG_ERROR, "SDL: could not set video mode - exiting\n");