mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
x11: print Xlib errors in verbose mode if Xlib messages are silenced
Follow up to commit b984ec52
.
This commit is contained in:
parent
1356755ad4
commit
6bbb1e4cf9
@ -264,18 +264,14 @@ 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",
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user