namespace KWinInternal -> KWin - shorter typing of names in gdb, yay
svn path=/branches/work/kwin_composite/; revision=650770icc-effect-5.14.5
parent
4793790b1b
commit
e3b865cd5f
|
@ -100,7 +100,7 @@ if(HAVE_OPENGL)
|
||||||
)
|
)
|
||||||
endif(HAVE_OPENGL)
|
endif(HAVE_OPENGL)
|
||||||
|
|
||||||
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWinInternal::Workspace )
|
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace )
|
||||||
|
|
||||||
kde4_automoc(kwin ${kwin_KDEINIT_SRCS})
|
kde4_automoc(kwin ${kwin_KDEINIT_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,10 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "atoms.h"
|
#include "atoms.h"
|
||||||
#include "group.h"
|
#include "group.h"
|
||||||
#include "rules.h"
|
#include "rules.h"
|
||||||
|
#include "effects.h"
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -245,6 +246,8 @@ void Workspace::setActiveClient( Client* c, allowed_t )
|
||||||
|
|
||||||
rootInfo->setActiveWindow( active_client? active_client->window() : 0 );
|
rootInfo->setActiveWindow( active_client? active_client->window() : 0 );
|
||||||
updateColormap();
|
updateColormap();
|
||||||
|
if( effects )
|
||||||
|
effects->windowActivated( active_client ? active_client->effectWindow() : NULL );
|
||||||
--set_active_client_recursion;
|
--set_active_client_recursion;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -263,7 +266,6 @@ void Workspace::activateClient( Client* c, bool force )
|
||||||
{
|
{
|
||||||
if( c == NULL )
|
if( c == NULL )
|
||||||
{
|
{
|
||||||
focusToNull();
|
|
||||||
setActiveClient( NULL, Allowed );
|
setActiveClient( NULL, Allowed );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -698,7 +700,7 @@ void Client::demandAttentionKNotify()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO I probably shouldn't be lazy here and do it without the macro, so that people can read it
|
// TODO I probably shouldn't be lazy here and do it without the macro, so that people can read it
|
||||||
KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, const Client*,
|
KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, Client, const Client*,
|
||||||
// ignore already existing splashes, toolbars, utilities, menus and topmenus,
|
// ignore already existing splashes, toolbars, utilities, menus and topmenus,
|
||||||
// as the app may show those before the main window
|
// as the app may show those before the main window
|
||||||
!cl->isSplash() && !cl->isToolbar() && !cl->isTopMenu() && !cl->isUtility() && !cl->isMenu()
|
!cl->isSplash() && !cl->isToolbar() && !cl->isTopMenu() && !cl->isUtility() && !cl->isMenu()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
Atoms::Atoms()
|
Atoms::Atoms()
|
||||||
|
|
2
atoms.h
2
atoms.h
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#define KWIN_ATOMS_H
|
#define KWIN_ATOMS_H
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Atoms
|
class Atoms
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
Bridge::Bridge( Client* cl )
|
Bridge::Bridge( Client* cl )
|
||||||
|
@ -197,9 +197,9 @@ QRegion Bridge::unobscuredRegion( const QRegion& r ) const
|
||||||
void Bridge::grabXServer( bool grab )
|
void Bridge::grabXServer( bool grab )
|
||||||
{
|
{
|
||||||
if( grab )
|
if( grab )
|
||||||
KWinInternal::grabXServer();
|
KWin::grabXServer();
|
||||||
else
|
else
|
||||||
KWinInternal::ungrabXServer();
|
KWin::ungrabXServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
2
bridge.h
2
bridge.h
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <kdecoration_p.h>
|
#include <kdecoration_p.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Client;
|
class Client;
|
||||||
|
|
|
@ -38,7 +38,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// put all externs before the namespace statement to allow the linker
|
// put all externs before the namespace statement to allow the linker
|
||||||
// to resolve them properly
|
// to resolve them properly
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
4
client.h
4
client.h
|
@ -34,7 +34,7 @@ class QTimer;
|
||||||
class K3Process;
|
class K3Process;
|
||||||
class KStartupInfoData;
|
class KStartupInfoData;
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Workspace;
|
class Workspace;
|
||||||
|
@ -490,7 +490,7 @@ class GeometryUpdatesBlocker
|
||||||
class WinInfo : public NETWinInfo
|
class WinInfo : public NETWinInfo
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
typedef KWinInternal::Client Client; // because of NET::Client
|
typedef KWin::Client Client; // because of NET::Client
|
||||||
public:
|
public:
|
||||||
WinInfo( Client* c, Display * display, Window window,
|
WinInfo( Client* c, Display * display, Window window,
|
||||||
Window rwin, const unsigned long pr[], int pr_size );
|
Window rwin, const unsigned long pr[], int pr_size );
|
||||||
|
|
|
@ -43,7 +43,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <X11/extensions/shape.h>
|
#include <X11/extensions/shape.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "effects.h"
|
#include "effects.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
Deleted::Deleted( Workspace* ws )
|
Deleted::Deleted( Workspace* ws )
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include "toplevel.h"
|
#include "toplevel.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Deleted
|
class Deleted
|
||||||
|
|
|
@ -45,7 +45,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "effects/test_input.h"
|
#include "effects/test_input.h"
|
||||||
#include "effects/test_thumbnail.h"
|
#include "effects/test_thumbnail.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
|
@ -189,7 +189,7 @@ EffectsHandler::EffectsHandler()
|
||||||
{
|
{
|
||||||
if( !compositing())
|
if( !compositing())
|
||||||
return;
|
return;
|
||||||
KWinInternal::effects = this;
|
KWin::effects = this;
|
||||||
|
|
||||||
#ifdef HAVE_CAPTURY
|
#ifdef HAVE_CAPTURY
|
||||||
registerEffect("VideoRecord", new GenericEffectFactory<VideoRecordEffect>);
|
registerEffect("VideoRecord", new GenericEffectFactory<VideoRecordEffect>);
|
||||||
|
|
|
@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <qpair.h>
|
#include <qpair.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Toplevel;
|
class Toplevel;
|
||||||
|
|
|
@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
BoxSwitchEffect::BoxSwitchEffect()
|
BoxSwitchEffect::BoxSwitchEffect()
|
||||||
|
|
|
@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <QRegion>
|
#include <QRegion>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class BoxSwitchEffect
|
class BoxSwitchEffect
|
||||||
|
|
|
@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Note that currently effects need to be manually enabled in the EffectsHandler
|
// Note that currently effects need to be manually enabled in the EffectsHandler
|
||||||
// class constructor (in effects.cpp).
|
// class constructor (in effects.cpp).
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
TaskbarThumbnailEffect::TaskbarThumbnailEffect()
|
TaskbarThumbnailEffect::TaskbarThumbnailEffect()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <workspace.h>
|
#include <workspace.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
const int MAX_PROGRESS = 1000;
|
const int MAX_PROGRESS = 1000;
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class DesktopChangeSlideEffect
|
class DesktopChangeSlideEffect
|
||||||
|
|
|
@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Note that currently effects need to be manually enabled in the EffectsHandler
|
// Note that currently effects need to be manually enabled in the EffectsHandler
|
||||||
// class constructor (in effects.cpp).
|
// class constructor (in effects.cpp).
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void DialogParentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )
|
void DialogParentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void DrunkenEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
void DrunkenEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class DrunkenEffect
|
class DrunkenEffect
|
||||||
|
|
|
@ -23,7 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
ExplosionEffect::ExplosionEffect() : Effect()
|
ExplosionEffect::ExplosionEffect() : Effect()
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Include with base class for effects.
|
// Include with base class for effects.
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class GLShader;
|
class GLShader;
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <client.h>
|
#include <client.h>
|
||||||
#include <deleted.h>
|
#include <deleted.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
FadeEffect::FadeEffect()
|
FadeEffect::FadeEffect()
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class FadeEffect
|
class FadeEffect
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <deleted.h>
|
#include <deleted.h>
|
||||||
#include <scene_opengl.h>
|
#include <scene_opengl.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void FallApartEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
void FallApartEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class FallApartEffect
|
class FallApartEffect
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <deleted.h>
|
#include <deleted.h>
|
||||||
#include <scene_opengl.h>
|
#include <scene_opengl.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void FlameEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
void FlameEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class FlameEffect
|
class FlameEffect
|
||||||
|
|
|
@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Note that currently effects need to be manually enabled in the EffectsHandler
|
// Note that currently effects need to be manually enabled in the EffectsHandler
|
||||||
// class constructor (in effects.cpp).
|
// class constructor (in effects.cpp).
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
// A pre-paint function that tells the compositing code how this effect will affect
|
// A pre-paint function that tells the compositing code how this effect will affect
|
||||||
|
|
|
@ -23,7 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
// Everything in KWin is in a namespace. There's no need to prefix names
|
// Everything in KWin is in a namespace. There's no need to prefix names
|
||||||
// with KWin or K, there's no (big) need to care about symbol clashes.
|
// with KWin or K, there's no (big) need to care about symbol clashes.
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
// The class implementing the effect.
|
// The class implementing the effect.
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <client.h>
|
#include <client.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void MakeTransparentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )
|
void MakeTransparentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class MakeTransparentEffect
|
class MakeTransparentEffect
|
||||||
|
|
|
@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Note that currently effects need to be manually enabled in the EffectsHandler
|
// Note that currently effects need to be manually enabled in the EffectsHandler
|
||||||
// class constructor (in effects.cpp).
|
// class constructor (in effects.cpp).
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
MinimizeAnimationEffect::MinimizeAnimationEffect()
|
MinimizeAnimationEffect::MinimizeAnimationEffect()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Note that currently effects need to be manually enabled in the EffectsHandler
|
// Note that currently effects need to be manually enabled in the EffectsHandler
|
||||||
// class constructor (in effects.cpp).
|
// class constructor (in effects.cpp).
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <client.h>
|
#include <client.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void ScaleInEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
void ScaleInEffect::prePaintScreen( int* mask, QRegion* region, int time )
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class ScaleInEffect
|
class ScaleInEffect
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
ShadowEffect::ShadowEffect()
|
ShadowEffect::ShadowEffect()
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class ShadowEffect
|
class ShadowEffect
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <workspace.h>
|
#include <workspace.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
ShakyMoveEffect::ShakyMoveEffect()
|
ShakyMoveEffect::ShakyMoveEffect()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class ShakyMoveEffect
|
class ShakyMoveEffect
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <workspace.h>
|
#include <workspace.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
ShiftWorkspaceUpEffect::ShiftWorkspaceUpEffect()
|
ShiftWorkspaceUpEffect::ShiftWorkspaceUpEffect()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class ShiftWorkspaceUpEffect
|
class ShiftWorkspaceUpEffect
|
||||||
|
|
|
@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
const int FPS_WIDTH = 10;
|
const int FPS_WIDTH = 10;
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <qdatetime.h>
|
#include <qdatetime.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class ShowFpsEffect
|
class ShowFpsEffect
|
||||||
|
|
|
@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <workspace.h>
|
#include <workspace.h>
|
||||||
#include <client.h>
|
#include <client.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
TestInputEffect::TestInputEffect()
|
TestInputEffect::TestInputEffect()
|
||||||
|
|
|
@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class TestInputEffect
|
class TestInputEffect
|
||||||
|
|
|
@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include "test_thumbnail.h"
|
#include "test_thumbnail.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
TestThumbnailEffect::TestThumbnailEffect()
|
TestThumbnailEffect::TestThumbnailEffect()
|
||||||
|
|
|
@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class TestThumbnailEffect
|
class TestThumbnailEffect
|
||||||
|
|
|
@ -43,7 +43,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
VideoRecordEffect::VideoRecordEffect()
|
VideoRecordEffect::VideoRecordEffect()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <captury/captury.h>
|
#include <captury/captury.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class VideoRecordEffect
|
class VideoRecordEffect
|
||||||
|
|
|
@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
// Note that currently effects need to be manually enabled in the EffectsHandler
|
// Note that currently effects need to be manually enabled in the EffectsHandler
|
||||||
// class constructor (in effects.cpp).
|
// class constructor (in effects.cpp).
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
WavyWindowsEffect::WavyWindowsEffect()
|
WavyWindowsEffect::WavyWindowsEffect()
|
||||||
|
|
|
@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <workspace.h>
|
#include <workspace.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
ZoomEffect::ZoomEffect()
|
ZoomEffect::ZoomEffect()
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <effects.h>
|
#include <effects.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class ZoomEffect
|
class ZoomEffect
|
||||||
|
|
|
@ -34,7 +34,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
// ****************************************
|
// ****************************************
|
||||||
|
|
|
@ -32,7 +32,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
#include <QDesktopWidget>
|
#include <QDesktopWidget>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
//********************************************
|
//********************************************
|
||||||
|
|
|
@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "geometrytip.h"
|
#include "geometrytip.h"
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):
|
GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class GeometryTip: public QLabel
|
class GeometryTip: public QLabel
|
||||||
|
|
|
@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#define MAKE_GL_VERSION(major, minor, release) ( ((major) << 16) | ((minor) << 8) | (release) )
|
#define MAKE_GL_VERSION(major, minor, release) ( ((major) << 16) | ((minor) << 8) | (release) )
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
// Variables
|
// Variables
|
||||||
// GL version, use MAKE_GL_VERSION() macro for comparing with a specific version
|
// GL version, use MAKE_GL_VERSION() macro for comparing with a specific version
|
||||||
|
|
|
@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
template< class K, class V > class QHash;
|
template< class K, class V > class QHash;
|
||||||
|
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#ifdef HAVE_OPENGL
|
#ifdef HAVE_OPENGL
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
// Function pointers
|
// Function pointers
|
||||||
|
|
|
@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#ifdef HAVE_OPENGL
|
#ifdef HAVE_OPENGL
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
void glxResolveFunctions();
|
void glxResolveFunctions();
|
||||||
|
|
|
@ -33,7 +33,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
or I'll get it backwards in half of the cases again.
|
or I'll get it backwards in half of the cases again.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
//********************************************
|
//********************************************
|
||||||
|
|
5
group.h
5
group.h
|
@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include <netwm.h>
|
#include <netwm.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Client;
|
class Client;
|
||||||
|
@ -41,8 +41,6 @@ class Group
|
||||||
bool groupEvent( XEvent* e );
|
bool groupEvent( XEvent* e );
|
||||||
void updateUserTime( Time time = CurrentTime );
|
void updateUserTime( Time time = CurrentTime );
|
||||||
Time userTime() const;
|
Time userTime() const;
|
||||||
void ref();
|
|
||||||
void deref();
|
|
||||||
private:
|
private:
|
||||||
void getIcons();
|
void getIcons();
|
||||||
void startupIdChanged();
|
void startupIdChanged();
|
||||||
|
@ -52,7 +50,6 @@ class Group
|
||||||
Workspace* _workspace;
|
Workspace* _workspace;
|
||||||
NETWinInfo* leader_info;
|
NETWinInfo* leader_info;
|
||||||
Time user_time;
|
Time user_time;
|
||||||
int refcount;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
inline Window Group::leader() const
|
inline Window Group::leader() const
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include <fixx11h.h>
|
#include <fixx11h.h>
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
DetectWidget::DetectWidget( QWidget* parent, const char* name )
|
DetectWidget::DetectWidget( QWidget* parent, const char* name )
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <QEvent>
|
#include <QEvent>
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class DetectWidget
|
class DetectWidget
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
<ui version="4.0" stdsetdef="1" >
|
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
||||||
<author></author>
|
<class>KWin::DetectWidgetBase</class>
|
||||||
<comment></comment>
|
<widget class="QWidget">
|
||||||
<exportmacro></exportmacro>
|
<property name="name">
|
||||||
<class>KWinInternal::DetectWidgetBase</class>
|
<cstring>DetectWidgetBase</cstring>
|
||||||
<widget class="QWidget" name="KWinInternal::DetectWidgetBase" >
|
</property>
|
||||||
<property name="geometry" >
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
|
@ -12,221 +12,207 @@
|
||||||
<height>325</height>
|
<height>325</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" >
|
<grid>
|
||||||
<property name="margin" >
|
<property name="name">
|
||||||
|
<cstring>unnamed</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="margin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item rowspan="1" row="9" column="0" colspan="2" >
|
<spacer row="9" column="0" rowspan="1" colspan="2">
|
||||||
<spacer name="spacer1" >
|
<property name="name">
|
||||||
<property name="sizeHint" >
|
<cstring>spacer1</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>Expanding</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint">
|
||||||
<size>
|
<size>
|
||||||
<width>20</width>
|
<width>20</width>
|
||||||
<height>40</height>
|
<height>40</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeType" >
|
|
||||||
<enum>Expanding</enum>
|
|
||||||
</property>
|
|
||||||
<property name="orientation" >
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
<widget class="QLabel" row="6" column="0">
|
||||||
<item row="6" column="0" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="textLabel11" >
|
<cstring>textLabel11</cstring>
|
||||||
<property name="text" >
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Extra role:</string>
|
<string>Extra role:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="2" column="0">
|
||||||
<item row="2" column="0" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="textLabel1" >
|
<cstring>textLabel1</cstring>
|
||||||
<property name="text" >
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Class:</string>
|
<string>Class:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="3" column="0">
|
||||||
<item row="3" column="0" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="textLabel3" >
|
<cstring>textLabel3</cstring>
|
||||||
<property name="text" >
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Role:</string>
|
<string>Role:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
</widget>
|
||||||
<bool>false</bool>
|
<widget class="QLabel" row="4" column="1">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>type_label</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="5" column="0">
|
||||||
<item row="4" column="1" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="type_label" >
|
<cstring>textLabel8</cstring>
|
||||||
<property name="text" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
<property name="text">
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0" >
|
|
||||||
<widget class="QLabel" name="textLabel8" >
|
|
||||||
<property name="text" >
|
|
||||||
<string>Title:</string>
|
<string>Title:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
</widget>
|
||||||
<bool>false</bool>
|
<widget class="QLabel" row="2" column="1">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>class_label</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="3" column="1">
|
||||||
<item row="2" column="1" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="class_label" >
|
<cstring>role_label</cstring>
|
||||||
<property name="text" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
<property name="text">
|
||||||
<bool>false</bool>
|
<string></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="5" column="1">
|
||||||
<item row="3" column="1" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="role_label" >
|
<cstring>title_label</cstring>
|
||||||
<property name="text" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
<property name="text">
|
||||||
<bool>false</bool>
|
<string></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="7" column="1">
|
||||||
<item row="5" column="1" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="title_label" >
|
<cstring>machine_label</cstring>
|
||||||
<property name="text" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
<property name="text">
|
||||||
<bool>false</bool>
|
<string></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="4" column="0">
|
||||||
<item row="7" column="1" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="machine_label" >
|
<cstring>textLabel4</cstring>
|
||||||
<property name="text" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
<property name="text">
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0" >
|
|
||||||
<widget class="QLabel" name="textLabel4" >
|
|
||||||
<property name="text" >
|
|
||||||
<string>Type:</string>
|
<string>Type:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
</widget>
|
||||||
<bool>false</bool>
|
<widget class="QLabel" row="6" column="1">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>extrarole_label</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="7" column="0">
|
||||||
<item row="6" column="1" >
|
<property name="name">
|
||||||
<widget class="QLabel" name="extrarole_label" >
|
<cstring>textLabel13</cstring>
|
||||||
<property name="text" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
<property name="text">
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0" >
|
|
||||||
<widget class="QLabel" name="textLabel13" >
|
|
||||||
<property name="text" >
|
|
||||||
<string>Machine:</string>
|
<string>Machine:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
</widget>
|
||||||
<bool>false</bool>
|
<widget class="Line" row="1" column="0" rowspan="1" colspan="2">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>line1</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>HLine</enum>
|
||||||
|
</property>
|
||||||
|
<property name="frameShadow">
|
||||||
|
<enum>Sunken</enum>
|
||||||
|
</property>
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
|
||||||
<item rowspan="1" row="1" column="0" colspan="2" >
|
<property name="name">
|
||||||
<widget class="Line" name="line1" >
|
<cstring>textLabel9</cstring>
|
||||||
<property name="frameShape" >
|
|
||||||
<enum>QFrame::HLine</enum>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="frameShadow" >
|
<property name="text">
|
||||||
<enum>QFrame::Sunken</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item rowspan="1" row="0" column="0" colspan="2" >
|
|
||||||
<widget class="QLabel" name="textLabel9" >
|
|
||||||
<property name="text" >
|
|
||||||
<string>Information About Selected Window</string>
|
<string>Information About Selected Window</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap" >
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="2">
|
||||||
<item rowspan="1" row="8" column="0" colspan="2" >
|
<property name="name">
|
||||||
<widget class="Q3ButtonGroup" name="buttonGroup1" >
|
<cstring>buttonGroup1</cstring>
|
||||||
<property name="title" >
|
|
||||||
<string/>
|
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" >
|
<property name="title">
|
||||||
<property name="margin" >
|
<string></string>
|
||||||
<number>0</number>
|
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<vbox>
|
||||||
<widget class="QRadioButton" name="use_class" >
|
<property name="name">
|
||||||
<property name="text" >
|
<cstring>unnamed</cstring>
|
||||||
|
</property>
|
||||||
|
<widget class="QRadioButton">
|
||||||
|
<property name="name">
|
||||||
|
<cstring>use_class</cstring>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Use window &class (whole application)</string>
|
<string>Use window &class (whole application)</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checked" >
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis" stdset="0" >
|
<property name="whatsThis" stdset="0">
|
||||||
<string>For selecting all windows belonging to a specific application, selecting only window class should usually work.</string>
|
<string>For selecting all windows belonging to a specific application, selecting only window class should usually work.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QRadioButton">
|
||||||
<item>
|
<property name="name">
|
||||||
<widget class="QRadioButton" name="use_role" >
|
<cstring>use_role</cstring>
|
||||||
<property name="text" >
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Use window class and window &role (specific window)</string>
|
<string>Use window class and window &role (specific window)</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis" stdset="0" >
|
<property name="whatsThis" stdset="0">
|
||||||
<string>For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though.</string>
|
<string>For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QRadioButton">
|
||||||
<item>
|
<property name="name">
|
||||||
<widget class="QRadioButton" name="use_whole_class" >
|
<cstring>use_whole_class</cstring>
|
||||||
<property name="text" >
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Use &whole window class (specific window)</string>
|
<string>Use &whole window class (specific window)</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis" stdset="0" >
|
<property name="whatsThis" stdset="0">
|
||||||
<string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string>
|
<string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QCheckBox">
|
||||||
<item>
|
<property name="name">
|
||||||
<widget class="QCheckBox" name="match_title" >
|
<cstring>match_title</cstring>
|
||||||
<property name="text" >
|
</property>
|
||||||
|
<property name="text">
|
||||||
<string>Match also window &title</string>
|
<string>Match also window &title</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</vbox>
|
||||||
</layout>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</grid>
|
||||||
</layout>
|
</widget>
|
||||||
</widget>
|
<layoutdefaults spacing="6" margin="11"/>
|
||||||
<layoutdefault spacing="6" margin="11" />
|
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
|
||||||
<layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
|
</UI>
|
||||||
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
|
||||||
</ui>
|
|
||||||
|
|
|
@ -30,10 +30,10 @@
|
||||||
|
|
||||||
#include "ruleslist.h"
|
#include "ruleslist.h"
|
||||||
|
|
||||||
typedef KGenericFactory<KWinInternal::KCMRules> KCMRulesFactory;
|
typedef KGenericFactory<KWin::KCMRules> KCMRulesFactory;
|
||||||
K_EXPORT_COMPONENT_FACTORY(kwinrules, KCMRulesFactory("kcmkwinrules"))
|
K_EXPORT_COMPONENT_FACTORY(kwinrules, KCMRulesFactory("kcmkwinrules"))
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
KCMRules::KCMRules( QWidget *parent, const QStringList & )
|
KCMRules::KCMRules( QWidget *parent, const QStringList & )
|
||||||
|
|
|
@ -27,7 +27,7 @@ class KConfig;
|
||||||
class KAboutData;
|
class KAboutData;
|
||||||
class QStringList;
|
class QStringList;
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class KCMRulesList;
|
class KCMRulesList;
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "../../rules.h"
|
#include "../../rules.h"
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
static void loadRules( QList< Rules* >& rules )
|
static void loadRules( QList< Rules* >& rules )
|
||||||
|
@ -289,5 +289,5 @@ KDE_EXPORT int kdemain( int argc, char* argv[] )
|
||||||
KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." ));
|
KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." ));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return KWinInternal::edit( id, whole_app );
|
return KWin::edit( id, whole_app );
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include "ruleswidget.h"
|
#include "ruleswidget.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
KCMRulesList::KCMRulesList( QWidget* parent, const char* name )
|
KCMRulesList::KCMRulesList( QWidget* parent, const char* name )
|
||||||
|
|
|
@ -20,32 +20,23 @@
|
||||||
#ifndef __RULESLIST_H__
|
#ifndef __RULESLIST_H__
|
||||||
#define __RULESLIST_H__
|
#define __RULESLIST_H__
|
||||||
|
|
||||||
#include "ui_ruleslistbase.h"
|
#include "ruleslistbase.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "../../rules.h"
|
#include "../../rules.h"
|
||||||
|
|
||||||
class QListWidgetItem;
|
class Q3ListBoxItem;
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class KCMRulesListBase : public QWidget, public Ui::KCMRulesListBase
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
KCMRulesListBase( QWidget *parent ) : QWidget( parent ) {
|
|
||||||
setupUi( this );
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
class KCMRulesList
|
class KCMRulesList
|
||||||
: public KCMRulesListBase
|
: public KCMRulesListBase
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
KCMRulesList( QWidget* parent = NULL );
|
KCMRulesList( QWidget* parent = NULL, const char* name = NULL );
|
||||||
virtual ~KCMRulesList();
|
virtual ~KCMRulesList();
|
||||||
void load();
|
void load();
|
||||||
void save();
|
void save();
|
||||||
|
@ -58,7 +49,7 @@ class KCMRulesList
|
||||||
void deleteClicked();
|
void deleteClicked();
|
||||||
void moveupClicked();
|
void moveupClicked();
|
||||||
void movedownClicked();
|
void movedownClicked();
|
||||||
void activeChanged( QListWidgetItem* );
|
void activeChanged( Q3ListBoxItem* );
|
||||||
private:
|
private:
|
||||||
QVector< Rules* > rules;
|
QVector< Rules* > rules;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
||||||
<class>KWinInternal::KCMRulesListBase</class>
|
<class>KWin::KCMRulesListBase</class>
|
||||||
<widget class="QWidget">
|
<widget class="QWidget">
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>KCMRulesListBase</cstring>
|
<cstring>KCMRulesListBase</cstring>
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
#include "detectwidget.h"
|
#include "detectwidget.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
#define SETUP( var, type ) \
|
#define SETUP( var, type ) \
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include "ruleswidgetbase.h"
|
#include "ruleswidgetbase.h"
|
||||||
#include "editshortcutbase.h"
|
#include "editshortcutbase.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Rules;
|
class Rules;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
||||||
<class>KWinInternal::RulesWidgetBase</class>
|
<class>KWin::RulesWidgetBase</class>
|
||||||
<widget class="QWidget">
|
<widget class="QWidget">
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>RulesWidgetBase</cstring>
|
<cstring>RulesWidgetBase</cstring>
|
||||||
|
@ -329,7 +329,7 @@
|
||||||
<cstring>types</cstring>
|
<cstring>types</cstring>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="KListWidget" row="1" column="0" rowspan="1" colspan="4">
|
<widget class="K3ListBox" row="1" column="0" rowspan="1" colspan="4">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Normal Window</string>
|
<string>Normal Window</string>
|
||||||
|
@ -384,7 +384,7 @@
|
||||||
<cstring>types</cstring>
|
<cstring>types</cstring>
|
||||||
</property>
|
</property>
|
||||||
<property name="selectionMode">
|
<property name="selectionMode">
|
||||||
<enum>MultiSelection</enum>
|
<enum>Multi</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
|
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
|
||||||
|
@ -2541,9 +2541,4 @@
|
||||||
</slots>
|
</slots>
|
||||||
<layoutdefaults spacing="6" margin="11"/>
|
<layoutdefaults spacing="6" margin="11"/>
|
||||||
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
|
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
|
||||||
<includehints>
|
|
||||||
<includehint>kpushbutton.h</includehint>
|
|
||||||
<includehint>kcombobox.h</includehint>
|
|
||||||
<includehint>krestrictedline.h</includehint>
|
|
||||||
</includehints>
|
|
||||||
</UI>
|
</UI>
|
||||||
|
|
|
@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
KillWindow::KillWindow( Workspace* ws )
|
KillWindow::KillWindow( Workspace* ws )
|
||||||
|
@ -76,7 +76,7 @@ void KillWindow::start()
|
||||||
mx /= 10;
|
mx /= 10;
|
||||||
my /= 10;
|
my /= 10;
|
||||||
}
|
}
|
||||||
QCursor::setPos(QCursor::pos()+QPoint(mx, my));
|
QCursor::setPos(cursorPos()+QPoint(mx, my));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ev.type == ButtonRelease)
|
if (ev.type == ButtonRelease)
|
||||||
|
@ -87,7 +87,6 @@ void KillWindow::start()
|
||||||
escape_pressed = true;
|
escape_pressed = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if( ev.xbutton.button == Button1 || ev.xbutton.button == Button2 )
|
|
||||||
workspace->killWindowId(ev.xbutton.subwindow);
|
workspace->killWindowId(ev.xbutton.subwindow);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include "workspace.h"
|
#include "workspace.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class KillWindow
|
class KillWindow
|
||||||
|
|
|
@ -74,7 +74,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "rules.h"
|
#include "rules.h"
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
//*******************************
|
//*******************************
|
||||||
|
|
41
main.cpp
41
main.cpp
|
@ -14,7 +14,6 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
#include <kglobal.h>
|
|
||||||
#include <klocale.h>
|
#include <klocale.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <kcmdlineargs.h>
|
#include <kcmdlineargs.h>
|
||||||
|
@ -26,11 +25,13 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fixx11h.h>
|
#include <fixx11h.h>
|
||||||
#include <QtDBus/QtDBus>
|
#include <QtDBus/QtDBus>
|
||||||
|
#include <kglobal.h>
|
||||||
|
|
||||||
#include "atoms.h"
|
#include "atoms.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "sm.h"
|
#include "sm.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
#include "effects.h"
|
||||||
|
|
||||||
#define INT8 _X11INT8
|
#define INT8 _X11INT8
|
||||||
#define INT32 _X11INT32
|
#define INT32 _X11INT32
|
||||||
|
@ -38,7 +39,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#undef INT8
|
#undef INT8
|
||||||
#undef INT32
|
#undef INT32
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
Options* options;
|
Options* options;
|
||||||
|
@ -120,6 +121,8 @@ Application::Application( )
|
||||||
options = new Options;
|
options = new Options;
|
||||||
atoms = new Atoms;
|
atoms = new Atoms;
|
||||||
|
|
||||||
|
initting = false; // TODO
|
||||||
|
|
||||||
// create workspace.
|
// create workspace.
|
||||||
(void) new Workspace( isSessionRestored() );
|
(void) new Workspace( isSessionRestored() );
|
||||||
|
|
||||||
|
@ -127,13 +130,15 @@ Application::Application( )
|
||||||
|
|
||||||
initting = false; // startup done, we are up and running now.
|
initting = false; // startup done, we are up and running now.
|
||||||
|
|
||||||
|
QDBusInterface ksplash( "org.kde.ksplash", "/ksplash", "org.kde.KSplash" );
|
||||||
|
ksplash.call( "upAndRunning", QString( "wm started" ));
|
||||||
XEvent e;
|
XEvent e;
|
||||||
e.xclient.type = ClientMessage;
|
e.xclient.type = ClientMessage;
|
||||||
e.xclient.message_type = XInternAtom( display(), "_KDE_SPLASH_PROGRESS", False );
|
e.xclient.message_type = XInternAtom( display(), "_KDE_SPLASH_PROGRESS", False );
|
||||||
e.xclient.display = display();
|
e.xclient.display = display();
|
||||||
e.xclient.window = rootWindow();
|
e.xclient.window = rootWindow();
|
||||||
e.xclient.format = 8;
|
e.xclient.format = 8;
|
||||||
strcpy( e.xclient.data.b, "wm" );
|
strcpy( e.xclient.data.b, "wm started" );
|
||||||
XSendEvent( display(), rootWindow(), False, SubstructureNotifyMask, &e );
|
XSendEvent( display(), rootWindow(), False, SubstructureNotifyMask, &e );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,6 +148,8 @@ Application::~Application()
|
||||||
if( owner.ownerWindow() != None ) // if there was no --replace (no new WM)
|
if( owner.ownerWindow() != None ) // if there was no --replace (no new WM)
|
||||||
XSetInputFocus( display(), PointerRoot, RevertToPointerRoot, xTime() );
|
XSetInputFocus( display(), PointerRoot, RevertToPointerRoot, xTime() );
|
||||||
delete options;
|
delete options;
|
||||||
|
delete effects;
|
||||||
|
delete atoms;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::lostSelection()
|
void Application::lostSelection()
|
||||||
|
@ -209,7 +216,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
|
||||||
}
|
}
|
||||||
|
|
||||||
int number_of_screens = ScreenCount( dpy );
|
int number_of_screens = ScreenCount( dpy );
|
||||||
KWinInternal::screen_number = DefaultScreen( dpy );
|
KWin::screen_number = DefaultScreen( dpy );
|
||||||
int pos; // temporarily needed to reconstruct DISPLAY var if multi-head
|
int pos; // temporarily needed to reconstruct DISPLAY var if multi-head
|
||||||
QByteArray display_name = XDisplayString( dpy );
|
QByteArray display_name = XDisplayString( dpy );
|
||||||
XCloseDisplay( dpy );
|
XCloseDisplay( dpy );
|
||||||
|
@ -225,9 +232,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
|
||||||
{
|
{
|
||||||
// if execution doesn't pass by here, then kwin
|
// if execution doesn't pass by here, then kwin
|
||||||
// acts exactly as previously
|
// acts exactly as previously
|
||||||
if ( i != KWinInternal::screen_number && fork() == 0 )
|
if ( i != KWin::screen_number && fork() == 0 )
|
||||||
{
|
{
|
||||||
KWinInternal::screen_number = i;
|
KWin::screen_number = i;
|
||||||
// break here because we are the child process, we don't
|
// break here because we are the child process, we don't
|
||||||
// want to fork() anymore
|
// want to fork() anymore
|
||||||
break;
|
break;
|
||||||
|
@ -235,7 +242,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
|
||||||
}
|
}
|
||||||
// in the next statement, display_name shouldn't contain a screen
|
// in the next statement, display_name shouldn't contain a screen
|
||||||
// number. If it had it, it was removed at the "pos" check
|
// number. If it had it, it was removed at the "pos" check
|
||||||
envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWinInternal::screen_number);
|
envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWin::screen_number);
|
||||||
|
|
||||||
if (putenv( strdup(envir.toAscii())) )
|
if (putenv( strdup(envir.toAscii())) )
|
||||||
{
|
{
|
||||||
|
@ -259,27 +266,27 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
|
||||||
KCmdLineArgs::init(argc, argv, &aboutData);
|
KCmdLineArgs::init(argc, argv, &aboutData);
|
||||||
KCmdLineArgs::addCmdLineOptions( args );
|
KCmdLineArgs::addCmdLineOptions( args );
|
||||||
|
|
||||||
if (signal(SIGTERM, KWinInternal::sighandler) == SIG_IGN)
|
if (signal(SIGTERM, KWin::sighandler) == SIG_IGN)
|
||||||
signal(SIGTERM, SIG_IGN);
|
signal(SIGTERM, SIG_IGN);
|
||||||
if (signal(SIGINT, KWinInternal::sighandler) == SIG_IGN)
|
if (signal(SIGINT, KWin::sighandler) == SIG_IGN)
|
||||||
signal(SIGINT, SIG_IGN);
|
signal(SIGINT, SIG_IGN);
|
||||||
if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN)
|
if (signal(SIGHUP, KWin::sighandler) == SIG_IGN)
|
||||||
signal(SIGHUP, SIG_IGN);
|
signal(SIGHUP, SIG_IGN);
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#warning D-BUS TODO
|
#warning D-BUS TODO
|
||||||
// KApplication::disableAutoDcopRegistration();
|
// KApplication::disableAutoDcopRegistration();
|
||||||
#endif
|
#endif
|
||||||
KWinInternal::Application a;
|
KWin::Application a;
|
||||||
KWinInternal::SessionManager weAreIndeed;
|
KWin::SessionManager weAreIndeed;
|
||||||
KWinInternal::SessionSaveDoneHelper helper;
|
KWin::SessionSaveDoneHelper helper;
|
||||||
|
|
||||||
fcntl(XConnectionNumber(KWinInternal::display()), F_SETFD, 1);
|
fcntl(XConnectionNumber(KWin::display()), F_SETFD, 1);
|
||||||
|
|
||||||
QString appname;
|
QString appname;
|
||||||
if (KWinInternal::screen_number == 0)
|
if (KWin::screen_number == 0)
|
||||||
appname = "org.kde.kwin";
|
appname = "kwin";
|
||||||
else
|
else
|
||||||
appname.sprintf("org.kde.kwin-screen-%d", KWinInternal::screen_number);
|
appname.sprintf("kwin-screen-%d", KWin::screen_number);
|
||||||
|
|
||||||
QDBusConnection::sessionBus().interface()->registerService( appname, QDBusConnectionInterface::DontQueueService );
|
QDBusConnection::sessionBus().interface()->registerService( appname, QDBusConnectionInterface::DontQueueService );
|
||||||
|
|
||||||
|
|
2
main.h
2
main.h
|
@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "workspace.h"
|
#include "workspace.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Application : public KApplication
|
class Application : public KApplication
|
||||||
|
|
|
@ -26,7 +26,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "rules.h"
|
#include "rules.h"
|
||||||
#include "group.h"
|
#include "group.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
QString Notify::eventToName( Event e )
|
QString Notify::eventToName( Event e )
|
||||||
|
|
|
@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Client;
|
class Client;
|
||||||
|
|
|
@ -26,7 +26,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifndef KCMRULES
|
#ifndef KCMRULES
|
||||||
|
|
|
@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include "placement.h"
|
#include "placement.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Client;
|
class Client;
|
||||||
|
|
|
@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "rules.h"
|
#include "rules.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifndef KCMRULES
|
#ifndef KCMRULES
|
||||||
|
|
|
@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Workspace;
|
class Workspace;
|
||||||
|
|
|
@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
PluginMgr::PluginMgr()
|
PluginMgr::PluginMgr()
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#include <kdecoration_plugins_p.h>
|
#include <kdecoration_plugins_p.h>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class PluginMgr
|
class PluginMgr
|
||||||
|
|
|
@ -33,7 +33,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
// specify externals before namespace
|
// specify externals before namespace
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
PopupInfo::PopupInfo( const char *name )
|
PopupInfo::PopupInfo( const char *name )
|
||||||
|
|
|
@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Workspace;
|
class Workspace;
|
||||||
|
|
12
rules.cpp
12
rules.cpp
|
@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "workspace.h"
|
#include "workspace.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
Rules::Rules()
|
Rules::Rules()
|
||||||
|
@ -850,8 +850,6 @@ void Client::updateWindowRules()
|
||||||
{
|
{
|
||||||
if( !isManaged()) // not fully setup yet
|
if( !isManaged()) // not fully setup yet
|
||||||
return;
|
return;
|
||||||
if( workspace()->rulesUpdatesDisabled())
|
|
||||||
return;
|
|
||||||
client_rules.update( this );
|
client_rules.update( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1009,14 +1007,6 @@ void Workspace::rulesUpdated()
|
||||||
rulesUpdatedTimer.start( 1000 );
|
rulesUpdatedTimer.start( 1000 );
|
||||||
}
|
}
|
||||||
|
|
||||||
void Workspace::disableRulesUpdates( bool disable )
|
|
||||||
{
|
|
||||||
rules_updates_disabled = disable;
|
|
||||||
if( !disable )
|
|
||||||
foreach( Client* c, clients )
|
|
||||||
c->updateWindowRules();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
2
rules.h
2
rules.h
|
@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
class KConfig;
|
class KConfig;
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class Client;
|
class Client;
|
||||||
|
|
|
@ -67,7 +67,7 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "deleted.h"
|
#include "deleted.h"
|
||||||
#include "effects.h"
|
#include "effects.h"
|
||||||
|
|
||||||
namespace KWinInternal
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue