From bf775b1c0ebaa82477b362db3ba5ac323010e789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 26 Jul 2013 14:29:47 +0200
Subject: [PATCH] Enable leave notify event handling in Client

Still has an XQueryPointer which needs to be ported.
---
 client.h   |  2 +-
 events.cpp | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/client.h b/client.h
index 9216200e00..5ee928ef56 100644
--- a/client.h
+++ b/client.h
@@ -679,7 +679,7 @@ private:
     virtual void propertyNotifyEvent(xcb_property_notify_event_t *e) override;
     void clientMessageEvent(XClientMessageEvent* e);
     void enterNotifyEvent(xcb_enter_notify_event_t *e);
-    void leaveNotifyEvent(XCrossingEvent* e);
+    void leaveNotifyEvent(xcb_leave_notify_event_t *e);
     void focusInEvent(XFocusInEvent* e);
     void focusOutEvent(XFocusOutEvent* e);
     virtual void damageNotifyEvent();
diff --git a/events.cpp b/events.cpp
index f9cd5ae76f..a2b159567a 100644
--- a/events.cpp
+++ b/events.cpp
@@ -555,14 +555,16 @@ bool Client::windowEvent(xcb_generic_event_t *e)
         workspace()->updateFocusMousePosition(QPoint(event->root_x, event->root_y));
         break;
     }
-#if KWIN_QT5_PORTING
-    case LeaveNotify:
-        motionNotifyEvent(e->xcrossing.window, e->xcrossing.state,
-                          e->xcrossing.x, e->xcrossing.y, e->xcrossing.x_root, e->xcrossing.y_root);
-        leaveNotifyEvent(&e->xcrossing);
+    case XCB_LEAVE_NOTIFY: {
+        auto *event = reinterpret_cast<xcb_leave_notify_event_t*>(e);
+        motionNotifyEvent(event->event, event->state,
+                          event->event_x, event->event_y, event->root_x, event->root_y);
+        leaveNotifyEvent(event);
         // not here, it'd break following enter notify handling
         // workspace()->updateFocusMousePosition( QPoint( e->xcrossing.x_root, e->xcrossing.y_root ));
         break;
+    }
+#if KWIN_QT5_PORTING
     case FocusIn:
         focusInEvent(&e->xfocus);
         break;
@@ -839,16 +841,16 @@ void Client::enterNotifyEvent(xcb_enter_notify_event_t *e)
     }
 }
 
-void Client::leaveNotifyEvent(XCrossingEvent* e)
+void Client::leaveNotifyEvent(xcb_leave_notify_event_t *e)
 {
-    if (e->window != frameId())
+    if (e->event != frameId())
         return; // care only about leaving the whole frame
-    if (e->mode == NotifyNormal) {
+    if (e->mode == XCB_NOTIFY_MODE_NORMAL) {
         if (!buttonDown) {
             mode = PositionCenter;
             updateCursor();
         }
-        bool lostMouse = !rect().contains(QPoint(e->x, e->y));
+        bool lostMouse = !rect().contains(QPoint(e->event_x, e->event_y));
         // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations
         // (i.e. the LeaveNotify event comes before leaving the rect and no LeaveNotify event
         // comes after leaving the rect) - so lets check if the pointer is really outside the window
@@ -856,12 +858,13 @@ void Client::leaveNotifyEvent(XCrossingEvent* e)
         // TODO this still sucks if a window appears above this one - it should lose the mouse
         // if this window is another client, but not if it's a popup ... maybe after KDE3.1 :(
         // (repeat after me 'AARGHL!')
-        if (!lostMouse && e->detail != NotifyInferior) {
+        if (!lostMouse && e->detail != XCB_NOTIFY_DETAIL_INFERIOR) {
+            // TODO: port to XCB
             int d1, d2, d3, d4;
             unsigned int d5;
             Window w, child;
             if (XQueryPointer(display(), frameId(), &w, &child, &d1, &d2, &d3, &d4, &d5) == False
-                    || child == None)
+                    || child == XCB_WINDOW_NONE)
                 lostMouse = true; // really lost the mouse
         }
         if (lostMouse) {