Merge lp:~smspillaz/compiz-core/compiz-core.lim into lp:compiz-core

[Sam Spilsbury]

Adds support for Ubuntu's "locally integrated menu bars" into gtk-window-decorator.

No tests as of yet, but I'll try and write some for

showing/hiding
forcing them on/off
positions etc

soonish.

[Alan Griffiths (alan-griffiths)]

8 +#define GWD_SHOW_LOCAL_MENU (WNCK_WINDOW_ACTION_BELOW << 1)

No plausible reason for using a macro. In C++ constants (enum or unsigned int) are better as they respect scope rules. Also, should this be inside "#ifdef META_HAS_LOCAL_MENUS" conditional?

296 button_layout->right_buttons[2] = META_BUTTON_FUNCTION_CLOSE;
297
298 - for (i = 3; i < MAX_BUTTONS_PER_CORNER; i++)
299 + for (i = 4; i < MAX_BUTTONS_PER_CORNER; i++)
300 button_layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
301 }

I'm not sure what the magic number "3"->"4" is. But we now seem to miss 3 entirely. Is that correct?

[Sam Spilsbury (smspillaz)]

> 8 +#define GWD_SHOW_LOCAL_MENU (WNCK_WINDOW_ACTION_BELOW << 1)
>
> No plausible reason for using a macro. In C++ constants (enum or unsigned
> int) are better as they respect scope rules. Also, should this be inside
> "#ifdef META_HAS_LOCAL_MENUS" conditional?
>

Its C

>
> 296 button_layout->right_buttons[2] = META_BUTTON_FUNCTION_CLOSE;
> 297
> 298 - for (i = 3; i < MAX_BUTTONS_PER_CORNER; i++)
> 299 + for (i = 4; i < MAX_BUTTONS_PER_CORNER; i++)
> 300 button_layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
> 301 }
>
> I'm not sure what the magic number "3"->"4" is. But we now seem to miss 3
> entirely. Is that correct?

Its for initializing the array, though maybe thats wrong. Good find let me check

[Daniel van Vugt (vanvugt)]

Please resubmit for target branch lp:compiz-core (0.9.7)

review: Needs Resubmitting

[lp:~smspillaz/compiz-core/compiz-core.lim]

2987. By Sam Spilsbury on 2012-02-06

Show the flair in the right place

[Alan Griffiths (alan-griffiths)]

Looks better

review: Approve

[lp:~smspillaz/compiz-core/compiz-core.lim]

2988. By Sam Spilsbury on 2012-02-06

Use the right key

2989. By Sam Spilsbury on 2012-02-07

Use the correct key

[Sam Spilsbury (smspillaz)]

(More work needed to adopt to trevino;s changes)

[lp:~smspillaz/compiz-core/compiz-core.lim]

2990. By Sam Spilsbury on 2012-02-13

Merged from lp:compiz-core

[Daniel van Vugt (vanvugt)]

Fails to build ifndef META_HAS_LOCAL_MENUS

[ 0%] Building C object gtk/window-decorator/local-menus/CMakeFiles/gtk_window_decorator_local_menus.dir/src/local-menus.c.o
/home/dan/bzr/compiz-core/lim/gtk/window-decorator/local-menus/src/local-menus.c:36:1: error: ‘gwd_menu_mode_changed’ defined but not used [-Werror=unused-function]
/home/dan/bzr/compiz-core/lim/gtk/window-decorator/local-menus/src/local-menus.c:72:1: error: ‘on_local_menu_activated’ defined but not used [-Werror=unused-function]
cc1: all warnings being treated as errors

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

+ gboolean empty = g_strcmp0 (entry_id, "") == 0;

You can do the same with:
gboolean empty = (!entry_id || entry_id[0] == '\0');

[Alan Griffiths (alan-griffiths)]

If we're trying to be cryptic...

   gboolean empty = g_strcmp0 (entry_id, "") == 0;

can be written:

   gboolean empty = !entry_id || !*entry_id;

[Marco Trevisan (Treviño) (3v1n0)]

Ah, Sam remember to update the "EntryActivated" signal against the new signature s(iiuu).

[Sam Spilsbury (smspillaz)]

Yep, done

[lp:~smspillaz/compiz-core/compiz-core.lim]

2991. By Sam Spilsbury on 2012-02-14

Merged from lp:compiz-core

2992. By Sam Spilsbury on 2012-02-21

Merged from lp:compiz-core

2993. By Sam Spilsbury on 2012-02-21

Merge lp:compiz-core

2994. By Sam Spilsbury on 2012-02-21

Fix incorrect variant and initial button layout

2995. By Sam Spilsbury on 2012-02-21

Fix build without META_HAS_LOCAL_MENUS

2996. By Sam Spilsbury on 2012-02-22

Also ifdef the local menus tests

2997. By Sam Spilsbury on 2012-02-22

Don't run global setup or teardown functions if no local menus

2998. By Sam Spilsbury on 2012-02-24

Merge lp:compiz-core and allow alt-accelerator to open menus as well as reading the xprop
to determine if local menus are applicable

2999. By Sam Spilsbury on 2012-02-25

Fix memory error and menu button not showing

3000. By Sam Spilsbury on 2012-02-25

Fix placement of menus on alt-accelerator, remove debug messages

3001. By Sam Spilsbury on 2012-02-25

Fix build failure without META_HAS_LOCAL_MENUS

3002. By Sam Spilsbury on 2012-02-28

Fix a crash when trying to show the window menu on a non decorated window

3003. By Sam Spilsbury on 2012-02-28

Tell us if we have them

3004. By Sam Spilsbury on 2012-02-28

Merged lp:compiz-core

3005. By Sam Spilsbury on 2012-03-02

We also need to test the property too

3006. By Sam Spilsbury on 2012-03-02

Grab buttons too so that we can process motion events on the titlebar and
move the window instead.

Unmerged revisions

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2011-02-16 17:39:56 +0000
+++ gtk/window-decorator/CMakeLists.txt	2012-02-07 07:03:18 +0000
@@ -4,7 +4,10 @@
 	set (CMAKE_INSTALL_RPATH ${libdir})
     endif (COMPIZ_BUILD_WITH_RPATH)
 
+    add_subdirectory (local-menus)
+
     include_directories (
+	${CMAKE_CURRENT_SOURCE_DIR}/local-menus/src
 	${compiz_SOURCE_DIR}/include
 	${CMAKE_BINARY_DIR}/gtk
 	${GTK_WINDOW_DECORATOR_INCLUDE_DIRS}
@@ -63,6 +66,9 @@
     target_link_libraries (
 	gtk-window-decorator
 	decoration
+
+	gtk_window_decorator_local_menus
+
 	${GTK_WINDOW_DECORATOR_LIBRARIES}
 	${GCONF_LIBRARIES}
 	${DBUS_GLIB_LIBRARIES}

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2011-10-13 11:31:37 +0000
+++ gtk/window-decorator/decorator.c	2012-02-07 07:03:18 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "gtk-window-decorator.h"
+#include "local-menus.h"
 
 decor_frame_t *
 create_normal_frame (const gchar *type)
@@ -230,12 +231,16 @@
 void
 update_event_windows (WnckWindow *win)
 {
+#define GWD_SHOW_LOCAL_MENU (WNCK_WINDOW_ACTION_BELOW << 1) 
     Display *xdisplay;
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     gint    x0, y0, width, height, x, y, w, h;
     gint    i, j, k, l;
     gint    actions = d->actions;
 
+    if (gwd_window_should_have_local_menu (win))
+	d->actions |= GWD_SHOW_LOCAL_MENU;
+
     xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
     /* Get the geometry of the client */
@@ -298,11 +303,19 @@
 		XMapWindow (xdisplay, d->event_windows[i][j].window);
 		XMoveResizeWindow (xdisplay, d->event_windows[i][j].window,
 				   x, y, w, h);
+
+		BoxPtr box = &d->event_windows[i][j].pos;
+		box->x1  = x;
+		box->x2 = x + w;
+		box->y1 = y;
+		box->y2 = y + h;
 	    }
 	    /* No parent and no geometry - unmap all event windows */
 	    else if (!d->frame_window)
 	    {
 		XUnmapWindow (xdisplay, d->event_windows[i][j].window);
+
+		memset (&d->event_windows[i][j].pos, 0, sizeof (Box));
 	    }
 	}
     }
@@ -326,12 +339,18 @@
 	    WNCK_WINDOW_ACTION_STICK,
 	    WNCK_WINDOW_ACTION_UNSHADE,
 	    WNCK_WINDOW_ACTION_ABOVE,
-	    WNCK_WINDOW_ACTION_UNSTICK
-#else
-	    0,
-	    0,
-	    0,
-	    0,
+	    WNCK_WINDOW_ACTION_UNSTICK,
+#else
+	    0,
+	    0,
+	    0,
+	    0,
+	    0,
+#endif
+
+#ifdef META_HAS_LOCAL_MENUS
+	    GWD_SHOW_LOCAL_MENU
+#else
 	    0
 #endif
 
@@ -371,10 +390,17 @@
 	    Window win = d->button_windows[i].window;
 	    XMapWindow (xdisplay, win);
 	    XMoveResizeWindow (xdisplay, win, x, y, w, h);
+
+	    BoxPtr box = &d->button_windows[i].pos;
+	    box->x1  = x;
+	    box->x2 = x + w;
+	    box->y1 = y;
+	    box->y2 = y + h;
 	}
 	else if (!d->frame_window)
 	{
 	    XUnmapWindow (xdisplay, d->button_windows[i].window);
+	    memset (&d->button_windows[i].pos, 0, sizeof (Box));
 	}
     }
 

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2011-10-13 12:22:14 +0000
+++ gtk/window-decorator/events.c	2012-02-07 07:03:18 +0000
@@ -24,6 +24,16 @@
  */
 
 #include "gtk-window-decorator.h" 
+#include "local-menus.h"
+
+typedef struct _delayed_move_info
+{
+    WnckWindow *win;
+    int        x_root;
+    int        y_root;
+    unsigned int button;
+    unsigned int time;
+} delayed_move_info;
 
 void
 move_resize_window (WnckWindow *win,
@@ -65,8 +75,9 @@
     ev.xclient.data.l[3] = gtkwd_event->button;
     ev.xclient.data.l[4] = 1;
 
-    XUngrabPointer (xdisplay, gtkwd_event->time);
-    XUngrabKeyboard (xdisplay, gtkwd_event->time);
+    XAllowEvents (xdisplay, AsyncKeyboard | AsyncPointer, CurrentTime);
+    XUngrabPointer (xdisplay, CurrentTime);
+    XUngrabKeyboard (xdisplay, CurrentTime);
 
     XSendEvent (xdisplay, xroot, FALSE,
 		SubstructureRedirectMask | SubstructureNotifyMask,
@@ -75,6 +86,24 @@
     XSync (xdisplay, FALSE);
 }
 
+static gboolean
+move_resize_window_on_timeout (gpointer user_data)
+{
+    delayed_move_info *info = (delayed_move_info *) user_data;
+
+    decor_event event;
+    event.x = 0;
+    event.y = 0;
+    event.x_root = info->x_root;
+    event.y_root = info->y_root;
+    event.button = info->button;
+    event.window = wnck_window_get_xid (info->win);
+
+    move_resize_window (info->win, WM_MOVERESIZE_MOVE, &event);
+
+    return FALSE;
+}
+
 void
 common_button_event (WnckWindow *win,
 		     decor_event *gtkwd_event,
@@ -380,6 +409,73 @@
 }
 
 void
+on_local_menu_hidden (gpointer user_data)
+{
+    decor_t *d = (decor_t *) user_data;
+
+    d->button_states[BUTTON_WINDOW_MENU] &= ~PRESSED_EVENT_WINDOW;
+
+    queue_decor_draw (d);
+}
+
+void
+window_menu_button_event (WnckWindow *win,
+			  decor_event *gtkwd_event,
+			  decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_WINDOW_MENU];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_WINDOW_MENU, 1, _("Window Menu"));
+
+    switch (gtkwd_type) {
+    case GButtonPress:
+	    if (gtkwd_event->button == 1)
+	    {
+		if (d->button_states[BUTTON_WINDOW_MENU] & BUTTON_EVENT_ACTION_STATE)
+		{
+		    delayed_move_info *info = g_new0 (delayed_move_info, 1);
+
+		    info->button = gtkwd_event->button;
+		    info->time   = gtkwd_event->time;
+		    info->win    = win;
+		    info->x_root = gtkwd_event->x_root;
+		    info->y_root = gtkwd_event->y_root;
+
+		    gwd_prepare_show_local_menu ((start_move_window_cb) move_resize_window_on_timeout, (gpointer) info);
+		}
+	    }
+	    break;
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state)
+	    {
+		int win_x, win_y;
+		int box_x = d->button_windows[BUTTON_WINDOW_MENU].pos.x1;
+
+		wnck_window_get_geometry (win, &win_x, &win_y, NULL, NULL);
+
+		int x = win_x + box_x;
+		int y = win_y + d->context->extents.top;
+
+		gwd_show_local_menu (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
+				     wnck_window_get_xid (win),
+				     x, y,
+				     box_x,
+				     d->context->extents.top,
+				     gtkwd_event->button,
+				     gtkwd_event->time,
+				     (show_window_menu_hidden_cb) on_local_menu_hidden,
+				     (gpointer) d);
+	    }
+	break;
+    default:
+	break;
+    }
+}
+
+void
 handle_title_button_event (WnckWindow   *win,
 			   int          action,
 			   decor_event *gtkwd_event)
@@ -485,7 +581,17 @@
 
 	    restack_window (win, Above);
 
-	    move_resize_window (win, WM_MOVERESIZE_MOVE, gtkwd_event);
+	    delayed_move_info *info = g_new0 (delayed_move_info, 1);
+
+	    info->x_root = gtkwd_event->x_root;
+	    info->y_root = gtkwd_event->y_root;
+	    info->button = gtkwd_event->button;
+	    info->time = gtkwd_event->time;
+	    info->win   = win;
+
+	    move_resize_window_on_timeout ((gpointer) info);
+
+	    g_free (info);
 	}
     }
     else if (gtkwd_event->button == 2)

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2011-10-13 12:22:14 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2012-02-07 07:03:18 +0000
@@ -328,7 +328,8 @@
 #define BUTTON_UNSHADE 7
 #define BUTTON_UNABOVE 8
 #define BUTTON_UNSTICK 9
-#define BUTTON_NUM     10
+#define BUTTON_WINDOW_MENU 10
+#define BUTTON_NUM     11
 
 struct _pos {
     int x, y, w, h;
@@ -1013,6 +1014,11 @@
 		      decor_event_type gtkwd_type);
 
 void
+window_menu_button_event (WnckWindow *win,
+			  decor_event *gtkwd_event,
+			  decor_event_type gtkwd_type);
+
+void
 handle_title_button_event (WnckWindow   *win,
 			   int          action,
 			   decor_event *gtkwd_event);

=== added directory 'gtk/window-decorator/local-menus'
=== added file 'gtk/window-decorator/local-menus/CMakeLists.txt'
--- gtk/window-decorator/local-menus/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/CMakeLists.txt	2012-02-07 07:03:18 +0000
@@ -0,0 +1,60 @@
+pkg_check_modules(
+  LOCAL_MENUS
+  REQUIRED
+  glib-2.0 gio-2.0 libwnck-1.0 gtk+-2.0>=2.18.0
+)
+
+INCLUDE_DIRECTORIES(  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+  
+  ${compiz_SOURCE_DIR}/gtk/window-decorator
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${LOCAL_MENUS_INCLUDE_DIRS}
+  ${METACITY_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${LOCAL_MENUS_LIBRARY_DIRS}) 
+
+SET( 
+  PUBLIC_HEADERS 
+)
+
+SET( 
+  PRIVATE_HEADERS
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/local-menus.h 
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/local-menus.c
+)
+
+ADD_LIBRARY( 
+  gtk_window_decorator_local_menus STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+IF (COMPIZ_BUILD_TESTING)
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+ENDIF (COMPIZ_BUILD_TESTING)
+
+SET_TARGET_PROPERTIES(
+  gtk_window_decorator_local_menus PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES( 
+  gtk_window_decorator_local_menus
+  
+  ${LOCAL_MENUS_LIBRARIES}
+)
+

=== added directory 'gtk/window-decorator/local-menus/include'
=== added directory 'gtk/window-decorator/local-menus/src'
=== added file 'gtk/window-decorator/local-menus/src/local-menus.c'
--- gtk/window-decorator/local-menus/src/local-menus.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/src/local-menus.c	2012-02-07 07:03:18 +0000
@@ -0,0 +1,270 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "local-menus.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define GLOBAL 0
+#define LOCAL 1
+
+gint menu_mode = GLOBAL;
+
+static void
+gwd_menu_mode_changed (GSettings *settings,
+		       gchar     *key,
+		       gpointer  user_data)
+{
+    menu_mode = g_settings_get_enum (settings, "menu-mode");
+}
+
+active_local_menu *active_menu;
+pending_local_menu *pending_menu;
+
+gboolean
+gwd_window_should_have_local_menu (WnckWindow *win)
+{
+#ifdef META_HAS_LOCAL_MENUS
+    const gchar * const *schemas = g_settings_list_schemas ();
+    static GSettings *lim_settings = NULL;
+    while (*schemas != NULL && !lim_settings)
+    {
+	if (g_str_equal (*schemas, "com.canonical.indicator.appmenu"))
+	{
+	    lim_settings = g_settings_new ("com.canonical.indicator.appmenu");
+	    menu_mode = g_settings_get_enum (lim_settings, "menu-mode");
+	    g_signal_connect (lim_settings, "changed::menu-mode", G_CALLBACK (gwd_menu_mode_changed), NULL);
+	    break;
+	}
+	++schemas;
+    }
+
+    if (lim_settings)
+	return menu_mode;
+#endif
+
+    return FALSE;
+}
+
+static void
+on_local_menu_activated (GDBusProxy *proxy,
+			 gchar      *sender_name,
+			 gchar      *signal_name,
+			 GVariant   *parameters,
+			 gpointer   user_data)
+{
+#ifdef META_HAS_LOCAL_MENUS
+    if (g_strcmp0 (signal_name, "EntryActivated") == 0)
+    {
+	gchar *entry_id = NULL;
+
+	g_variant_get (parameters, "(s)", &entry_id, NULL);
+
+	gboolean empty = g_strcmp0 (entry_id, "")  == 0;
+
+	if (empty)
+	{
+	    show_local_menu_data *d = (show_local_menu_data *) user_data;
+
+	    (*d->cb) (d->user_data);
+
+	    g_signal_handlers_disconnect_by_func (d->proxy, on_local_menu_activated, d);
+
+	    g_object_unref (d->proxy);
+	    g_object_unref (d->conn);
+
+	    if (active_menu)
+	    {
+		g_free (active_menu);
+		active_menu = NULL;
+	    }
+	}
+    }
+#endif
+}
+
+gboolean
+gwd_move_window_instead (gpointer user_data)
+{
+    (*pending_menu->cb) (pending_menu->user_data);
+    g_free (pending_menu->user_data);
+    g_free (pending_menu);
+    pending_menu = NULL;
+    return FALSE;
+}
+
+void
+gwd_prepare_show_local_menu (start_move_window_cb start_move_window,
+			     gpointer user_data_start_move_window)
+{
+    if (pending_menu)
+    {
+	g_source_remove (pending_menu->move_timeout_id);
+	g_free (pending_menu->user_data);
+	g_free (pending_menu);
+	pending_menu = NULL;
+    }
+
+    pending_menu = g_new0 (pending_local_menu, 1);
+    pending_menu->cb = start_move_window;
+    pending_menu->user_data = user_data_start_move_window;
+    pending_menu->move_timeout_id = g_timeout_add (150, gwd_move_window_instead, pending_menu);
+}
+
+void
+gwd_show_local_menu (Display *xdisplay,
+		     Window  frame_xwindow,
+		     int      x,
+		     int      y,
+		     int      x_win,
+		     int      y_win,
+		     int      button,
+		     guint32  timestamp,
+		     show_window_menu_hidden_cb cb,
+		     gpointer user_data_show_window_menu)
+{
+    if (pending_menu)
+    {
+	g_source_remove (pending_menu->move_timeout_id);
+	g_free (pending_menu->user_data);
+	g_free (pending_menu);
+	pending_menu = NULL;
+    }
+
+#ifdef META_HAS_LOCAL_MENUS
+    GError          *error = NULL;
+    GDBusConnection *conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+    gint            x_out, y_out;
+    guint           width, height;
+
+    XUngrabPointer (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), CurrentTime);
+    XUngrabKeyboard (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), CurrentTime);
+    XSync (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), FALSE);
+
+    if (!conn)
+    {
+	g_print ("error getting connection: %s\n", error->message);
+	return;
+    }
+
+    GDBusProxy      *proxy = g_dbus_proxy_new_sync (conn, 0, NULL, "com.canonical.Unity.Panel.Service",
+					   "/com/canonical/Unity/Panel/Service",
+					   "com.canonical.Unity.Panel.Service",
+					   NULL, &error);
+
+    if (proxy)
+    {
+	GVariant *message = g_variant_new ("(uiiu)", frame_xwindow, x, y, time);
+	GVariant *reply = g_dbus_proxy_call_sync (proxy, "ShowAppMenu", message, 0, 500, NULL, &error);
+	if (error)
+	{
+	    g_print ("error calling ShowAppMenu: %s\n", error->message);
+	    g_object_unref (proxy);
+	    g_object_unref (conn);
+	    return;
+	}
+
+	show_local_menu_data *data = g_new0 (show_local_menu_data, 1);
+	g_variant_get (reply, "(iiuu)", &x_out, &y_out, &width, &height, NULL);
+
+	if (active_menu)
+	    g_free (active_menu);
+
+	active_menu = g_new0 (active_local_menu, 1);
+
+	active_menu->rect.x = x_out - (x - x_win);
+	active_menu->rect.y = y_out - (x - y_win);
+	active_menu->rect.width = width;
+	active_menu->rect.height = height;
+
+	data->conn = g_object_ref (conn);
+	data->proxy = g_object_ref (proxy);
+	data->cb = cb;
+	data->user_data = user_data_show_window_menu;
+
+	g_signal_connect (proxy, "g-signal", G_CALLBACK (on_local_menu_activated), data);
+
+	g_object_unref (conn);
+	g_object_unref (proxy);
+
+	return;
+    }
+    else
+    {
+	g_print ("error getting proxy: %s\n", error->message);
+    }
+
+    g_object_unref (conn);
+#endif
+}
+
+void
+force_local_menus_on (WnckWindow       *win,
+		      MetaButtonLayout *button_layout)
+{
+#ifdef META_HAS_LOCAL_MENUS
+    if (gwd_window_should_have_local_menu (win))
+    {
+	if (button_layout->left_buttons[0] != META_BUTTON_FUNCTION_LAST)
+	{
+	    unsigned int i = 0;
+	    for (; i < MAX_BUTTONS_PER_CORNER; i++)
+	    {
+		if (button_layout->left_buttons[i] == META_BUTTON_FUNCTION_WINDOW_MENU)
+		    break;
+		else if (button_layout->left_buttons[i] == META_BUTTON_FUNCTION_LAST)
+		{
+		    if ((i + 1) < MAX_BUTTONS_PER_CORNER)
+		    {
+			button_layout->left_buttons[i + 1] = META_BUTTON_FUNCTION_LAST;
+			button_layout->left_buttons[i] = META_BUTTON_FUNCTION_WINDOW_MENU;
+			break;
+		    }
+		}
+	    }
+	}
+	if (button_layout->right_buttons[0] != META_BUTTON_FUNCTION_LAST)
+	{
+	    unsigned int i = 0;
+	    for (; i < MAX_BUTTONS_PER_CORNER; i++)
+	    {
+		if (button_layout->right_buttons[i] == META_BUTTON_FUNCTION_WINDOW_MENU)
+		    break;
+		else if (button_layout->right_buttons[i] == META_BUTTON_FUNCTION_LAST)
+		{
+		    if ((i + 1) < MAX_BUTTONS_PER_CORNER)
+		    {
+			button_layout->right_buttons[i + 1] = META_BUTTON_FUNCTION_LAST;
+			button_layout->right_buttons[i] = META_BUTTON_FUNCTION_WINDOW_MENU;
+			break;
+		    }
+		}
+	    }
+	}
+    }
+#endif
+}
+
+

=== added file 'gtk/window-decorator/local-menus/src/local-menus.h'
--- gtk/window-decorator/local-menus/src/local-menus.h	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/src/local-menus.h	2012-02-07 07:03:18 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <glib.h>
+#include <gio/gio.h>
+#ifndef WNCK_I_KNOW_THIS_IS_UNSTABLE
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#endif
+#include <libwnck/libwnck.h>
+#include <libwnck/window-action-menu.h>
+#include <metacity-private/theme.h>
+
+typedef void (*show_window_menu_hidden_cb) (gpointer);
+typedef void (*start_move_window_cb) (gpointer);
+
+typedef struct _pending_local_menu
+{
+    gint         move_timeout_id;
+    gpointer     user_data;
+    start_move_window_cb cb;
+} pending_local_menu;
+
+typedef struct _active_local_menu
+{
+    GdkRectangle rect;
+} active_local_menu;
+
+extern active_local_menu *active_menu;
+
+typedef struct _show_local_menu_data
+{
+    GDBusConnection *conn;
+    GDBusProxy      *proxy;
+    show_window_menu_hidden_cb cb;
+    gpointer        user_data;
+} show_local_menu_data;
+
+gboolean
+gwd_window_should_have_local_menu (WnckWindow *win);
+
+void
+force_local_menus_on (WnckWindow       *win,
+		      MetaButtonLayout *layout);
+
+/* Button Down */
+void
+gwd_prepare_show_local_menu (start_move_window_cb start_move_window,
+			     gpointer user_data_start_move_window);
+
+/* Button Up */
+void
+gwd_show_local_menu (Display *xdisplay,
+		     Window  frame_xwindow,
+		     int      x,
+		     int      y,
+		     int      x_win,
+		     int      y_win,
+		     int      button,
+		     guint32  timestamp,
+		     show_window_menu_hidden_cb cb,
+		     gpointer user_data_show_window_menu);
+#ifdef __cplusplus
+}
+#endif

=== added directory 'gtk/window-decorator/local-menus/tests'
=== added file 'gtk/window-decorator/local-menus/tests/CMakeLists.txt'
--- gtk/window-decorator/local-menus/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/tests/CMakeLists.txt	2012-02-07 07:03:18 +0000
@@ -0,0 +1,3 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+add_subdirectory (check_local_menu_on_off)
+add_subdirectory (force_local_menu_on)

=== added directory 'gtk/window-decorator/local-menus/tests/check_local_menu_on_off'
=== added file 'gtk/window-decorator/local-menus/tests/check_local_menu_on_off/CMakeLists.txt'
--- gtk/window-decorator/local-menus/tests/check_local_menu_on_off/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/tests/check_local_menu_on_off/CMakeLists.txt	2012-02-07 07:03:18 +0000
@@ -0,0 +1,21 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+		     ${compiz_SOURCE_DIR}/gtk/window-decorator/local-menus/tests
+		     ${compiz_SOURCE_DIR}/gtk/window-decorator
+		     ${compiz_SOURCE_DIR}/gtk/window-decorator/local-menus/src)
+
+add_executable( 
+  gtk_window_decorator_check_local_menu_on_off_test
+  
+  ${CMAKE_CURRENT_SOURCE_DIR}/test-local-menu-on-off.cpp
+)
+
+target_link_libraries( 
+  gtk_window_decorator_check_local_menu_on_off_test
+  
+  gtk_window_decorator_local_menus
+  
+  ${GTEST_BOTH_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+)
+
+add_test (gtk_window_decorator_local_menus_on_off gtk_window_decorator_check_local_menu_on_off_test)

=== added directory 'gtk/window-decorator/local-menus/tests/check_local_menu_on_off/check_local_menu_on_off'
=== added directory 'gtk/window-decorator/local-menus/tests/check_local_menu_on_off/check_local_menu_on_off/CMakeFiles'
=== added file 'gtk/window-decorator/local-menus/tests/check_local_menu_on_off/test-local-menu-on-off.cpp'
--- gtk/window-decorator/local-menus/tests/check_local_menu_on_off/test-local-menu-on-off.cpp	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/tests/check_local_menu_on_off/test-local-menu-on-off.cpp	2012-02-07 07:03:18 +0000
@@ -0,0 +1,20 @@
+#include "test-local-menu.h"
+
+#define GLOBAL 0
+#define LOCAL 1
+
+TEST_F (GtkWindowDecoratorTestLocalMenu, TestOn)
+{
+    g_settings_set_enum (getSettings (), "menu-mode", LOCAL);
+    gboolean result = gwd_window_should_have_local_menu (getWindow ());
+
+    EXPECT_TRUE (result);
+}
+
+TEST_F (GtkWindowDecoratorTestLocalMenu, TestOff)
+{
+    g_settings_set_enum (getSettings (), "menu-mode", GLOBAL);
+    gboolean result = gwd_window_should_have_local_menu (getWindow ());
+
+    EXPECT_FALSE (result);
+}

=== added directory 'gtk/window-decorator/local-menus/tests/force_local_menu_on'
=== added file 'gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeLists.txt'
--- gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeLists.txt	2012-02-07 07:03:18 +0000
@@ -0,0 +1,21 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+		     ${compiz_SOURCE_DIR}/gtk/window-decorator/local-menus/tests
+		     ${compiz_SOURCE_DIR}/gtk/window-decorator
+		     ${compiz_SOURCE_DIR}/gtk/window-decorator/local-menus/src)
+
+add_executable( 
+  gtk_window_decorator_force_local_menu_on_test
+  
+  ${CMAKE_CURRENT_SOURCE_DIR}/test-force-local-menu-on.cpp
+)
+
+target_link_libraries( 
+  gtk_window_decorator_force_local_menu_on_test
+  
+  gtk_window_decorator_local_menus
+  
+  ${GTEST_BOTH_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+)
+
+add_test (gtk_window_decorator_force_local_menu_on gtk_window_decorator_force_local_menu_on_test)

=== added file 'gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp'
--- gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp	2012-02-07 07:03:18 +0000
@@ -0,0 +1,70 @@
+#include "test-local-menu.h"
+#include <cstring>
+
+#define GLOBAL 0
+#define LOCAL 1
+
+namespace
+{
+    void initializeMetaButtonLayout (MetaButtonLayout *layout)
+    {
+	memset (layout, 0, sizeof (MetaButtonLayout));
+
+	unsigned int i;
+
+	for (i = 0; i < MAX_BUTTONS_PER_CORNER; i++)
+	{
+	    layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
+	    layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
+	}
+    }
+}
+
+class GtkWindowDecoratorTestLocalMenuLayout :
+    public GtkWindowDecoratorTestLocalMenu
+{
+    public:
+
+	MetaButtonLayout * getLayout () { return &mLayout; }
+
+	virtual void SetUp ()
+	{
+	    GtkWindowDecoratorTestLocalMenu::SetUp ();
+	    ::initializeMetaButtonLayout (&mLayout);
+	    g_settings_set_enum (getSettings (), "menu-mode", LOCAL);
+	}
+
+    private:
+
+	MetaButtonLayout mLayout;
+};
+
+TEST_F (GtkWindowDecoratorTestLocalMenuLayout, TestForceNoButtonsSet)
+{
+    force_local_menus_on (getWindow (), getLayout ());
+
+    EXPECT_EQ (getLayout ()->right_buttons[0], META_BUTTON_FUNCTION_LAST);
+    EXPECT_EQ (getLayout ()->left_buttons[0], META_BUTTON_FUNCTION_LAST);
+}
+
+TEST_F (GtkWindowDecoratorTestLocalMenuLayout, TestForceNoCloseButtonSet)
+{
+    getLayout ()->right_buttons[0] = META_BUTTON_FUNCTION_CLOSE;
+
+    force_local_menus_on (getWindow (), getLayout ());
+
+    EXPECT_EQ (getLayout ()->right_buttons[1], META_BUTTON_FUNCTION_WINDOW_MENU);
+    EXPECT_EQ (getLayout ()->left_buttons[0], META_BUTTON_FUNCTION_LAST);
+}
+
+TEST_F (GtkWindowDecoratorTestLocalMenuLayout, TestForceNoCloseMinimizeMaximizeButtonSet)
+{
+    getLayout ()->left_buttons[0] = META_BUTTON_FUNCTION_CLOSE;
+    getLayout ()->left_buttons[1] = META_BUTTON_FUNCTION_CLOSE;
+    getLayout ()->left_buttons[2] = META_BUTTON_FUNCTION_CLOSE;
+
+    force_local_menus_on (getWindow (), getLayout ());
+
+    EXPECT_EQ (getLayout ()->right_buttons[0], META_BUTTON_FUNCTION_LAST);
+    EXPECT_EQ (getLayout ()->left_buttons[3], META_BUTTON_FUNCTION_WINDOW_MENU);
+}

=== added directory 'gtk/window-decorator/local-menus/tests/show_hide_menu'
=== added file 'gtk/window-decorator/local-menus/tests/test-local-menu.h'
--- gtk/window-decorator/local-menus/tests/test-local-menu.h	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/local-menus/tests/test-local-menu.h	2012-02-07 07:03:18 +0000
@@ -0,0 +1,48 @@
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include "local-menus.h"
+#include <X11/Xlib.h>
+#include <gio/gio.h>
+
+class GtkWindowDecoratorTestLocalMenu :
+    public ::testing::Test
+{
+    public:
+
+	WnckWindow * getWindow () { return mWindow; }
+	GSettings  * getSettings () { return mSettings; }
+
+	virtual void SetUp ()
+	{
+	    gtk_init (NULL, NULL);
+
+	    mXDisplay = XOpenDisplay (NULL);
+	    mXWindow = XCreateSimpleWindow (mXDisplay, DefaultRootWindow (mXDisplay), 0, 0, 100, 100, 0, 0, 0);
+
+	    XMapRaised (mXDisplay, mXWindow);
+
+	    XFlush (mXDisplay);
+
+	    while (g_main_context_iteration (g_main_context_default (), FALSE));
+
+	    mWindow = wnck_window_get (mXWindow);
+
+	    g_setenv("GSETTINGS_BACKEND", "memory", true);
+	    mSettings = g_settings_new ("com.canonical.indicator.appmenu");
+	}
+
+	virtual void TearDown ()
+	{
+	    XDestroyWindow (mXDisplay, mXWindow);
+	    XCloseDisplay (mXDisplay);
+
+	    g_object_unref (mSettings);
+	}
+
+    private:
+
+	WnckWindow *mWindow;
+	Window     mXWindow;
+	Display    *mXDisplay;
+	GSettings *mSettings;
+};

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2012-01-12 06:48:58 +0000
+++ gtk/window-decorator/metacity.c	2012-02-07 07:03:18 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "gtk-window-decorator.h"
+#include "local-menus.h"
 
 #ifdef USE_METACITY
 
@@ -488,6 +489,8 @@
 	    button_layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
     }
 
+    force_local_menus_on (d->win, button_layout);
+
     *flags = 0;
 
     if (d->actions & WNCK_WINDOW_ACTION_CLOSE)
@@ -558,6 +561,15 @@
     else
 	clip->height = d->border_layout.left.y2 - d->border_layout.left.y1;
 
+    memset (fgeom, 0, sizeof (MetaFrameGeometry));
+
+#ifdef META_HAS_LOCAL_MENUS
+
+    if (d->layout)
+	fgeom->text_layout = g_object_ref (d->layout);
+
+#endif
+
     meta_theme_calc_geometry (theme,
 			      frame_type,
 			      d->frame->text_height,
@@ -567,6 +579,15 @@
 			      button_layout,
 			      fgeom);
 
+#ifdef META_HAS_LOCAL_MENUS
+
+    if (d->layout)
+	g_object_unref (fgeom->text_layout);
+
+    fgeom->text_layout = NULL;
+
+#endif
+
     clip->width  += left_width + right_width;
     clip->height += top_height + bottom_height;
 }
@@ -601,6 +622,11 @@
     GdkColor	      bg_color;
     double	      bg_alpha;
 
+    memset (&button_layout, 0, sizeof (MetaButtonLayout));
+
+    for (i = 0; i < MAX_BUTTONS_PER_CORNER; i++)
+	button_layout.left_buttons[i] = button_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
+
     if (!d->pixmap || !d->picture)
 	return;
 
@@ -675,6 +701,9 @@
 
     size = MAX (fgeom.top_height, fgeom.bottom_height);
 
+    if (active_menu)
+	g_object_set_data (G_OBJECT (style_window), "local_menu_rect", &active_menu->rect);
+
     if (rect.width && size)
     {
 	XRenderPictFormat *format;
@@ -899,6 +928,9 @@
 	XRenderFreePicture (xdisplay, src);
     }
 
+    if (active_menu)
+	g_object_set_data (G_OBJECT (style_window), "local_menu_rect", NULL);
+
     copy_to_front_buffer (d);
 
     if (d->frame_window)
@@ -1078,6 +1110,15 @@
 	break;
 #endif
 
+#ifdef META_HAS_LOCAL_MENUS
+    case BUTTON_WINDOW_MENU:
+	if (!meta_button_present (&button_layout, META_BUTTON_FUNCTION_WINDOW_MENU))
+	    return FALSE;
+
+	space = &fgeom.window_menu_rect;
+	break;
+#endif
+
     default:
 	return FALSE;
     }
@@ -1266,6 +1307,8 @@
     MetaTheme	      *theme;
     GdkRectangle      clip;
 
+    memset (&fgeom, 0, sizeof (MetaFrameGeometry));
+
     theme = meta_theme_get_current ();
 
     meta_get_decoration_geometry (d, theme, &flags, &fgeom, &button_layout,
@@ -1490,6 +1533,11 @@
 	return META_BUTTON_FUNCTION_UNSTICK;
 #endif
 
+#ifdef META_HAS_LOCAL_MENUS
+    else if (strcmp (str, "window_menu") == 0)
+	return META_BUTTON_FUNCTION_WINDOW_MENU;
+#endif
+
     else
 	return META_BUTTON_FUNCTION_LAST;
 }

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2011-10-13 09:53:38 +0000
+++ gtk/window-decorator/wnck.c	2012-02-07 07:03:18 +0000
@@ -727,7 +727,8 @@
 	stick_button_event,
 	unshade_button_event,
 	unabove_button_event,
-	unstick_button_event
+	unstick_button_event,
+	window_menu_button_event
     };
 
     d = calloc (1, sizeof (decor_t));