yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove XDamageNotifyEvent* argument from Toplevel::damageNotifyEvent

Browse source 
It's not used...

REVIEW: 110201
This commit is contained in:
Martin Gräßlin 2013-04-26 11:00:08 +02:00
parent 89c2fd5598
commit eb6ce2b7c4
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -691,7 +691,7 @@ private:
void leaveNotifyEvent(XCrossingEvent* e); void leaveNotifyEvent(XCrossingEvent* e);
void focusInEvent(XFocusInEvent* e); void focusInEvent(XFocusInEvent* e);
void focusOutEvent(XFocusOutEvent* 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 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); bool buttonReleaseEvent(Window w, int button, int state, int x, int y, int x_root, int y_root);

8
composite.cpp
View file

@ -865,10 +865,8 @@ xcb_pixmap_t Toplevel::createWindowPixmap()
return pix; return pix;
} }
void Toplevel::damageNotifyEvent(XDamageNotifyEvent* e) void Toplevel::damageNotifyEvent()
{ {
Q_UNUSED(e)
m_isDamaged = true; m_isDamaged = true;
// Note: The rect is supposed to specify the damage extents, // Note: The rect is supposed to specify the damage extents,
@ -882,7 +880,7 @@ bool Toplevel::compositing() const
return Workspace::self()->compositing(); return Workspace::self()->compositing();
} }
void Client::damageNotifyEvent(XDamageNotifyEvent* e) void Client::damageNotifyEvent()
{ {
#ifdef HAVE_XSYNC #ifdef HAVE_XSYNC
if (syncRequest.isPending && isResize()) { if (syncRequest.isPending && isResize()) {
@ -900,7 +898,7 @@ void Client::damageNotifyEvent(XDamageNotifyEvent* e)
setReadyForPainting(); setReadyForPainting();
#endif #endif
Toplevel::damageNotifyEvent(e); Toplevel::damageNotifyEvent();
} }
bool Toplevel::resetAndFetchDamage() bool Toplevel::resetAndFetchDamage()

4
events.cpp
View file

@ -680,7 +680,7 @@ bool Client::windowEvent(XEvent* e)
} }
if (e->xany.window == frameId()) { if (e->xany.window == frameId()) {
if (e->type == Xcb::Extensions::self()->damageNotifyEvent()) if (e->type == Xcb::Extensions::self()->damageNotifyEvent())
damageNotifyEvent(reinterpret_cast< XDamageNotifyEvent* >(e)); damageNotifyEvent();
} }
break; break;
} }
@ -1638,7 +1638,7 @@ bool Unmanaged::windowEvent(XEvent* e)
emit geometryShapeChanged(this, geometry()); emit geometryShapeChanged(this, geometry());
} }
if (e->type == Xcb::Extensions::self()->damageNotifyEvent()) if (e->type == Xcb::Extensions::self()->damageNotifyEvent())
damageNotifyEvent(reinterpret_cast< XDamageNotifyEvent* >(e)); damageNotifyEvent();
break; break;
} }
} }

2
toplevel.h
View file

@ -353,7 +353,7 @@ protected:
void setWindowHandles(Window client, Window frame); void setWindowHandles(Window client, Window frame);
void detectShape(Window id); void detectShape(Window id);
virtual void propertyNotifyEvent(XPropertyEvent* e); virtual void propertyNotifyEvent(XPropertyEvent* e);
virtual void damageNotifyEvent(XDamageNotifyEvent* e); virtual void damageNotifyEvent();
xcb_pixmap_t createWindowPixmap(); xcb_pixmap_t createWindowPixmap();
void discardWindowPixmap(); void discardWindowPixmap();
void addDamageFull(); void addDamageFull();