From 1833a053f6cdcabc84fe21960851399ae1e9abec Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sun, 25 Jun 2017 14:40:03 +0200 Subject: [PATCH] fixed xerrorhandler fixes #4 --- QHotkey/qhotkey_x11.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp index 95ccfe3..14e9342 100644 --- a/QHotkey/qhotkey_x11.cpp +++ b/QHotkey/qhotkey_x11.cpp @@ -106,7 +106,7 @@ bool QHotkeyPrivateX11::registerShortcut(QHotkey::NativeShortcut shortcut) GrabModeAsync, GrabModeAsync); } - XFlush(display); + XSync(display, False); if(errorHandler.hasError) { qCWarning(logQHotkey) << "Failed to register hotkey. Error:" @@ -130,7 +130,7 @@ bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut) shortcut.modifier | specialMod, DefaultRootWindow(display)); } - XFlush(display); + XSync(display, False); if(errorHandler.hasError) { qCWarning(logQHotkey) << "Failed to unregister hotkey. Error:" @@ -156,27 +156,32 @@ QString QHotkeyPrivateX11::HotkeyErrorHandler::errorString; QHotkeyPrivateX11::HotkeyErrorHandler::HotkeyErrorHandler() { - this->prevHandler = XSetErrorHandler(&HotkeyErrorHandler::handleError); + prevHandler = XSetErrorHandler(&HotkeyErrorHandler::handleError); } QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler() { - XSetErrorHandler(this->prevHandler); + XSetErrorHandler(prevHandler); + hasError = false; + errorString.clear(); } int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough") switch (error->error_code) { case BadAccess: case BadValue: case BadWindow: if (error->request_code == 33 || //grab key error->request_code == 34) {// ungrab key - HotkeyErrorHandler::hasError = true; - HotkeyErrorHandler::errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); + hasError = true; + errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); return 1; } default: return 0; } +QT_WARNING_POP }