diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-09 17:43:49 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-09 17:43:49 +0000 |
| commit | 1d17fa69c3b677f50bb2f7debfd959c9ae6c168e (patch) | |
| tree | ed41a2ff39a090a496a593357158b3b662211cd9 /libvo/x11_common.c | |
| parent | cb0e37959b50de11bbe6f97ae9ff9598681e7b21 (diff) | |
| download | mpv-1d17fa69c3b677f50bb2f7debfd959c9ae6c168e.tar.bz2 mpv-1d17fa69c3b677f50bb2f7debfd959c9ae6c168e.tar.xz | |
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
patch Kazunori Ueno <jagarl@creator.club.ne.jp>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6954 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 8536b29626..b51b272d85 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -840,7 +840,35 @@ void saver_off(Display *mDisplay) { // turning off screensaver } +static XErrorHandler old_handler = NULL; +static int selectinput_err = 0; +static int x11_selectinput_errorhandler(Display *display, XErrorEvent *event) +{ + if (event->error_code == BadAccess) { + selectinput_err = 1; + mp_msg(MSGT_VO, MSGL_ERR, "X11 error : BadAccess during XSelectInput Call\n"); + mp_msg(MSGT_VO, MSGL_ERR, "X11 error : The 'ButtonPressMask' mask of specified window has probably already used by another appication(see man XSelectInput) \n"); + /* If you think mplayer should shutdown with this error, comments out following line */ + return 0; + } + if (old_handler != NULL) old_handler(display, event); + else x11_errorhandler(display, event); + return 0; +} +void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask) +{ + XSync(display, False); + old_handler = XSetErrorHandler(x11_selectinput_errorhandler); + selectinput_err = 0; + XSelectInput(display, w, event_mask); + XSync(display, False); + XSetErrorHandler(old_handler); + if (selectinput_err) { + mp_msg(MSGT_VO, MSGL_ERR, "X11 error : Mplayer discards mouse control and retry XSelectInput...\n"); + XSelectInput(display, w, event_mask & (~(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) ); + } +} #ifdef HAVE_XINERAMA void vo_x11_xinerama_move(Display *dsp, Window w) |