vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
kwin/scripting/workspace_wrapper.cpp

119 lines
4.3 KiB
C++
Raw Normal View History

Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
/********************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2010 Rohan Prabhu <rohan@rohanprabhu.com>
Workspace Wrapper uses Q_PROPERTIES The idea is to extend the wrapper to have it wrapping even more functions provided by Workspace. Of course it would be possible to just add the properties to Workspace itself and export this. But I think complete Workspace is just too powerful to fully expose to scripts. So a small wrapper around the parts which are usefull for scripts might make more sense. This breaks now also the API for Workspace and again it is already more powerful with less code than before.
2012-01-21 20:48:07 +04:00
Copyright (C) 2011, 2012 Martin Gräßlin <mgraesslin@kde.org>
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
Rename SWrapper::Workspace to KWin::WorkspaceWrapper Resolves the problem of having two workspace.(h|cpp). The scripting workspace is in fact just a wrapper, so having that clear is a plus.
2012-01-22 15:38:03 +04:00
#include "workspace_wrapper.h"
Clean-up Scripting Wrapper for Workspace No need to manually convert everything to script values.
2012-01-21 13:04:47 +04:00
#include "../client.h"
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
Rename SWrapper::Workspace to KWin::WorkspaceWrapper Resolves the problem of having two workspace.(h|cpp). The scripting workspace is in fact just a wrapper, so having that clear is a plus.
2012-01-22 15:38:03 +04:00
namespace KWin {
WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent)
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
{
Workspace Wrapper uses Q_PROPERTIES The idea is to extend the wrapper to have it wrapping even more functions provided by Workspace. Of course it would be possible to just add the properties to Workspace itself and export this. But I think complete Workspace is just too powerful to fully expose to scripts. So a small wrapper around the parts which are usefull for scripts might make more sense. This breaks now also the API for Workspace and again it is already more powerful with less code than before.
2012-01-21 20:48:07 +04:00
KWin::Workspace *ws = KWin::Workspace::self();
connect(ws, SIGNAL(desktopPresenceChanged(KWin::Client*,int)), SIGNAL(desktopPresenceChanged(KWin::Client*,int)));
connect(ws, SIGNAL(currentDesktopChanged(int)), SIGNAL(currentDesktopChanged(int)));
connect(ws, SIGNAL(clientAdded(KWin::Client*)), SIGNAL(clientAdded(KWin::Client*)));
connect(ws, SIGNAL(clientAdded(KWin::Client*)), SLOT(setupClientConnections(KWin::Client*)));
connect(ws, SIGNAL(clientRemoved(KWin::Client*)), SIGNAL(clientRemoved(KWin::Client*)));
connect(ws, SIGNAL(clientActivated(KWin::Client*)), SIGNAL(clientActivated(KWin::Client*)));
Add property for number of desktops to scripting Adding macros to define the wraping code.
2012-01-26 11:22:54 +04:00
connect(ws, SIGNAL(numberDesktopsChanged(int)), SIGNAL(numberDesktopsChanged(int)));
Workspace Wrapper uses Q_PROPERTIES The idea is to extend the wrapper to have it wrapping even more functions provided by Workspace. Of course it would be possible to just add the properties to Workspace itself and export this. But I think complete Workspace is just too powerful to fully expose to scripts. So a small wrapper around the parts which are usefull for scripts might make more sense. This breaks now also the API for Workspace and again it is already more powerful with less code than before.
2012-01-21 20:48:07 +04:00
foreach (KWin::Client *client, ws->clientList()) {
Drop the WorkspaceProxy in Scripting Unlike stated at several places in the code it is not difficult to setup the connections to all Clients. It would have been nice if the failed attempts to connect the Clients would not have made it into the code as emitted signals which are nowhere used. Not to mention that like in all places the signals to inform that a state changed were emitted before the state changed was performed.
2012-01-21 13:51:22 +04:00
setupClientConnections(client);
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
}
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
}
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
Add property for number of desktops to scripting Adding macros to define the wraping code.
2012-01-26 11:22:54 +04:00
#define GETTERSETTER( rettype, getterName, setterName ) \
rettype WorkspaceWrapper::getterName( ) const { \
return Workspace::self()->getterName(); \
} \
void WorkspaceWrapper::setterName( rettype val ) { \
Workspace::self()->setterName( val ); \
}
GETTERSETTER(int, numberOfDesktops, setNumberOfDesktops)
Remove repetitive code in WorkspaceWrapper
2012-01-26 11:33:21 +04:00
GETTERSETTER(int, currentDesktop, setCurrentDesktop)
Add property for number of desktops to scripting Adding macros to define the wraping code.
2012-01-26 11:22:54 +04:00
#undef GETTERSETTER
Remove repetitive code in WorkspaceWrapper
2012-01-26 11:33:21 +04:00
#define GETTER( rettype, getterName ) \
rettype WorkspaceWrapper::getterName( ) const { \
return Workspace::self()->getterName(); \
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
}
Remove repetitive code in WorkspaceWrapper
2012-01-26 11:33:21 +04:00
GETTER(KWin::Client*, activeClient)
GETTER(QList< KWin::Client* >, clientList)
GETTER(int, workspaceWidth)
GETTER(int, workspaceHeight)
GETTER(QSize, desktopGridSize)
GETTER(int, desktopGridWidth)
GETTER(int, desktopGridHeight)
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
Remove repetitive code in WorkspaceWrapper
2012-01-26 11:33:21 +04:00
#undef GETTER
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
Rename SWrapper::Workspace to KWin::WorkspaceWrapper Resolves the problem of having two workspace.(h|cpp). The scripting workspace is in fact just a wrapper, so having that clear is a plus.
2012-01-22 15:38:03 +04:00
void WorkspaceWrapper::setActiveClient(KWin::Client* client)
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
{
Workspace Wrapper uses Q_PROPERTIES The idea is to extend the wrapper to have it wrapping even more functions provided by Workspace. Of course it would be possible to just add the properties to Workspace itself and export this. But I think complete Workspace is just too powerful to fully expose to scripts. So a small wrapper around the parts which are usefull for scripts might make more sense. This breaks now also the API for Workspace and again it is already more powerful with less code than before.
2012-01-21 20:48:07 +04:00
KWin::Workspace::self()->activateClient(client);
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
}
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
Rename SWrapper::Workspace to KWin::WorkspaceWrapper Resolves the problem of having two workspace.(h|cpp). The scripting workspace is in fact just a wrapper, so having that clear is a plus.
2012-01-22 15:38:03 +04:00
QSize WorkspaceWrapper::workspaceSize() const
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
{
Workspace Wrapper uses Q_PROPERTIES The idea is to extend the wrapper to have it wrapping even more functions provided by Workspace. Of course it would be possible to just add the properties to Workspace itself and export this. But I think complete Workspace is just too powerful to fully expose to scripts. So a small wrapper around the parts which are usefull for scripts might make more sense. This breaks now also the API for Workspace and again it is already more powerful with less code than before.
2012-01-21 20:48:07 +04:00
return QSize(workspaceWidth(), workspaceHeight());
KWin uses kdelibs coding style.
2011-01-30 17:34:42 +03:00
}
Trembles the weave as the clock ticks, attain another microstate. Every disorder causes every duration, which ensures the one that stays. reality is relative. natural is disorder. [R]obinhood[P]andey Merging scripting from ^/branches/work/kwin_scripting TO ^/trunk svn path=/trunk/KDE/kdebase/workspace/; revision=1177865
2010-09-21 18:31:40 +04:00
Export displayWidth/height/size as properties of workspace
2012-01-26 19:53:07 +04:00
QSize WorkspaceWrapper::displaySize() const
{
return QSize(KWin::displayWidth(), KWin::displayHeight());
}
int WorkspaceWrapper::displayWidth() const
{
return KWin::displayWidth();
}
int WorkspaceWrapper::displayHeight() const
{
return KWin::displayWidth();
}
Export clientArea methods to scripting For this a new MetaObject "KWin" is exported to have the enum ClientAreaOption available in scripts. Unfortunately this requires duplicating the enum from kwinglobals.h.
2012-01-27 01:56:24 +04:00
QRect WorkspaceWrapper::clientArea(ClientAreaOption option, const QPoint &p, int desktop) const
{
return Workspace::self()->clientArea(static_cast<clientAreaOption>(option), p, desktop);
}
QRect WorkspaceWrapper::clientArea(ClientAreaOption option, const KWin::Client *c) const
{
return Workspace::self()->clientArea(static_cast<clientAreaOption>(option), c);
}
QRect WorkspaceWrapper::clientArea(ClientAreaOption option, int screen, int desktop) const
{
return Workspace::self()->clientArea(static_cast<clientAreaOption>(option), screen, desktop);
}
Rename SWrapper::Workspace to KWin::WorkspaceWrapper Resolves the problem of having two workspace.(h|cpp). The scripting workspace is in fact just a wrapper, so having that clear is a plus.
2012-01-22 15:38:03 +04:00
void WorkspaceWrapper::setupClientConnections(KWin::Client *client)
Drop the WorkspaceProxy in Scripting Unlike stated at several places in the code it is not difficult to setup the connections to all Clients. It would have been nice if the failed attempts to connect the Clients would not have made it into the code as emitted signals which are nowhere used. Not to mention that like in all places the signals to inform that a state changed were emitted before the state changed was performed.
2012-01-21 13:51:22 +04:00
{
connect(client, SIGNAL(clientMinimized(KWin::Client*,bool)), SIGNAL(clientMinimized(KWin::Client*)));
connect(client, SIGNAL(clientUnminimized(KWin::Client*,bool)), SIGNAL(clientUnminimized(KWin::Client*)));
connect(client, SIGNAL(clientManaging(KWin::Client*)), SIGNAL(clientManaging(KWin::Client*)));
connect(client, SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)), SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)));
connect(client, SIGNAL(clientMaximizedStateChanged(KWin::Client*,bool,bool)), SIGNAL(clientMaximizeSet(KWin::Client*,bool,bool)));
}
Rename SWrapper::Workspace to KWin::WorkspaceWrapper Resolves the problem of having two workspace.(h|cpp). The scripting workspace is in fact just a wrapper, so having that clear is a plus.
2012-01-22 15:38:03 +04:00
} // KWin