From 7d620a3ad830482c912a73aa7b026be863bce8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sat, 26 Jan 2008 19:00:14 +0000 Subject: [PATCH] Make KDecorationBridge also public and with kept binary compatibility, so that Compiz can use it for the KDE decorator. Extending will be done the same way like with KDecoration. CCMAIL: Dennis Kasprzyk svn path=/trunk/KDE/kdebase/workspace/; revision=766833 --- bridge.h | 2 +- kcmkwin/kwindecoration/preview.h | 1 + lib/kdecoration.cpp | 2 +- lib/kdecoration_p.h | 51 ----------------- lib/kdecorationbridge.h | 94 ++++++++++++++++++++++++++++++++ lib/kdecorationfactory.cpp | 2 +- 6 files changed, 98 insertions(+), 54 deletions(-) create mode 100644 lib/kdecorationbridge.h diff --git a/bridge.h b/bridge.h index 069ae57c8a..017f622bbf 100644 --- a/bridge.h +++ b/bridge.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef KWIN_BRIDGE_H #define KWIN_BRIDGE_H -#include +#include namespace KWin { diff --git a/kcmkwin/kwindecoration/preview.h b/kcmkwin/kwindecoration/preview.h index 32a7bb310e..3cd089a0c0 100644 --- a/kcmkwin/kwindecoration/preview.h +++ b/kcmkwin/kwindecoration/preview.h @@ -26,6 +26,7 @@ #include #include #include +#include #include class QLabel; diff --git a/lib/kdecoration.cpp b/lib/kdecoration.cpp index 3dcc8e1542..a12eafdb11 100644 --- a/lib/kdecoration.cpp +++ b/lib/kdecoration.cpp @@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE. #include "kdecoration_p.h" #include "kdecorationfactory.h" - +#include "kdecorationbridge.h" /* diff --git a/lib/kdecoration_p.h b/lib/kdecoration_p.h index eb1a9b5c0a..030f3a5622 100644 --- a/lib/kdecoration_p.h +++ b/lib/kdecoration_p.h @@ -57,55 +57,4 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines WindowOperation OpMaxButtonLeftClick; }; -class KDecorationBridge : public KDecorationDefines - { - public: - virtual ~KDecorationBridge(){} - virtual bool isActive() const = 0; - virtual bool isCloseable() const = 0; - virtual bool isMaximizable() const = 0; - virtual MaximizeMode maximizeMode() const = 0; - virtual bool isMinimizable() const = 0; - virtual bool providesContextHelp() const = 0; - virtual int desktop() const = 0; - virtual bool isModal() const = 0; - virtual bool isShadeable() const = 0; - virtual bool isShade() const = 0; - virtual bool isSetShade() const = 0; - virtual bool keepAbove() const = 0; - virtual bool keepBelow() const = 0; - virtual bool isMovable() const = 0; - virtual bool isResizable() const = 0; - virtual NET::WindowType windowType( unsigned long supported_types ) const = 0; - virtual QIcon icon() const = 0; - virtual QString caption() const = 0; - virtual void processMousePressEvent( QMouseEvent* ) = 0; - virtual void showWindowMenu( const QRect &) = 0; - virtual void showWindowMenu( const QPoint & ) = 0; - virtual void performWindowOperation( WindowOperation ) = 0; - virtual void setMask( const QRegion&, int ) = 0; - virtual bool isPreview() const = 0; - virtual QRect geometry() const = 0; - virtual QRect iconGeometry() const = 0; - virtual QRegion unobscuredRegion( const QRegion& r ) const = 0; - virtual WId windowId() const = 0; - virtual void closeWindow() = 0; - virtual void maximize( MaximizeMode mode ) = 0; - virtual void minimize() = 0; - virtual void showContextHelp() = 0; - virtual void setDesktop( int desktop ) = 0; - virtual void titlebarDblClickOperation() = 0; - virtual void titlebarMouseWheelOperation( int delta ) = 0; - virtual void setShade( bool set ) = 0; - virtual void setKeepAbove( bool ) = 0; - virtual void setKeepBelow( bool ) = 0; - // not part of public API - virtual int currentDesktop() const = 0; - virtual QWidget* initialParentWidget() const = 0; - virtual Qt::WFlags initialWFlags() const = 0; - virtual void grabXServer( bool grab ) = 0; - }; - -/** @} */ - #endif diff --git a/lib/kdecorationbridge.h b/lib/kdecorationbridge.h new file mode 100644 index 0000000000..5c28e52f70 --- /dev/null +++ b/lib/kdecorationbridge.h @@ -0,0 +1,94 @@ +/***************************************************************** +This file is part of the KDE project. + +Copyright (C) 2003 Lubos Lunak + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +******************************************************************/ + +#ifndef KDECORATIONBRIDGE_H +#define KDECORATIONBRIDGE_H + +#include "kdecoration.h" +#include + +/** @addtogroup kdecoration */ +/** @{ */ + +/** + * @short Bridge class for communicating between decorations and KWin core. + * + * This class allows communication between decorations and KWin core while allowing + * to keep binary compatibility. Decorations do not need to use it directly at all. + */ +// This class is supposed to keep binary compatibility, just like KDecoration. +// Extending should be done the same way, i.e. inheriting KDecorationBridge2 from it +// and adding new functionality there. +class KDecorationBridge : public KDecorationDefines + { + public: + virtual ~KDecorationBridge(){} + virtual bool isActive() const = 0; + virtual bool isCloseable() const = 0; + virtual bool isMaximizable() const = 0; + virtual MaximizeMode maximizeMode() const = 0; + virtual bool isMinimizable() const = 0; + virtual bool providesContextHelp() const = 0; + virtual int desktop() const = 0; + virtual bool isModal() const = 0; + virtual bool isShadeable() const = 0; + virtual bool isShade() const = 0; + virtual bool isSetShade() const = 0; + virtual bool keepAbove() const = 0; + virtual bool keepBelow() const = 0; + virtual bool isMovable() const = 0; + virtual bool isResizable() const = 0; + virtual NET::WindowType windowType( unsigned long supported_types ) const = 0; + virtual QIcon icon() const = 0; + virtual QString caption() const = 0; + virtual void processMousePressEvent( QMouseEvent* ) = 0; + virtual void showWindowMenu( const QRect &) = 0; + virtual void showWindowMenu( const QPoint & ) = 0; + virtual void performWindowOperation( WindowOperation ) = 0; + virtual void setMask( const QRegion&, int ) = 0; + virtual bool isPreview() const = 0; + virtual QRect geometry() const = 0; + virtual QRect iconGeometry() const = 0; + virtual QRegion unobscuredRegion( const QRegion& r ) const = 0; + virtual WId windowId() const = 0; + virtual void closeWindow() = 0; + virtual void maximize( MaximizeMode mode ) = 0; + virtual void minimize() = 0; + virtual void showContextHelp() = 0; + virtual void setDesktop( int desktop ) = 0; + virtual void titlebarDblClickOperation() = 0; + virtual void titlebarMouseWheelOperation( int delta ) = 0; + virtual void setShade( bool set ) = 0; + virtual void setKeepAbove( bool ) = 0; + virtual void setKeepBelow( bool ) = 0; + // not part of public API + virtual int currentDesktop() const = 0; + virtual QWidget* initialParentWidget() const = 0; + virtual Qt::WFlags initialWFlags() const = 0; + virtual void grabXServer( bool grab ) = 0; + }; + +/** @} */ + +#endif diff --git a/lib/kdecorationfactory.cpp b/lib/kdecorationfactory.cpp index b03dd56737..ac7562531c 100644 --- a/lib/kdecorationfactory.cpp +++ b/lib/kdecorationfactory.cpp @@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE. #include -#include "kdecoration_p.h" +#include "kdecorationbridge.h" KDecorationFactory::KDecorationFactory() {