Merge lp:~ivenvd/compiz/compiz.fix_1193792 into lp:compiz/0.9.10

[Iven Hsu]

KWD: Fix compile errors with KDE 4.11.

The KWin developers made kdecorationbridge.h private.

See: http://lists.freedesktop.org/archives/compiz/2013-March/003479.html

(LP: #1193792)

KWD: Fix compile errors with KDE 4.11. (LP: #1193792)

The KWin developers made kdecorationbridge.h private.

See: http://lists.freedesktop.org/archives/compiz/2013-March/003479.html

[MC Return (mc-return)]

Iven, thanks a lot for that. +1
Could you please "Set (a) commit message" also ?

I guess you've tested this fix ?

review: Needs Information

[MC Return (mc-return)]

Here:

25 + virtual QuickTileMode quickTileMode(void) const;

a whitespace between quickTileMode and ( is missing.

The style of kdecorationbridge.h is not really what Compiz uses, but I guess this is okay as
"35 +This file is part of the KDE project."... ;)

[Iven Hsu (ivenvd)]

Yes, I've tested this.

What do you mean by commit message? I've already written a bzr commit message, I think.

[MC Return (mc-return)]

> Yes, I've tested this.
>
Cool.

> What do you mean by commit message? I've already written a bzr commit message,
> I think.

Probably you did, but the main commit message for bzr has to be additionally added to the merge request, otherwise the merge will fail.
It is the green "+" button above, which says "Set commit message".

[Iven Hsu (ivenvd)]

> Probably you did, but the main commit message for bzr has to be additionally
> added to the merge request, otherwise the merge will fail.
> It is the green "+" button above, which says "Set commit message".

Thanks. I'm not so familiar with launchpad. So if I want to resubmit the proposal, should I push to a new branch?

[MC Return (mc-return)]

>
> Thanks. I'm not so familiar with launchpad. So if I want to resubmit the
> proposal, should I push to a new branch?

No, that was already perfect. You do not need to push a new branch.

If you want to update your branch (with the whitespace fix I posted above, for example), simply make your changes locally, then "bzr commit" and then "bzr push" again. This will update this branch with your new commit.

See examples of this here:
https://code.launchpad.net/~mc-return/compiz/compiz.merge-thumbnail-improvements/+merge/170548

Workflow is like this:
First propose a branch, then get a review with improvement suggestions, implement and commit those, push again to update the merge request, ...

(If you have additional questions, just ask)

[lp:~ivenvd/compiz/compiz.fix_1193792]

3744. By Iven Hsu on 2013-06-23

Fix the coding-style issue with whitespace.

[MC Return (mc-return)]

Perfect. +1
Approve from me, but waiting for Sam to give this the final green light...
FYI: AFAIK trunk is frozen currently anyway, so do not worry if this might take a few days until it lands...

review: Approve

[Sam Spilsbury (smspillaz)]

review: Approve

[lp:~ivenvd/compiz/compiz.fix_1193792]

3745. By Iven Hsu on 2013-06-25

Move kdecorationbridge.h to the right place.

[Iven Hsu (ivenvd)]

Sorry, my fault. Mistakely added the header file to wrong folder. Should be fixed now.

[MC Return (mc-return)]

So you've tested this now and made sure you can run KDE 4.11 with Compiz as WM ?

[Iven Hsu (ivenvd)]

> So you've tested this now and made sure you can run KDE 4.11 with Compiz as WM
> ?

Yes.

[MC Return (mc-return)]

> > So you've tested this now and made sure you can run KDE 4.11 with Compiz as
> WM
> > ?
>
> Yes.

Approved :)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file 'kde/window-decorator-kde4/kdecorationbridge.h'
--- kde/window-decorator-kde4/kdecorationbridge.h	1970-01-01 00:00:00 +0000
+++ kde/window-decorator-kde4/kdecorationbridge.h	2013-06-25 07:12:24 +0000
@@ -0,0 +1,115 @@
+/*****************************************************************
+This file is part of the KDE project.
+
+Copyright (C) 2003 Lubos Lunak <[e-mail]>
+
+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 <QWidget>
+
+/**
+ * @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.
+ */
+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 QuickTileMode quickTileMode() 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 showApplicationMenu(const QPoint&) = 0;
+    virtual bool menuAvailable() const = 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;
+};
+
+class KDecorationBridgeUnstable
+    : public KDecorationBridge
+{
+public:
+    virtual bool compositingActive() const = 0;
+    virtual QRect transparentRect() const = 0;
+
+    // Window tabbing
+    using KDecorationBridge::caption;
+    virtual QString caption(int idx) const = 0;
+    virtual void closeTab(long id) = 0;
+    virtual void closeTabGroup() = 0;
+    virtual long currentTabId() const = 0;
+    using KDecorationBridge::icon;
+    virtual QIcon icon(int idx) const = 0;
+    virtual void setCurrentTab(long id) = 0;
+    using KDecorationBridge::showWindowMenu;
+    virtual void showWindowMenu(const QPoint& pos, long id) = 0;
+    virtual void tab_A_before_B(long A, long B) = 0;
+    virtual void tab_A_behind_B(long A, long B) = 0;
+    virtual int tabCount() const = 0;
+    virtual long tabId(int idx) const = 0;
+    virtual void untab(long id, const QRect& newGeom) = 0;
+    virtual WindowOperation buttonToWindowOperation(Qt::MouseButtons button) = 0;
+};
+
+#endif
 
=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2013-05-13 15:39:25 +0000
+++ kde/window-decorator-kde4/window.cpp	2013-06-25 07:12:24 +0000
@@ -226,6 +226,12 @@
     return wInfo.actionSupported (NET::ActionMax);
 }
 
+KDecoration::QuickTileMode
+KWD::Window::quickTileMode (void) const
+{
+    return QuickTileNone;
+}
+
 KDecoration::MaximizeMode
 KWD::Window::maximizeMode (void) const
 {
 
=== modified file 'kde/window-decorator-kde4/window.h'
--- kde/window-decorator-kde4/window.h	2012-11-29 02:37:19 +0000
+++ kde/window-decorator-kde4/window.h	2013-06-25 07:12:24 +0000
@@ -71,6 +71,7 @@
 	virtual bool isCloseable (void) const;
 	virtual bool isMaximizable (void) const;
 	virtual MaximizeMode maximizeMode (void) const;
+	virtual QuickTileMode quickTileMode (void) const;
 	virtual bool isMinimizable (void) const;
 	virtual bool providesContextHelp (void) const;
 	virtual int desktop (void) const;