Instead of the somewhat fragile way of trying to clean up Client/Unmanaged
instances and keeping them around after the window is closed, create class Deleted as a representation of a closed window. (Why do I always forget 'svn add'?) svn path=/branches/work/kwin_composite/; revision=626357
This commit is contained in:
parent
77f803a563
commit
e8147c2244
2 changed files with 116 additions and 0 deletions
69
deleted.cpp
Normal file
69
deleted.cpp
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
/*****************************************************************
|
||||||
|
KWin - the KDE window manager
|
||||||
|
This file is part of the KDE project.
|
||||||
|
|
||||||
|
Copyright (C) 2006 Lubos Lunak <l.lunak@kde.org>
|
||||||
|
|
||||||
|
You can Freely distribute this program under the GNU General Public
|
||||||
|
License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
******************************************************************/
|
||||||
|
|
||||||
|
#include "deleted.h"
|
||||||
|
|
||||||
|
#include "workspace.h"
|
||||||
|
|
||||||
|
namespace KWinInternal
|
||||||
|
{
|
||||||
|
|
||||||
|
Deleted::Deleted( Workspace* ws )
|
||||||
|
: Toplevel( ws )
|
||||||
|
, delete_refcount( 1 )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Deleted::~Deleted()
|
||||||
|
{
|
||||||
|
assert( delete_refcount == 0 );
|
||||||
|
workspace()->removeDeleted( this, Allowed );
|
||||||
|
}
|
||||||
|
|
||||||
|
Deleted* Deleted::create( Toplevel* c )
|
||||||
|
{
|
||||||
|
Deleted* d = new Deleted( c->workspace());
|
||||||
|
d->copyToDeleted( c );
|
||||||
|
d->workspace()->addDeleted( d, Allowed );
|
||||||
|
return d;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Deleted::copyToDeleted( Toplevel* c )
|
||||||
|
{
|
||||||
|
assert( dynamic_cast< Deleted* >( c ) == NULL );
|
||||||
|
Toplevel::copyToDeleted( c );
|
||||||
|
window_opacity = c->opacity();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Deleted::unrefWindow()
|
||||||
|
{
|
||||||
|
if( --delete_refcount > 0 )
|
||||||
|
return;
|
||||||
|
deleteLater();
|
||||||
|
}
|
||||||
|
|
||||||
|
NET::WindowType Deleted::windowType( bool direct, int supported_types ) const
|
||||||
|
{
|
||||||
|
return NET::Normal; // TODO
|
||||||
|
}
|
||||||
|
|
||||||
|
double Deleted::opacity() const
|
||||||
|
{
|
||||||
|
return window_opacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Deleted::debug( kdbgstream& stream ) const
|
||||||
|
{
|
||||||
|
stream << "\'ID:" << handle() << "\' (deleted)";
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
#include "deleted.moc"
|
47
deleted.h
Normal file
47
deleted.h
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
/*****************************************************************
|
||||||
|
KWin - the KDE window manager
|
||||||
|
This file is part of the KDE project.
|
||||||
|
|
||||||
|
Copyright (C) 2006 Lubos Lunak <l.lunak@kde.org>
|
||||||
|
|
||||||
|
You can Freely distribute this program under the GNU General Public
|
||||||
|
License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
******************************************************************/
|
||||||
|
|
||||||
|
#ifndef KWIN_DELETED_H
|
||||||
|
#define KWIN_DELETED_H
|
||||||
|
|
||||||
|
#include "toplevel.h"
|
||||||
|
|
||||||
|
namespace KWinInternal
|
||||||
|
{
|
||||||
|
|
||||||
|
class Deleted
|
||||||
|
: public Toplevel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
static Deleted* create( Toplevel* c );
|
||||||
|
virtual double opacity() const;
|
||||||
|
// used by effects to keep the window around for e.g. fadeout effects when it's destroyed
|
||||||
|
void refWindow();
|
||||||
|
void unrefWindow();
|
||||||
|
virtual NET::WindowType windowType( bool direct = false, int supported_types = SUPPORTED_WINDOW_TYPES_MASK ) const;
|
||||||
|
protected:
|
||||||
|
virtual void debug( kdbgstream& stream ) const;
|
||||||
|
private:
|
||||||
|
Deleted( Workspace *ws ); // use create()
|
||||||
|
void copyToDeleted( Toplevel* c );
|
||||||
|
virtual ~Deleted(); // deleted only using unrefWindow()
|
||||||
|
int delete_refcount;
|
||||||
|
double window_opacity;
|
||||||
|
};
|
||||||
|
|
||||||
|
inline void Deleted::refWindow()
|
||||||
|
{
|
||||||
|
++delete_refcount;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in a new issue