From 1f29af4ca89c9b43cc512eace9872686c3d01931 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 26 Dec 2020 05:40:53 +0000 Subject: [PATCH] replace hardcoded values with definitions in qt_x_errhandler() Signed-off-by: Ivailo Monev --- src/gui/kernel/qapplication_x11.cpp | 8 ++++---- src/gui/kernel/qt_x11_p.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 2e2862100..33972e3eb 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -406,7 +406,7 @@ static int qt_x_errhandler(Display *dpy, XErrorEvent *err) switch (err->error_code) { case BadAtom: - if (err->request_code == 20 /* X_GetProperty */ + if (err->request_code == X_GetProperty && (err->resourceid == XA_RESOURCE_MANAGER || err->resourceid == XA_RGB_DEFAULT_MAP || err->resourceid == ATOM(_NET_SUPPORTED) @@ -419,8 +419,8 @@ static int qt_x_errhandler(Display *dpy, XErrorEvent *err) break; case BadWindow: - if (err->request_code == 2 /* X_ChangeWindowAttributes */ - || err->request_code == 38 /* X_QueryPointer */) { + if (err->request_code == X_ChangeWindowAttributes + || err->request_code == X_QueryPointer) { for (int i = 0; i < ScreenCount(dpy); ++i) { if (err->resourceid == RootWindow(dpy, i)) { // Perhaps we're running under SECURITY reduction? :/ @@ -429,7 +429,7 @@ static int qt_x_errhandler(Display *dpy, XErrorEvent *err) } } qt_x11Data->seen_badwindow = true; - if (err->request_code == 25 /* X_SendEvent */) { + if (err->request_code == X_SendEvent) { for (int i = 0; i < ScreenCount(dpy); ++i) { if (err->resourceid == RootWindow(dpy, i)) { // Perhaps we're running under SECURITY reduction? :/ diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 25facb377..089c4aba3 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -62,6 +62,7 @@ #include #include #include +#include #define XK_MISCELLANY #define XK_LATIN1 -- 2.11.0