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

313 lines
9.6 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 14:31:40 +00: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 16:48:07 +00: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 14:31:40 +00: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 11:38:03 +00:00
#include "workspace_wrapper.h"
Clean-up Scripting Wrapper for Workspace No need to manually convert everything to script values.
2012-01-21 09:04:47 +00:00
#include "../client.h"
Scripting binding to show/hide an outline REVIEW: 104540
2012-04-10 18:56:13 +00:00
#include "../outline.h"
Split out screen handling from Workspace into own class Screens Following the approaches of other split out functionality Screens is a singleton class created by Workspace. The class takes over the responsibility for: * screenChanged signal delayed by timer * number of screens * geometry of given screen * active screen * config option for active screen follows mouse The class contains a small abstraction layer and has a concrete subclass wrapping around QDesktopWidget, but the idea is to go more low level and interact with XRandR directly to get more detailed information. All over KWin the usage from QDesktopWidget is ported over to the new Screens class. REVIEW: 109839
2013-04-03 10:19:27 +00:00
#include "../screens.h"
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
#include "../virtualdesktops.h"
Cleanup and reorder includes in client.h Removing the workspace include required to include it in many other places.
2013-04-26 09:52:15 +00:00
#include "../workspace.h"
Split out Activities related code from Workspace All activities related code moves into new singleton class Activities. This class gets only included into the build if the build option is enabled which means there are less ifdefs all over the code and it also handles better the moc doesn't like ifdef case. The class holds the list of open and all activites, the current and the previous activity and the KActivities::Controller. It also emits the signals for any activities related changes. Workspace still contains some activities related code. That is the adjustment on change of current activity. Nevertheless the code looks much cleaner now and does not contain the confusing naming conflict with takeActivity() which existed before. In all the places where Activities got used the code got adjusted and quite often the ifdef got added with a fallback for the disabled case.
2013-04-04 14:14:12 +00:00
#ifdef KWIN_BUILD_ACTIVITIES
#include "../activities.h"
#endif
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 14:31:40 +00:00
Strip module path from all Qt #include <> Done with: fixqt4headers.pl --strip-modules REVIEW: 109176
2013-02-26 08:00:51 +00:00
#include <QDesktopWidget>
Remove kapplication.h include from sm.h Not needed in sm.h and pollutes the includes of most header files.
2013-08-06 08:27:49 +00:00
#include <QApplication>
Add signal to Scripting when number of screens changes
2012-03-27 17:43:04 +00: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 11:38:03 +00:00
namespace KWin {
WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent)
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00: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 16:48:07 +00:00
KWin::Workspace *ws = KWin::Workspace::self();
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
KWin::VirtualDesktopManager *vds = KWin::VirtualDesktopManager::self();
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 16:48:07 +00:00
connect(ws, SIGNAL(desktopPresenceChanged(KWin::Client*,int)), SIGNAL(desktopPresenceChanged(KWin::Client*,int)));
add desktopChanged signal to effects that carries the optionally changing widget CCBUG: 213847 FIXED-IN: 4.9
2012-05-02 19:16:16 +00:00
connect(ws, SIGNAL(currentDesktopChanged(int,KWin::Client*)), SIGNAL(currentDesktopChanged(int,KWin::Client*)));
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 16:48:07 +00:00
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*)));
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
connect(vds, SIGNAL(countChanged(uint,uint)), SIGNAL(numberDesktopsChanged(uint)));
Adding NOTIFY signals to desktopGrid(Size/Width/Height) Since the introduction of VirtualDesktopManager we do have a signal emitted when the desktop layout changes which we can use as NOTIFY for the desktopGrid properties. REVIEW: 108953
2013-02-14 08:36:00 +00:00
connect(vds, SIGNAL(layoutChanged(int,int)), SIGNAL(desktopLayoutChanged()));
Demands Attention support for KWin Scripting Client has a property for demands attention and Workspace is emitting a signal whenever the demands attention state of any Client changes. REVIEW: 104204
2012-03-09 09:17:19 +00:00
connect(ws, SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)), SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)));
Split out Activities related code from Workspace All activities related code moves into new singleton class Activities. This class gets only included into the build if the build option is enabled which means there are less ifdefs all over the code and it also handles better the moc doesn't like ifdef case. The class holds the list of open and all activites, the current and the previous activity and the KActivities::Controller. It also emits the signals for any activities related changes. Workspace still contains some activities related code. That is the adjustment on change of current activity. Nevertheless the code looks much cleaner now and does not contain the confusing naming conflict with takeActivity() which existed before. In all the places where Activities got used the code got adjusted and quite often the ifdef got added with a fallback for the disabled case.
2013-04-04 14:14:12 +00:00
#ifdef KWIN_BUILD_ACTIVITIES
KWin::Activities *activities = KWin::Activities::self();
connect(activities, SIGNAL(currentChanged(QString)), SIGNAL(currentActivityChanged(QString)));
connect(activities, SIGNAL(added(QString)), SIGNAL(activitiesChanged(QString)));
connect(activities, SIGNAL(added(QString)), SIGNAL(activityAdded(QString)));
connect(activities, SIGNAL(removed(QString)), SIGNAL(activitiesChanged(QString)));
connect(activities, SIGNAL(removed(QString)), SIGNAL(activityRemoved(QString)));
#endif
[kwin] Introduce Screens::size and Screens::geometry Screens provides a size which is constructed from the size of the bounding geometry of all screens and provides an overload taking an int to return the size of a specified screen. For geometry() a new ovload is added without an argument, which is just a convenient wrapper for QRect(QPoint(0, 0), size()). Both new methods are exported to effects and scripting as new properties there called virtualScreenSize and virtualScreenGeometry. The (virtual) size gets cached in screens and is updated whenever the count or geometry changes. Construction of Screens is slightly changed by moving the init code from ctor into a virtual method init(). Reason is that we ended in a loop with accessing the singleton pointer before it was set. REVIEW: 116114
2014-02-27 08:55:45 +00:00
connect(screens(), &Screens::sizeChanged, this, &WorkspaceWrapper::virtualScreenSizeChanged);
connect(screens(), &Screens::geometryChanged, this, &WorkspaceWrapper::virtualScreenGeometryChanged);
Add signal to Scripting when number of screens changes
2012-03-27 17:43:04 +00:00
connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), SIGNAL(numberScreensChanged(int)));
Wrap QDesktopWidget::resized() signal in KWin scripting Requested by mgottschlag.
2012-04-09 21:01:04 +00:00
connect(QApplication::desktop(), SIGNAL(resized(int)), SIGNAL(screenResized(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 16:48:07 +00: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 09:51:22 +00: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 14:31:40 +00:00
}
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00: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 14:31:40 +00:00
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
int WorkspaceWrapper::currentDesktop() const
{
return VirtualDesktopManager::self()->current();
}
int WorkspaceWrapper::numberOfDesktops() const
{
return VirtualDesktopManager::self()->count();
Add property for number of desktops to scripting Adding macros to define the wraping code.
2012-01-26 07:22:54 +00:00
}
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
void WorkspaceWrapper::setCurrentDesktop(int desktop)
{
VirtualDesktopManager::self()->setCurrent(desktop);
}
Add property for number of desktops to scripting Adding macros to define the wraping code.
2012-01-26 07:22:54 +00:00
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
void WorkspaceWrapper::setNumberOfDesktops(int count)
{
VirtualDesktopManager::self()->setCount(count);
}
Add property for number of desktops to scripting Adding macros to define the wraping code.
2012-01-26 07:22:54 +00:00
Remove repetitive code in WorkspaceWrapper
2012-01-26 07:33:21 +00:00
#define GETTER( rettype, getterName ) \
rettype WorkspaceWrapper::getterName( ) const { \
return Workspace::self()->getterName(); \
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00:00
}
Remove repetitive code in WorkspaceWrapper
2012-01-26 07:33:21 +00:00
GETTER(KWin::Client*, activeClient)
GETTER(QList< KWin::Client* >, clientList)
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 14:31:40 +00:00
Remove repetitive code in WorkspaceWrapper
2012-01-26 07:33:21 +00: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 14:31:40 +00:00
Split out Activities related code from Workspace All activities related code moves into new singleton class Activities. This class gets only included into the build if the build option is enabled which means there are less ifdefs all over the code and it also handles better the moc doesn't like ifdef case. The class holds the list of open and all activites, the current and the previous activity and the KActivities::Controller. It also emits the signals for any activities related changes. Workspace still contains some activities related code. That is the adjustment on change of current activity. Nevertheless the code looks much cleaner now and does not contain the confusing naming conflict with takeActivity() which existed before. In all the places where Activities got used the code got adjusted and quite often the ifdef got added with a fallback for the disabled case.
2013-04-04 14:14:12 +00:00
QString WorkspaceWrapper::currentActivity() const
{
#ifdef KWIN_BUILD_ACTIVITIES
return Activities::self()->current();
#else
return QString();
#endif
}
QStringList WorkspaceWrapper::activityList() const
{
#ifdef KWIN_BUILD_ACTIVITIES
return Activities::self()->all();
#else
return QStringList();
#endif
}
normalize signal/slot
2013-05-11 12:09:15 +00:00
#define SLOTWRAPPER(name) \
Export useraction slots to scripting All slots not requiring to be triggered from a QAction are exported. This means that switchToDesktop is not exported but also not required, as we have this through the properties. Needs documentation...
2012-01-27 06:35:40 +00:00
void WorkspaceWrapper::name( ) { \
Workspace::self()->name(); \
}
SLOTWRAPPER(slotSwitchToNextScreen)
SLOTWRAPPER(slotWindowToNextScreen)
SLOTWRAPPER(slotToggleShowDesktop)
SLOTWRAPPER(slotWindowMaximize)
SLOTWRAPPER(slotWindowMaximizeVertical)
SLOTWRAPPER(slotWindowMaximizeHorizontal)
SLOTWRAPPER(slotWindowMinimize)
SLOTWRAPPER(slotWindowShade)
SLOTWRAPPER(slotWindowRaise)
SLOTWRAPPER(slotWindowLower)
SLOTWRAPPER(slotWindowRaiseOrLower)
SLOTWRAPPER(slotActivateAttentionWindow)
SLOTWRAPPER(slotWindowPackLeft)
SLOTWRAPPER(slotWindowPackRight)
SLOTWRAPPER(slotWindowPackUp)
SLOTWRAPPER(slotWindowPackDown)
SLOTWRAPPER(slotWindowGrowHorizontal)
SLOTWRAPPER(slotWindowGrowVertical)
SLOTWRAPPER(slotWindowShrinkHorizontal)
SLOTWRAPPER(slotWindowShrinkVertical)
SLOTWRAPPER(slotWindowQuickTileLeft)
SLOTWRAPPER(slotWindowQuickTileRight)
SLOTWRAPPER(slotWindowQuickTileTopLeft)
SLOTWRAPPER(slotWindowQuickTileTopRight)
SLOTWRAPPER(slotWindowQuickTileBottomLeft)
SLOTWRAPPER(slotWindowQuickTileBottomRight)
SLOTWRAPPER(slotSwitchWindowUp)
SLOTWRAPPER(slotSwitchWindowDown)
SLOTWRAPPER(slotSwitchWindowRight)
SLOTWRAPPER(slotSwitchWindowLeft)
SLOTWRAPPER(slotIncreaseWindowOpacity)
SLOTWRAPPER(slotLowerWindowOpacity)
SLOTWRAPPER(slotWindowOperations)
SLOTWRAPPER(slotWindowClose)
SLOTWRAPPER(slotWindowMove)
SLOTWRAPPER(slotWindowResize)
SLOTWRAPPER(slotWindowAbove)
SLOTWRAPPER(slotWindowBelow)
SLOTWRAPPER(slotWindowOnAllDesktops)
SLOTWRAPPER(slotWindowFullScreen)
SLOTWRAPPER(slotWindowNoBorder)
SLOTWRAPPER(slotWindowToNextDesktop)
SLOTWRAPPER(slotWindowToPreviousDesktop)
SLOTWRAPPER(slotWindowToDesktopRight)
SLOTWRAPPER(slotWindowToDesktopLeft)
SLOTWRAPPER(slotWindowToDesktopUp)
SLOTWRAPPER(slotWindowToDesktopDown)
#undef SLOTWRAPPER
normalize signal/slot
2013-05-11 12:09:15 +00:00
#define SLOTWRAPPER(name,direction) \
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
void WorkspaceWrapper::name( ) { \
VirtualDesktopManager::self()->moveTo<direction>(options->isRollOverDesktops()); \
}
normalize signal/slot
2013-05-11 12:09:15 +00:00
SLOTWRAPPER(slotSwitchDesktopNext,DesktopNext)
SLOTWRAPPER(slotSwitchDesktopPrevious,DesktopPrevious)
SLOTWRAPPER(slotSwitchDesktopRight,DesktopRight)
SLOTWRAPPER(slotSwitchDesktopLeft,DesktopLeft)
SLOTWRAPPER(slotSwitchDesktopUp,DesktopAbove)
SLOTWRAPPER(slotSwitchDesktopDown,DesktopBelow)
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
#undef SLOTWRAPPER
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 11:38:03 +00:00
void WorkspaceWrapper::setActiveClient(KWin::Client* client)
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00: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 16:48:07 +00:00
KWin::Workspace::self()->activateClient(client);
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00: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 14:31:40 +00: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 11:38:03 +00:00
QSize WorkspaceWrapper::workspaceSize() const
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00: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 16:48:07 +00:00
return QSize(workspaceWidth(), workspaceHeight());
KWin uses kdelibs coding style.
2011-01-30 14:34:42 +00: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 14:31:40 +00:00
Export displayWidth/height/size as properties of workspace
2012-01-26 15:53:07 +00:00
QSize WorkspaceWrapper::displaySize() const
{
return QSize(KWin::displayWidth(), KWin::displayHeight());
}
int WorkspaceWrapper::displayWidth() const
{
return KWin::displayWidth();
}
int WorkspaceWrapper::displayHeight() const
{
Return displayHeight for property displayHeight and not displayWidth Typo in the scripting bindings. BUG: 306225 FIXED-IN: 4.9.2
2012-09-04 04:26:39 +00:00
return KWin::displayHeight();
Export displayWidth/height/size as properties of workspace
2012-01-26 15:53:07 +00:00
}
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-26 21:56:24 +00: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);
}
Export Desktop Name to scripts
2012-02-19 15:45:44 +00:00
QString WorkspaceWrapper::desktopName(int desktop) const
{
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
return VirtualDesktopManager::self()->name(desktop);
Export Desktop Name to scripts
2012-02-19 15:45:44 +00:00
}
Query KWin for available debug output This adds extensive support information about the running instance by printing out all used options, the compositing information including GL platform, loaded effects and active effects. The debug output can be retrieved through D-Bus: qdbus org.kde.kwin /KWin supportInformation or through a KWin Script (use desktop console): print(workspace.supportInformation()) REVIEW: 104142
2012-03-04 14:13:22 +00:00
QString WorkspaceWrapper::supportInformation() const
{
return Workspace::self()->supportInformation();
}
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 11:38:03 +00: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 09:51:22 +00: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 11:38:03 +00:00
Scripting binding to show/hide an outline REVIEW: 104540
2012-04-10 18:56:13 +00:00
void WorkspaceWrapper::showOutline(const QRect &geometry)
{
Make Outline a KWIN_SINGLETON Given that Outline is now a QObject hold by Workspace, but not used in Workspace, it can also be a KWIN_SINGLETON. REVIEW: 110146
2013-04-25 06:14:34 +00:00
outline()->show(geometry);
Scripting binding to show/hide an outline REVIEW: 104540
2012-04-10 18:56:13 +00:00
}
void WorkspaceWrapper::showOutline(int x, int y, int width, int height)
{
Make Outline a KWIN_SINGLETON Given that Outline is now a QObject hold by Workspace, but not used in Workspace, it can also be a KWIN_SINGLETON. REVIEW: 110146
2013-04-25 06:14:34 +00:00
outline()->show(QRect(x, y, width, height));
Scripting binding to show/hide an outline REVIEW: 104540
2012-04-10 18:56:13 +00:00
}
void WorkspaceWrapper::hideOutline()
{
Make Outline a KWIN_SINGLETON Given that Outline is now a QObject hold by Workspace, but not used in Workspace, it can also be a KWIN_SINGLETON. REVIEW: 110146
2013-04-25 06:14:34 +00:00
outline()->hide();
Scripting binding to show/hide an outline REVIEW: 104540
2012-04-10 18:56:13 +00:00
}
Export a getClient method to Scripting bindings Finds a Client by windowId. REVIEW: 105323
2012-06-22 07:51:27 +00:00
Client *WorkspaceWrapper::getClient(qulonglong windowId)
{
return Workspace::self()->findClient(WindowMatchPredicate(windowId));
}
Move handling of Virtual Desktops into a VirtualDesktopManager The ownership for virtual desktops is moved from Workspace into a new VirtualDesktopManager. The manager is responsible for providing the count of virtual desktops and keeping track of the currently used virtual desktop. All methods related to moving between desktops are also moved from Workspace to the new manager, though all methods related to Clients on Virtual Desktops remain in Workspace for the time being. This is to have the new manager as independent from KWin core as possible. An rather important change for the handling of virtual desktops is that the count and the id of a desktop is now an unsinged integer instead of an integer. The reason for that is that we cannot have a negative count of desktops as well as it is not possible to be on a desktop with a negative identifier. In that regard it is important to remember that a Client can be on a desktop with a negative identifier. The special value for a Client being on all desktops is handled by using -1 as a desktop. For the time being this is not adjusted but instead of comparing the virtual desktop ids one should prefer to use the convenient methods like isOnDesktop and isOnAllDesktops. This would allow in future to internally change the representation for on all desktops.
2012-11-16 07:23:47 +00:00
QSize WorkspaceWrapper::desktopGridSize() const
{
return VirtualDesktopManager::self()->grid().size();
}
int WorkspaceWrapper::desktopGridWidth() const
{
return desktopGridSize().width();
}
int WorkspaceWrapper::desktopGridHeight() const
{
return desktopGridSize().height();
}
int WorkspaceWrapper::workspaceHeight() const
{
return desktopGridHeight() * displayHeight();
}
int WorkspaceWrapper::workspaceWidth() const
{
return desktopGridWidth() * displayWidth();
}
Split out screen handling from Workspace into own class Screens Following the approaches of other split out functionality Screens is a singleton class created by Workspace. The class takes over the responsibility for: * screenChanged signal delayed by timer * number of screens * geometry of given screen * active screen * config option for active screen follows mouse The class contains a small abstraction layer and has a concrete subclass wrapping around QDesktopWidget, but the idea is to go more low level and interact with XRandR directly to get more detailed information. All over KWin the usage from QDesktopWidget is ported over to the new Screens class. REVIEW: 109839
2013-04-03 10:19:27 +00:00
int WorkspaceWrapper::numScreens() const
{
return screens()->count();
}
int WorkspaceWrapper::activeScreen() const
{
return screens()->current();
}
[kwin] Introduce Screens::size and Screens::geometry Screens provides a size which is constructed from the size of the bounding geometry of all screens and provides an overload taking an int to return the size of a specified screen. For geometry() a new ovload is added without an argument, which is just a convenient wrapper for QRect(QPoint(0, 0), size()). Both new methods are exported to effects and scripting as new properties there called virtualScreenSize and virtualScreenGeometry. The (virtual) size gets cached in screens and is updated whenever the count or geometry changes. Construction of Screens is slightly changed by moving the init code from ctor into a virtual method init(). Reason is that we ended in a loop with accessing the singleton pointer before it was set. REVIEW: 116114
2014-02-27 08:55:45 +00:00
QRect WorkspaceWrapper::virtualScreenGeometry() const
{
return screens()->geometry();
}
QSize WorkspaceWrapper::virtualScreenSize() const
{
return screens()->size();
}
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 11:38:03 +00:00
} // KWin
Reference in a new issue Copy permalink