summaryrefslogtreecommitdiffstats
path: root/video/out/x11_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-07 17:43:10 +0100
committerwm4 <wm4@nowhere>2015-11-07 17:43:10 +0100
commit6bbb1e4cf9a0a77b6cceeab15338172183878f30 (patch)
tree4a8c1621777a2c27266497594128485205dbd2ab /video/out/x11_common.c
parent1356755ad4618c05e282a65c0697075991b68fe2 (diff)
downloadmpv-6bbb1e4cf9a0a77b6cceeab15338172183878f30.tar.bz2
mpv-6bbb1e4cf9a0a77b6cceeab15338172183878f30.tar.xz
x11: print Xlib errors in verbose mode if Xlib messages are silenced
Follow up to commit b984ec52.
Diffstat (limited to 'video/out/x11_common.c')
-rw-r--r--video/out/x11_common.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 62d66fd730..0fd5db0ca3 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -264,19 +264,15 @@ static void vo_set_cursor_hidden(struct vo *vo, bool cursor_hidden)
static int x11_errorhandler(Display *display, XErrorEvent *event)
{
struct mp_log *log = x11_error_output;
-
- if (atomic_load(&x11_error_silence))
- return 0;
-
char msg[60];
XGetErrorText(display, event->error_code, (char *) &msg, sizeof(msg));
- mp_err(log, "X11 error: %s\n", msg);
-
- mp_verbose(log, "Type: %x, display: %p, resourceid: %lx, serial: %lx\n",
+ int lev = atomic_load(&x11_error_silence) ? MSGL_V : MSGL_ERR;
+ mp_msg(log, lev, "X11 error: %s\n", msg);
+ mp_msg(log, lev, "Type: %x, display: %p, resourceid: %lx, serial: %lx\n",
event->type, event->display, event->resourceid, event->serial);
- mp_verbose(log, "Error code: %x, request code: %x, minor code: %x\n",
- event->error_code, event->request_code, event->minor_code);
+ mp_msg(log, lev, "Error code: %x, request code: %x, minor code: %x\n",
+ event->error_code, event->request_code, event->minor_code);
return 0;
}