From eb6ce2b7c47449133eb99ef21387bee981283f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 26 Apr 2013 11:00:08 +0200 Subject: [PATCH] Remove XDamageNotifyEvent* argument from Toplevel::damageNotifyEvent It's not used... REVIEW: 110201 --- client.h | 2 +- composite.cpp | 8 +++----- events.cpp | 4 ++-- toplevel.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/client.h b/client.h index d222a6deb0..3ca24c7ff7 100644 --- a/client.h +++ b/client.h @@ -691,7 +691,7 @@ private: void leaveNotifyEvent(XCrossingEvent* e); void focusInEvent(XFocusInEvent* e); void focusOutEvent(XFocusOutEvent* e); - virtual void damageNotifyEvent(XDamageNotifyEvent* e); + virtual void damageNotifyEvent(); bool buttonPressEvent(Window w, int button, int state, int x, int y, int x_root, int y_root); bool buttonReleaseEvent(Window w, int button, int state, int x, int y, int x_root, int y_root); diff --git a/composite.cpp b/composite.cpp index 26bd082188..c9a4e8e50c 100644 --- a/composite.cpp +++ b/composite.cpp @@ -865,10 +865,8 @@ xcb_pixmap_t Toplevel::createWindowPixmap() return pix; } -void Toplevel::damageNotifyEvent(XDamageNotifyEvent* e) +void Toplevel::damageNotifyEvent() { - Q_UNUSED(e) - m_isDamaged = true; // Note: The rect is supposed to specify the damage extents, @@ -882,7 +880,7 @@ bool Toplevel::compositing() const return Workspace::self()->compositing(); } -void Client::damageNotifyEvent(XDamageNotifyEvent* e) +void Client::damageNotifyEvent() { #ifdef HAVE_XSYNC if (syncRequest.isPending && isResize()) { @@ -900,7 +898,7 @@ void Client::damageNotifyEvent(XDamageNotifyEvent* e) setReadyForPainting(); #endif - Toplevel::damageNotifyEvent(e); + Toplevel::damageNotifyEvent(); } bool Toplevel::resetAndFetchDamage() diff --git a/events.cpp b/events.cpp index e99558196f..253fb01ba9 100644 --- a/events.cpp +++ b/events.cpp @@ -680,7 +680,7 @@ bool Client::windowEvent(XEvent* e) } if (e->xany.window == frameId()) { if (e->type == Xcb::Extensions::self()->damageNotifyEvent()) - damageNotifyEvent(reinterpret_cast< XDamageNotifyEvent* >(e)); + damageNotifyEvent(); } break; } @@ -1638,7 +1638,7 @@ bool Unmanaged::windowEvent(XEvent* e) emit geometryShapeChanged(this, geometry()); } if (e->type == Xcb::Extensions::self()->damageNotifyEvent()) - damageNotifyEvent(reinterpret_cast< XDamageNotifyEvent* >(e)); + damageNotifyEvent(); break; } } diff --git a/toplevel.h b/toplevel.h index 5211e38195..47a091444b 100644 --- a/toplevel.h +++ b/toplevel.h @@ -353,7 +353,7 @@ protected: void setWindowHandles(Window client, Window frame); void detectShape(Window id); virtual void propertyNotifyEvent(XPropertyEvent* e); - virtual void damageNotifyEvent(XDamageNotifyEvent* e); + virtual void damageNotifyEvent(); xcb_pixmap_t createWindowPixmap(); void discardWindowPixmap(); void addDamageFull();