Skip to content

x11: Handle XTranslateCoordinates failing during a reparenting operation #16262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kontrabant wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −6
Open

x11: Handle XTranslateCoordinates failing during a reparenting operation #16262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions src/video/x11/SDL_x11events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,13 +792,16 @@ static void X11_UpdateUserTime(SDL_WindowData *data, const unsigned long latest)
}
}

static int SelectionRequestErrorHandler(Display *d, XErrorEvent *e)
static unsigned char x11_last_error;
static int BadWindowErrorHandler(Display *d, XErrorEvent *e)
{
// Ignore BadWindow, as it can happen during XChangeProperty if the target window was already destroyed.
x11_last_error = e->error_code;

// Ignore BadWindow in cases where it's not fatal.
if (e->error_code != BadWindow) {
char err_msg[128];
X11_XGetErrorText(d, e->error_code, err_msg, sizeof(err_msg));
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Failed to handle SelectionRequest: %hhu (%s)", e->error_code, err_msg);
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "X failed request: %hhu (%s), major opcode: %hhu", e->error_code, err_msg, e->request_code);
}
return 0;
}
Expand All @@ -816,7 +819,6 @@ static void X11_HandleClipboardEvent(SDL_VideoDevice *_this, const XEvent *xeven
// Copy the selection from our own CUTBUFFER to the requested property
case SelectionRequest:
{
int (*prev_handler)(Display *, XErrorEvent *);
const XSelectionRequestEvent *req = &xevent->xselectionrequest;
XEvent sevent;
int mime_formats;
Expand All @@ -838,7 +840,7 @@ static void X11_HandleClipboardEvent(SDL_VideoDevice *_this, const XEvent *xeven
/* If the requesting window was already destroyed, XChangeProperty can generate a BadWindow
* error. Register an error handler to catch this, and prevent it from being fatal.
*/
prev_handler = X11_XSetErrorHandler(SelectionRequestErrorHandler);
XErrorHandler prev_handler = X11_XSetErrorHandler(BadWindowErrorHandler);

if (req->selection == XA_PRIMARY) {
clipboard = &videodata->primary_selection;
Expand Down Expand Up @@ -1686,13 +1688,28 @@ static void X11_DispatchEvent(SDL_VideoDevice *_this, XEvent *xevent)
unsigned int NumChildren;
Window ChildReturn, Root, Parent;
Window *Children;
// Translate these coordinates back to relative to root
/* Translate these coordinates back to relative to root.
*
* XTranslateCoordinates can generate a BadWindow error if called during a racy
* reparenting operation, so a non-fatal error handler is required.
*/
x11_last_error = 0;
XErrorHandler prev_handler = X11_XSetErrorHandler(BadWindowErrorHandler);

X11_XQueryTree(data->videodata->display, xevent->xconfigure.window, &Root, &Parent, &Children, &NumChildren);
X11_XTranslateCoordinates(xevent->xconfigure.display,
Parent, DefaultRootWindow(xevent->xconfigure.display),
xevent->xconfigure.x, xevent->xconfigure.y,
&xevent->xconfigure.x, &xevent->xconfigure.y,
&ChildReturn);

X11_XSync(display, False);
X11_XSetErrorHandler(prev_handler);

// If XTranslateCoordinates failed due to a BadWindow error, nothing more to do here.
if (x11_last_error == BadWindow) {
break;
}
}

/* Some window managers send ConfigureNotify before PropertyNotify when changing state (Xfce and
Expand Down