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

Merge signals clientClosed() and unmanagedClosed() to windowClosed()

Browse source 
This commit merges the two signals clientClosed() and unmanagedClosed() to windowClosed() which
is now provided by Toplevel.
The approriate slots in effects.h and effects.cpp were merges as well, since they did the
same.
The direct method calls of the method windowClosed() in SceneOpenGL and SceneXRender were
removed and are now connected to the appropriate signal in windowAdded().
This commit is contained in:
Arthur Arlt 2011-06-21 13:52:25 +02:00
parent 859dacb8b5
commit 02e08be5bd
9 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client.cpp
View file

@ -246,10 +246,7 @@ void Client::releaseWindow(bool on_shutdown)
assert(!deleting);
deleting = true;
Deleted* del = Deleted::create(this);
emit clientClosed(this);
if (scene) {
scene->windowClosed(this, del);
}
emit windowClosed(this, del);
finishCompositing();
workspace()->discardUsedWindowRules(this, true); // Remove ForceTemporarily rules
StackingUpdatesBlocker blocker(workspace());
@ -314,10 +311,7 @@ void Client::destroyClient()
assert(!deleting);
deleting = true;
Deleted* del = Deleted::create(this);
emit clientClosed(this);
if (scene) {
scene->windowClosed(this, del);
}
emit windowClosed(this, del);
finishCompositing();
workspace()->discardUsedWindowRules(this, true); // Remove ForceTemporarily rules
StackingUpdatesBlocker blocker(workspace());

1
client.h
View file

@ -486,7 +486,6 @@ signals:
void maximizeSet(QPair<bool, bool>);
void s_activated();
void s_fullScreenSet(bool, bool);
void clientClosed(KWin::Client*);
void clientMaximizedStateChanged(KWin::Client*, KDecorationDefines::MaximizeMode);
void clientMinimized(KWin::Client* client, bool animate);
void clientUnminimized(KWin::Client* client, bool animate);

11
effects.cpp
View file

@ -138,7 +138,7 @@ EffectsHandlerImpl::~EffectsHandlerImpl()
void EffectsHandlerImpl::setupClientConnections(Client* c)
{
connect(c, SIGNAL(clientClosed(KWin::Client*)), this, SLOT(slotClientClosed(KWin::Client*)));
connect(c, SIGNAL(windowClosed(KWin::Toplevel*,KWin::Deleted*)), this, SLOT(slotWindowClosed(KWin::Toplevel*)));
connect(c, SIGNAL(clientMaximizedStateChanged(KWin::Client*,KDecorationDefines::MaximizeMode)), this, SLOT(slotClientMaximized(KWin::Client*,KDecorationDefines::MaximizeMode)));
connect(c, SIGNAL(clientStartUserMovedResized(KWin::Client*)), this, SLOT(slotClientStartUserMovedResized(KWin::Client*)));
connect(c, SIGNAL(clientStepUserMovedResized(KWin::Client*,QRect)), this, SLOT(slotClientStepUserMovedResized(KWin::Client*,QRect)));
@ -153,7 +153,7 @@ void EffectsHandlerImpl::setupClientConnections(Client* c)
void EffectsHandlerImpl::setupUnmanagedConnections(Unmanaged* u)
{
connect(u, SIGNAL(unmanagedClosed(KWin::Unmanaged*)), this, SLOT(slotUnmanagedClosed(KWin::Unmanaged*)));
connect(u, SIGNAL(windowClosed(KWin::Toplevel*,KWin::Deleted*)), this, SLOT(slotWindowClosed(KWin::Toplevel*)));
connect(u, SIGNAL(opacityChanged(KWin::Toplevel*,qreal)), this, SLOT(slotOpacityChanged(KWin::Toplevel*,qreal)));
connect(u, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), this, SLOT(slotGeometryShapeChanged(KWin::Toplevel*,QRect)));
connect(u, SIGNAL(damaged(KWin::Toplevel*,QRect)), this, SLOT(slotWindowDamaged(KWin::Toplevel*,QRect)));
@ -380,16 +380,11 @@ void EffectsHandlerImpl::slotDeletedRemoved(KWin::Deleted *d)
elevated_windows.removeAll(d->effectWindow());
}
void EffectsHandlerImpl::slotClientClosed(Client *c)
void EffectsHandlerImpl::slotWindowClosed(KWin::Toplevel *c)
{
emit windowClosed(c->effectWindow());
}
void EffectsHandlerImpl::slotUnmanagedClosed(Unmanaged* u)
{
emit windowClosed(u->effectWindow());
}
void EffectsHandlerImpl::slotClientActivated(KWin::Client *c)
{
emit windowActivated(c ? c->effectWindow() : NULL);

3
effects.h
View file

@ -178,8 +178,7 @@ protected Q_SLOTS:
void slotDesktopChanged(int old);
void slotClientAdded(KWin::Client *c);
void slotUnmanagedAdded(KWin::Unmanaged *u);
void slotClientClosed(KWin::Client *c);
void slotUnmanagedClosed(KWin::Unmanaged *u);
void slotWindowClosed(KWin::Toplevel *c);
void slotClientActivated(KWin::Client *c);
void slotDeletedRemoved(KWin::Deleted *d);
void slotClientMaximized(KWin::Client *c, KDecorationDefines::MaximizeMode maxMode);

1
scene_opengl.cpp
View file

@ -215,6 +215,7 @@ void SceneOpenGL::windowAdded(Toplevel* c)
windows[ c ] = new Window(c);
connect(c, SIGNAL(opacityChanged(KWin::Toplevel*,qreal)), SLOT(windowOpacityChanged(KWin::Toplevel*)));
connect(c, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), SLOT(windowGeometryShapeChanged(KWin::Toplevel*)));
connect(c, SIGNAL(windowClosed(KWin::Toplevel*,KWin::Deleted*)), SLOT(windowClosed(KWin::Toplevel*,KWin::Deleted*)));
c->effectWindow()->setSceneWindow(windows[ c ]);
c->getShadow();
windows[ c ]->updateShadow(c->shadow());

1
scene_xrender.cpp
View file

@ -337,6 +337,7 @@ void SceneXrender::windowAdded(Toplevel* c)
windows[ c ] = new Window(c);
connect(c, SIGNAL(opacityChanged(KWin::Toplevel*,qreal)), SLOT(windowOpacityChanged(KWin::Toplevel*)));
connect(c, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), SLOT(windowGeometryShapeChanged(KWin::Toplevel*)));
connect(c, SIGNAL(windowClosed(KWin::Toplevel*,KWin::Deleted*)), SLOT(windowClosed(KWin::Toplevel*,KWin::Deleted*)));
c->effectWindow()->setSceneWindow(windows[ c ]);
c->getShadow();
windows[ c ]->updateShadow(c->shadow());

1
toplevel.h
View file

@ -163,6 +163,7 @@ signals:
void propertyNotify(KWin::Toplevel* toplevel, long a);
void geometryChanged();
void geometryShapeChanged(KWin::Toplevel* toplevel, const QRect& old);
void windowClosed(KWin::Toplevel* toplevel, KWin::Deleted* deleted);
protected:
virtual ~Toplevel();

5
unmanaged.cpp
View file

@ -82,10 +82,7 @@ bool Unmanaged::track(Window w)
void Unmanaged::release()
{
Deleted* del = Deleted::create(this);
emit unmanagedClosed(this);
if (scene) {
scene->windowClosed(this, del);
}
emit windowClosed(this, del);
finishCompositing();
workspace()->removeUnmanaged(this, Allowed);
if (!QWidget::find(window())) { // don't affect our own windows

2
unmanaged.h
View file

@ -46,8 +46,6 @@ public:
protected:
virtual void debug(QDebug& stream) const;
virtual bool shouldUnredirect() const;
Q_SIGNALS:
void unmanagedClosed(KWin::Unmanaged*);
private:
virtual ~Unmanaged(); // use release()
// handlers for X11 events