comparison libvo/x11_common.c @ 4742:a34682347090

added local X11 error handler (call player_exit)

4741:d3a52470594c

  }
  return bestvisual_depth;
}
#endif


int vo_init( void )
{
// int       mScreen;
 int depth, bpp;

 if (*mDisplayName==':') mLocalDisplay=1; else mLocalDisplay=0;
 printf("vo: X11 running at %dx%d with depth %d and %d bits/pixel (\"%s\" => %s display)\n",
	vo_screenwidth,vo_screenheight,
	depth, vo_depthonscreen,
	mDisplayName,mLocalDisplay?"local":"remote");
 return 1;
}


#include "../linux/keycodes.h"

 }
#endif

int vo_x11_uninit(Display *display, Window window)
{
#ifdef HAVE_NEW_GUI
    /* destroy window only if it's not controlled by GUI */
    if (vo_window == None)
#endif
    {

4742:a34682347090

  }
  return bestvisual_depth;
}
#endif

static void x11_errorhandler(Display *display, XErrorEvent *event)
{
#define MSGLEN 60
    char msg[MSGLEN];
        
    XGetErrorText(display, event->error_code, &msg, MSGLEN);
    
    printf("X11 error: %s\n", msg);
    
    if (verbose)
    {
	printf("Type: %x, display: %x, resourceid: %x, serial: %x\n",
	    event->type, event->display, event->resourceid, event->serial);
	printf("Error code: %x, request code: %x, minor code: %x\n",
	    event->error_code, event->request_code, event->minor_code);
    }
    
    exit_player("X11 error");
#undef MSGLEN
}

int vo_init( void )
{
// int       mScreen;
 int depth, bpp;

 if (*mDisplayName==':') mLocalDisplay=1; else mLocalDisplay=0;
 printf("vo: X11 running at %dx%d with depth %d and %d bits/pixel (\"%s\" => %s display)\n",
	vo_screenwidth,vo_screenheight,
	depth, vo_depthonscreen,
	mDisplayName,mLocalDisplay?"local":"remote");

 XSetErrorHandler(x11_errorhandler);
 
 return 1;
}


#include "../linux/keycodes.h"

 }
#endif

int vo_x11_uninit(Display *display, Window window)
{
    XSetErrorHandler(NULL);

#ifdef HAVE_NEW_GUI
    /* destroy window only if it's not controlled by GUI */
    if (vo_window == None)
#endif
    {