Commit d51c1454 authored by Laurent Aimar's avatar Laurent Aimar

Ignore X11 errors.

Grrr a library that does exit on its own !
parent bb289970
......@@ -72,6 +72,7 @@ static void Mapping( intf_thread_t *p_intf );
static void Register( intf_thread_t *p_intf );
static void Unregister( intf_thread_t *p_intf );
static void *Thread( void *p_data );
static int X11ErrorHandler( Display *, XErrorEvent * );
/*****************************************************************************
* Open:
......@@ -84,6 +85,7 @@ static int Open( vlc_object_t *p_this )
Display *p_display = XOpenDisplay( NULL );
if( !p_display )
return VLC_EGENERIC;
XSetErrorHandler( X11ErrorHandler );
p_intf->p_sys = p_sys = malloc( sizeof(*p_sys) );
if( !p_sys )
......@@ -125,8 +127,24 @@ static void Close( vlc_object_t *p_this )
}
/*****************************************************************************
* Thread:
*
*****************************************************************************/
static int X11ErrorHandler( Display *p_display, XErrorEvent *p_event )
{
#if 0
char psz_txt[1024];
XGetErrorText( p_display, p_event->error_code, psz_txt, sizeof(psz_txt) );
fprintf( stderr,
"[????????] globalhotkeys interface error: X11 request %u.%u failed "
"with error code %u:\n %s\n",
p_event->request_code, p_event->minor_code, p_event->error_code, psz_txt );
#else
VLC_UNUSED(p_display); VLC_UNUSED(p_event);
#endif
/* Ignore them */
return 0;
}
static unsigned GetModifier( Display *p_display, KeySym sym )
{
static const unsigned pi_mask[8] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment