Merge lp:~ivenvd/compiz/compiz.fix_1082265 into lp:compiz/0.9.9

[Iven Hsu]

Add appmenu support for KWD. (LP: #1082265)

[Daniel van Vugt (vanvugt)]

I'm not going to test KDE, but it doesn't break anything Ubuntu cares about with GTK at least.

review: Approve

=== modified file 'kde/window-decorator-kde4/decorator.cpp'
--- kde/window-decorator-kde4/decorator.cpp	2012-09-07 22:37:20 +0000
+++ kde/window-decorator-kde4/decorator.cpp	2012-11-29 03:30:25 +0000
@@ -61,6 +61,10 @@
 #define SHADOW_COLOR_GREEN 0x0000
 #define SHADOW_COLOR_BLUE  0x0000
 
+static const char *KDED_SERVICE = "org.kde.kded";
+static const char *KDED_APPMENU_PATH = "/modules/appmenu";
+static const char *KDED_INTERFACE = "org.kde.kded";
+
 int    blurType = BLUR_TYPE_NONE;
 
 decor_shadow_t *KWD::Decorator::mNoBorderShadow = 0;
@@ -166,6 +170,16 @@
 				  CompositeRedirectManual);
 
     XMapWindow (QX11Info::display (), mCompositeWindow);
+
+    QDBusConnection dbus = QDBusConnection::sessionBus ();
+    dbus.connect (KDED_SERVICE, KDED_APPMENU_PATH, KDED_INTERFACE, "showRequest",
+		 this, SIGNAL (showRequest (qulonglong)));
+    dbus.connect (KDED_SERVICE, KDED_APPMENU_PATH, KDED_INTERFACE, "menuAvailable",
+		 this, SLOT (menuAvailable (qulonglong)));
+    dbus.connect (KDED_SERVICE, KDED_APPMENU_PATH, KDED_INTERFACE, "clearMenus",
+		 this, SLOT (clearMenus ()));
+    dbus.connect (KDED_SERVICE, KDED_APPMENU_PATH, KDED_INTERFACE, "menuHidden",
+		 this, SIGNAL (menuHidden ()));
 }
 
 KWD::Decorator::~Decorator (void)
@@ -790,6 +804,9 @@
 
 	    client->updateFrame (frame);
 	}
+
+	if (mWindowsMenu.removeOne (id))
+	    mClients[id]->setAppMenuAvailable ();
     }
     else
     {
@@ -1002,3 +1019,38 @@
 	mSwitcher = new Switcher (mCompositeWindow, win);
     }
 }
+
+void
+KWD::Decorator::showRequest (qulonglong id)
+{
+    if (mClients.contains (id))
+	mClients[id]->emitShowRequest ();
+}
+
+void
+KWD::Decorator::menuAvailable (qulonglong id)
+{
+    if (mClients.contains (id))
+	mClients[id]->setAppMenuAvailable ();
+    else
+	mWindowsMenu.append (id);
+}
+
+void
+KWD::Decorator::clearMenus ()
+{
+    QMap < WId, KWD::Window * >::ConstIterator it;
+
+    for (it = mClients.constBegin (); it != mClients.constEnd (); it++)
+	it.value ()->setAppMenuUnavailable ();
+
+    mWindowsMenu.clear ();
+}
+
+void
+KWD::Decorator::menuHidden (qulonglong id)
+{
+    if (mClients.contains (id))
+	mClients[id]->emitMenuHidden ();
+}
+

=== modified file 'kde/window-decorator-kde4/decorator.h'
--- kde/window-decorator-kde4/decorator.h	2012-09-07 22:37:20 +0000
+++ kde/window-decorator-kde4/decorator.h	2012-11-29 03:30:25 +0000
@@ -163,6 +163,11 @@
 
 	void plasmaThemeChanged ();
 
+	void showRequest (qulonglong wid);
+	void menuAvailable (qulonglong wid);
+	void menuHidden (qulonglong wid);
+	void clearMenus ();
+
     private:
 	static PluginManager *mPlugins;
 	static KWD::Options *mOptions;
@@ -183,6 +188,8 @@
 
 	Switcher *mSwitcher;
 
+	QList<WId> mWindowsMenu;
+
         static KWD::Decorator *mSelf; /* XXX: Remove */
     };
 }

=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2012-11-26 07:13:04 +0000
+++ kde/window-decorator-kde4/window.cpp	2012-11-29 03:30:25 +0000
@@ -60,8 +60,16 @@
 #include <QStyle>
 #include <QPainter>
 
+#include <QDBusMessage>
+#include <QDBusConnection>
+#include <QDBusPendingCall>
+
 #include "paintredirector.h"
 
+static const char *KDED_SERVICE = "org.kde.kded";
+static const char *KDED_APPMENU_PATH = "/modules/appmenu";
+static const char *KDED_INTERFACE = "org.kde.kded";
+
 KWD::Window::Window (WId  parentId,
 		     WId  clientId,
 		     WId  frame,
@@ -80,6 +88,7 @@
     mAdvancedMenu (0),
     mOpacityMenu (0),
     mDesktopMenu (0),
+    mAppMenuAvailable (false),
     mProcessKiller (this),
     mKeys (this),
     mResizeOpAction (0),
@@ -557,12 +566,31 @@
 void
 KWD::Window::showApplicationMenu (const QPoint &p)
 {
+    QList<QVariant> args = QList<QVariant> () << p.x () << p.y () << qulonglong (mClientId);
+    QDBusMessage method = QDBusMessage::createMethodCall (
+		    KDED_SERVICE, KDED_APPMENU_PATH, KDED_INTERFACE, "showMenu");
+    method.setArguments (args);
+    QDBusConnection::sessionBus ().asyncCall (method);
 }
 
 bool
 KWD::Window::menuAvailable () const
 {
-    return false;
+    return mAppMenuAvailable;
+}
+
+void
+KWD::Window::setAppMenuAvailable ()
+{
+    mAppMenuAvailable = true;
+    emit appMenuAvailable ();
+}
+
+void
+KWD::Window::setAppMenuUnavailable ()
+{
+    mAppMenuAvailable = false;
+    emit appMenuUnavailable ();
 }
 
 KWD::Options::MouseCommand
@@ -932,15 +960,17 @@
 void
 KWD::Window::createDecoration (void)
 {
-    KDecoration *decor;
-
     if (mDecor)
 	return;
 
-    decor = Decorator::pluginManager ()->createDecoration (this);
-    decor->init ();
-
-    mDecor = decor;
+    mDecor = Decorator::pluginManager ()->createDecoration (this);
+
+    connect(this, SIGNAL(showRequest()), mDecor, SIGNAL(showRequest()));
+    connect(this, SIGNAL(appMenuAvailable()), mDecor, SIGNAL(appMenuAvailable()));
+    connect(this, SIGNAL(appMenuUnavailable()), mDecor, SIGNAL(appMenuUnavailable()));
+    connect(this, SIGNAL(menuHidden()), mDecor, SIGNAL(menuHidden()));
+
+    mDecor->init ();
     mDecor->widget ()->installEventFilter (this);
 
     if (mType != Normal2D)
@@ -952,7 +982,7 @@
 
     mPadding.top = mPadding.bottom = mPadding.left = mPadding.right = 0;
 
-    if (KDecorationUnstable *deco2 = dynamic_cast<KDecorationUnstable*>(decor))
+    if (KDecorationUnstable *deco2 = dynamic_cast<KDecorationUnstable*>(mDecor))
         deco2->padding (mPadding.left, mPadding.right, mPadding.top, mPadding.bottom);
 
     if (mType == Normal2D && mFrame)

=== modified file 'kde/window-decorator-kde4/window.h'
--- kde/window-decorator-kde4/window.h	2012-11-26 07:13:04 +0000
+++ kde/window-decorator-kde4/window.h	2012-11-29 03:30:25 +0000
@@ -214,6 +214,19 @@
 	
 	virtual bool eventFilter (QObject *o, QEvent *e);
 
+	void emitShowRequest ()
+	{
+	    emit showRequest ();
+	}
+
+	void emitMenuHidden ()
+	{
+	    emit menuHidden ();
+	}
+
+	void setAppMenuAvailable ();
+	void setAppMenuUnavailable ();
+
     private:
 	void createDecoration (void);
 	void resizeDecoration (bool force = false);
@@ -239,6 +252,12 @@
 
 	void decorRepaintPending ();
 
+    signals:
+	void showRequest ();
+	void appMenuAvailable ();
+	void appMenuUnavailable ();
+	void menuHidden ();
+
     private:
 	Type mType;
 	WId mParentId;
@@ -268,6 +287,8 @@
 	QMenu *mDesktopMenu;
 	unsigned long mState;
 
+	bool mAppMenuAvailable;
+
 	QProcess mProcessKiller;
 	KActionCollection mKeys;
 	bool mFakeRelease;