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

Signal desktopPresenceChanged carries AbstractClient as argument

Browse source
This commit is contained in:
Martin Gräßlin 2015-03-13 11:48:08 +01:00
parent e672a53721
commit 1bfba1765c
7 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
abstract_client.h
View file

@ -247,6 +247,7 @@ Q_SIGNALS:
* Emitted whenever the demands attention state changes. * Emitted whenever the demands attention state changes.
**/ **/
void demandsAttentionChanged(); void demandsAttentionChanged();
void desktopPresenceChanged(KWin::AbstractClient*, int); // to be forwarded by Workspace
protected: protected:
AbstractClient(); AbstractClient();

1
client.h
View file

@ -636,7 +636,6 @@ Q_SIGNALS:
void clientFinishUserMovedResized(KWin::Client*); void clientFinishUserMovedResized(KWin::Client*);
void captionChanged(); void captionChanged();
void desktopChanged(); void desktopChanged();
void desktopPresenceChanged(KWin::Client*, int); // to be forwarded by Workspace
void fullScreenChanged(); void fullScreenChanged();
void transientChanged(); void transientChanged();
void modalChanged(); void modalChanged();

2
effects.cpp
View file

@ -231,7 +231,7 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene)
} }
); );
connect(ws, &Workspace::desktopPresenceChanged, this, connect(ws, &Workspace::desktopPresenceChanged, this,
[this](Client *c, int old) { [this](AbstractClient *c, int old) {
if (!c->effectWindow()) { if (!c->effectWindow()) {
return; return;
} }

2
scripting/workspace_wrapper.cpp
View file

@ -38,7 +38,7 @@ WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent)
{ {
KWin::Workspace *ws = KWin::Workspace::self(); KWin::Workspace *ws = KWin::Workspace::self();
KWin::VirtualDesktopManager *vds = KWin::VirtualDesktopManager::self(); KWin::VirtualDesktopManager *vds = KWin::VirtualDesktopManager::self();
connect(ws, SIGNAL(desktopPresenceChanged(KWin::Client*,int)), SIGNAL(desktopPresenceChanged(KWin::Client*,int))); connect(ws, &Workspace::desktopPresenceChanged, this, &WorkspaceWrapper::desktopPresenceChanged);
connect(ws, &Workspace::currentDesktopChanged, this, &WorkspaceWrapper::currentDesktopChanged); connect(ws, &Workspace::currentDesktopChanged, this, &WorkspaceWrapper::currentDesktopChanged);
connect(ws, SIGNAL(clientAdded(KWin::Client*)), SIGNAL(clientAdded(KWin::Client*))); connect(ws, SIGNAL(clientAdded(KWin::Client*)), SIGNAL(clientAdded(KWin::Client*)));
connect(ws, SIGNAL(clientAdded(KWin::Client*)), SLOT(setupClientConnections(KWin::Client*))); connect(ws, SIGNAL(clientAdded(KWin::Client*)), SLOT(setupClientConnections(KWin::Client*)));

2
scripting/workspace_wrapper.h
View file

@ -88,7 +88,7 @@ private:
Q_DISABLE_COPY(WorkspaceWrapper) Q_DISABLE_COPY(WorkspaceWrapper)
Q_SIGNALS: Q_SIGNALS:
void desktopPresenceChanged(KWin::Client *client, int desktop); void desktopPresenceChanged(KWin::AbstractClient *client, int desktop);
void currentDesktopChanged(int desktop, KWin::AbstractClient *client); void currentDesktopChanged(int desktop, KWin::AbstractClient *client);
void clientAdded(KWin::Client *client); void clientAdded(KWin::Client *client);
void clientRemoved(KWin::Client *client); void clientRemoved(KWin::Client *client);

2
workspace.cpp
View file

@ -464,7 +464,7 @@ Client* Workspace::createClient(xcb_window_t w, bool is_mapped)
connect(c, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), m_compositor, SLOT(checkUnredirect())); connect(c, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), m_compositor, SLOT(checkUnredirect()));
connect(c, SIGNAL(blockingCompositingChanged(KWin::Client*)), m_compositor, SLOT(updateCompositeBlocking(KWin::Client*))); connect(c, SIGNAL(blockingCompositingChanged(KWin::Client*)), m_compositor, SLOT(updateCompositeBlocking(KWin::Client*)));
connect(c, SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)), ScreenEdges::self(), SIGNAL(checkBlocking())); connect(c, SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)), ScreenEdges::self(), SIGNAL(checkBlocking()));
connect(c, SIGNAL(desktopPresenceChanged(KWin::Client*,int)), SIGNAL(desktopPresenceChanged(KWin::Client*,int)), Qt::QueuedConnection); connect(c, &Client::desktopPresenceChanged, this, &Workspace::desktopPresenceChanged, Qt::QueuedConnection);
if (!c->manage(w, is_mapped)) { if (!c->manage(w, is_mapped)) {
Client::deleteClient(c); Client::deleteClient(c);
return NULL; return NULL;

2
workspace.h
View file

@ -441,7 +441,7 @@ Q_SIGNALS:
void workspaceInitialized(); void workspaceInitialized();
//Signals required for the scripting interface //Signals required for the scripting interface
void desktopPresenceChanged(KWin::Client*, int); void desktopPresenceChanged(KWin::AbstractClient*, int);
void currentDesktopChanged(int, KWin::AbstractClient*); void currentDesktopChanged(int, KWin::AbstractClient*);
void clientAdded(KWin::Client*); void clientAdded(KWin::Client*);
void clientRemoved(KWin::Client*); void clientRemoved(KWin::Client*);