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

Complete port to Kephal.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=884554
This commit is contained in:
Lucas Murray 2008-11-15 11:38:26 +00:00
parent f780e8b68b
commit c84d39b5df
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
options.cpp
View file

@ -35,6 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "client.h" #include "client.h"
#include "compositingprefs.h" #include "compositingprefs.h"
#include <kephal/screens.h>
#endif #endif
namespace KWin namespace KWin
@ -101,7 +103,7 @@ unsigned long Options::updateSettings()
placement = Placement::policyFromString( config.readEntry("Placement"), true ); placement = Placement::policyFromString( config.readEntry("Placement"), true );
xineramaPlacementScreen = qBound( -1, config.readEntry( "XineramaPlacementScreen", -1 ), xineramaPlacementScreen = qBound( -1, config.readEntry( "XineramaPlacementScreen", -1 ),
qApp->desktop()->numScreens() - 1 ); Kephal::ScreenUtils::numScreens() - 1 );
if( focusPolicy == ClickToFocus ) if( focusPolicy == ClickToFocus )
{ {

12
scene.cpp
View file

@ -77,7 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "deleted.h" #include "deleted.h"
#include "effects.h" #include "effects.h"
#include <qdesktopwidget.h> #include <kephal/screens.h>
namespace KWin namespace KWin
{ {
@ -323,13 +323,15 @@ void Scene::finalDrawWindow( EffectWindowImpl* w, int mask, QRegion region, Wind
QList< QPoint > Scene::selfCheckPoints() const QList< QPoint > Scene::selfCheckPoints() const
{ {
QList< QPoint > ret; QList< QPoint > ret;
// Use QDesktopWidget directly, we're interested in "real" screens, not depending on our config. // Use Kephal directly, we're interested in "real" screens, not depending on our config.
// TODO: Does Kephal allow fake screens as well? We cannot use QDesktopWidget as it will cause a crash if
// the number of screens is different to what Kephal returns.
for( int screen = 0; for( int screen = 0;
screen < qApp->desktop()->numScreens(); screen < Kephal::ScreenUtils::numScreens();
++screen ) ++screen )
{ // test top-left and bottom-right of every screen { // test top-left and bottom-right of every screen
ret.append( qApp->desktop()->screenGeometry( screen ).topLeft()); ret.append( Kephal::ScreenUtils::screenGeometry( screen ).topLeft());
ret.append( qApp->desktop()->screenGeometry( screen ).bottomRight() + QPoint( -5 + 1, -1 + 1 ) ret.append( Kephal::ScreenUtils::screenGeometry( screen ).bottomRight() + QPoint( -5 + 1, -1 + 1 )
+ QPoint( -1, 0 )); // intentionally moved one up, since the source windows will be one down + QPoint( -1, 0 )); // intentionally moved one up, since the source windows will be one down
} }
return ret; return ret;