PolytreeDE/picom
1
0
Fork 0
mirror of https://github.com/yshui/picom.git synced 2024-11-11 13:51:02 -05:00
Code Releases Activity

core: do not try to ignore xerrors before session is initialized

Browse source 
If the user has no access to the GPU, initialization of the GLX context
fails. In the legacy backend, this occurs BEFORE the session has been
successfully initialized.
At this point we cannot meaningfully filter xerrors as the session
hasn't been initialized yet. So we don't try to.
This commit is contained in:
Bernd Busse 2021-04-11 23:52:07 +02:00
parent 049d347f52
commit c2aea1803e
No known key found for this signature in database
GPG key ID: 6DD2A3C48E63A5AB
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/picom.c
View file

@ -298,6 +298,10 @@ void discard_ignore(session_t *ps, unsigned long sequence) {
} }
static int should_ignore(session_t *ps, unsigned long sequence) { static int should_ignore(session_t *ps, unsigned long sequence) {
if (ps == NULL) {
// Do not ignore errors until the session has been initialized
return false;
}
discard_ignore(ps, sequence); discard_ignore(ps, sequence);
return ps->ignore_head && ps->ignore_head->sequence == sequence; return ps->ignore_head && ps->ignore_head->sequence == sequence;
} }
@ -907,8 +911,9 @@ void root_damaged(session_t *ps) {
* Xlib error handler function. * Xlib error handler function.
*/ */
static int xerror(Display attr_unused *dpy, XErrorEvent *ev) { static int xerror(Display attr_unused *dpy, XErrorEvent *ev) {
if (!should_ignore(ps_g, ev->serial)) if (!should_ignore(ps_g, ev->serial)) {
x_print_error(ev->serial, ev->request_code, ev->minor_code, ev->error_code); x_print_error(ev->serial, ev->request_code, ev->minor_code, ev->error_code);
}
return 0; return 0;
} }
@ -916,9 +921,10 @@ static int xerror(Display attr_unused *dpy, XErrorEvent *ev) {
* XCB error handler function. * XCB error handler function.
*/ */
void ev_xcb_error(session_t *ps, xcb_generic_error_t *err) { void ev_xcb_error(session_t *ps, xcb_generic_error_t *err) {
if (!should_ignore(ps, err->sequence)) if (!should_ignore(ps, err->sequence)) {
x_print_error(err->sequence, err->major_code, err->minor_code, err->error_code); x_print_error(err->sequence, err->major_code, err->minor_code, err->error_code);
} }
}
/** /**
* Force a full-screen repaint. * Force a full-screen repaint.