From 70f93c12a888aa0d19ea9220e69153f26a4b7063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 26 Jul 2013 11:24:19 +0200 Subject: [PATCH] Enable enter/leave notify event handling --- events.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/events.cpp b/events.cpp index 2e627de905..f8d008a831 100644 --- a/events.cpp +++ b/events.cpp @@ -272,10 +272,9 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e) return (event->event != event->window); // hide wm typical event from Qt } -#if KWIN_QT5_PORTING - case EnterNotify: { + case XCB_ENTER_NOTIFY: { if (QWhatsThis::inWhatsThisMode()) { - QWidget* w = QWidget::find(e->xcrossing.window); + QWidget* w = QWidget::find(reinterpret_cast(e)->event); if (w) QWhatsThis::leaveWhatsThisMode(); } @@ -285,15 +284,17 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e) #endif break; } - case LeaveNotify: { + case XCB_LEAVE_NOTIFY: { if (!QWhatsThis::inWhatsThisMode()) break; // TODO is this cliente ever found, given that client events are searched above? - Client* c = findClient(FrameIdMatchPredicate(e->xcrossing.window)); - if (c && e->xcrossing.detail != NotifyInferior) + const auto *event = reinterpret_cast(e); + Client* c = findClient(FrameIdMatchPredicate(event->event)); + if (c && event->detail != XCB_NOTIFY_DETAIL_INFERIOR) QWhatsThis::leaveWhatsThisMode(); break; } +#if KWIN_QT5_PORTING case ConfigureRequest: { if (e->xconfigurerequest.parent == rootWindow()) { XWindowChanges wc;