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.

[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

[Alan Griffiths (alan-griffiths)]

Looks better

review: Approve

[Sam Spilsbury (smspillaz)]

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

[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

[Daniel van Vugt (vanvugt)]

Fails to build for a whole new reason now :(

Scanning dependencies of target gtk_window_decorator_force_local_menu_on_test
[ 5%] Building CXX object gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeFiles/gtk_window_decorator_force_local_menu_on_test.dir/test-force-local-menu-on.cpp.o
/home/dan/bzr/compiz-core/lim/gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp: In member function ‘virtual void GtkWindowDecoratorTestLocalMenuLayout_TestForceNoCloseButtonSet_Test::TestBody()’:
/home/dan/bzr/compiz-core/lim/gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp:56:5: error: ‘META_BUTTON_FUNCTION_WINDOW_MENU’ was not declared in this scope
/home/dan/bzr/compiz-core/lim/gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp: In member function ‘virtual void GtkWindowDecoratorTestLocalMenuLayout_TestForceNoCloseMinimizeMaximizeButtonSet_Test::TestBody()’:
/home/dan/bzr/compiz-core/lim/gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp:69:5: error: ‘META_BUTTON_FUNCTION_WINDOW_MENU’ was not declared in this scope
make[2]: *** [gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeFiles/gtk_window_decorator_force_local_menu_on_test.dir/test-force-local-menu-on.cpp.o] Error 1
make[1]: *** [gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeFiles/gtk_window_decorator_force_local_menu_on_test.dir/all] Error 2
make: *** [all] Error 2

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Tests needed to be disabled on META_HAS_LOCAL_MENUS, thanks for catching that.

[Daniel van Vugt (vanvugt)]

Test cases fail (crash). Maybe they need to be disabled if local menus are disabled...

The following tests FAILED:
   1 - gtk_window_decorator_local_menus_on_off (SEGFAULT)
   2 - gtk_window_decorator_force_local_menu_on (SEGFAULT)
Errors while running CTest
make: *** [test] Error 8

-----

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff709bb70 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
(gdb) bt
#0 0x00007ffff709bb70 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#1 0x00007ffff709e2f5 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#2 0x00007ffff6dc29f0 in g_object_unref ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#3 0x000000000042ef7d in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) ()
#4 0x000000000042751f in testing::Test::Run() ()
#5 0x000000000042763d in testing::TestInfo::Run() ()
#6 0x0000000000427787 in testing::TestCase::Run() ()
#7 0x0000000000427a17 in testing::internal::UnitTestImpl::RunAllTests() ()
#8 0x000000000042eafd in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) ()
#9 0x0000000000426c0b in testing::UnitTest::Run() ()
#10 0x0000000000413145 in main ()

-----

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff709bb70 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
(gdb) bt
#0 0x00007ffff709bb70 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#1 0x00007ffff709e2f5 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#2 0x00007ffff6dc29f0 in g_object_unref ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#3 0x000000000042ef7d in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) ()
#4 0x000000000042751f in testing::Test::Run() ()
#5 0x000000000042763d in testing::TestInfo::Run() ()
#6 0x0000000000427787 in testing::TestCase::Run() ()
#7 0x0000000000427a17 in testing::internal::UnitTestImpl::RunAllTests() ()
#8 0x000000000042eafd in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) ()
#9 0x0000000000426c0b in testing::UnitTest::Run() ()
#10 0x0000000000413145 in main ()

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Huh, that's weird. I've disabled META_HAS_LOCAL_MENUS here, and make sure to link to the system libmetacity-private and the tests are still passing for me.

Can you post the output of the individual tests before it reaches the point where they crash? Or do they just crash without outputting anything ?

(Could be something to do with the SetUp () function, so I'll give that a try

[Daniel van Vugt (vanvugt)]

Confirmed all unit tests now pass and no obvious bugs in manual testing.

I still think we need to be tidier with the CMake syntax as I've mentioned before...

review: Approve

[Sam Spilsbury (smspillaz)]

Yes, one day I'm going to introduce a bunch of functions to the CMake which reduce the verbosity.

Daniel - if you want to test this for realz, you can use the following:

lp:~smspillaz/metacity/metacity.lim
lp:~3v1n0/unity/lim-panel
lp:~indicator-applet-developers/indicator-appmenu/local-menus-single-menu
lp:~smspillaz/light-themes/light-themes.limv4

[Alan Griffiths (alan-griffiths)]

Looks OK, Builds OK, automated tests run. (With no META_HAS_LOCAL_MENUS)

review: Approve

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

I've tested it, to be even better, maybe you could also sync the title geometries once you opened/closed the menu, but that can be optional.
One thing you need to fix is the double-click over the title, that currently doesn't work as expected.
Look at the logic I've used in PanelTitlebarGrabArea.

Then I guess we need to define with design better one case: if a window is unfocused, and the user presses over the title / icon, should we just focus it or also open the menu? Currently we do both, but I'm not sure this is the best choice.

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

Ah, don't care about syncing geometries. You don't need that and could cause problems to the panel... :)

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

Ah, one more thing. Please check if the window you're decorating has the "_UBUNTU_APPMENU_UNIQUE_NAME" utf8 atom set to check if it has menus.

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

Ah, I forgot... The decorator is still missing to react to the com.canonical.Unity.Panel.Service.EntryActivateRequest signal, that happens when you do Alt+F on terminal for example... :)

[Sam Spilsbury (smspillaz)]

OK, I'll take care of these two things too. Thanks.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

No obvious errors

review: Abstain

[Daniel van Vugt (vanvugt)]

Confirmed again all unit tests now pass and no obvious bugs in manual testing.

Though, like Alan, I have not reviewed the theoretical correctness of the code in detail.

review: Approve

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

Mostly it works, well.

By the way, I've tested the support for the EntryActivateRequest and even if it's correctly handled if a window is in focus (i.e. pressing Alt+F on the terminal causes the menu to show in the right place), otherwise if you have this scenario: a maximized window in focus, and a restored window unfocused, when pressing Alt+F (or something, that will be managed by the focused window) gtk-window-decorator crashes.

This is the stacktrace I have: http://paste.ubuntu.com/859831/
Actually you should just ignore that signal if no decorated window is in focus.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Ack.

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

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-25 05:11:17 +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	2012-02-20 07:42:20 +0000
+++ gtk/window-decorator/decorator.c	2012-02-25 05:11:17 +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))
+	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	2012-02-20 07:46:35 +0000
+++ gtk/window-decorator/events.c	2012-02-25 05:11:17 +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,75 @@
 }
 
 void
+on_local_menu_hidden (gpointer user_data)
+{
+    Window xid = GPOINTER_TO_INT (user_data);
+    WnckWindow *win = wnck_window_get (xid);
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    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,
+				     GINT_TO_POINTER (wnck_window_get_xid (d->win)));
+	    }
+	break;
+    default:
+	break;
+    }
+}
+
+void
 handle_title_button_event (WnckWindow   *win,
 			   int          action,
 			   decor_event *gtkwd_event)
@@ -485,7 +583,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)
@@ -1031,6 +1139,10 @@
 	    if (get_window_prop (xevent->xproperty.window, select_window_atom, &select))
 		update_switcher_window (xevent->xproperty.window, select);
 	}
+	else if (xevent->xproperty.atom == ubuntu_appmenu_unique_name_atom)
+	{
+	    local_menu_cache_reload_xwindow (gdk_x11_display_get_xdisplay (gdkdisplay), xevent->xproperty.window);
+	}
 	break;
     case DestroyNotify:
 	g_hash_table_remove (frame_table,
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2011-10-13 12:22:14 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2012-02-25 05:11:17 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "gtk-window-decorator.h"
+#include "local-menus.h"
 
 gboolean minimal = FALSE;
 
@@ -48,6 +49,7 @@
 Atom toolkit_action_atom;
 Atom toolkit_action_window_menu_atom;
 Atom toolkit_action_force_quit_dialog_atom;
+Atom ubuntu_appmenu_unique_name_atom;
 
 Atom net_wm_state_atom;
 Atom net_wm_state_modal_atom;
@@ -128,6 +130,35 @@
     "normal", "modal_dialog", "dialog", "menu", "utility"
 };
 
+Box *
+get_active_window_local_menu_rectangle (gpointer user_data, int *dx, int *dy, int *top_height, Window *xid)
+{
+    WnckScreen *screen = (WnckScreen *) user_data;
+    WnckWindow *window = wnck_screen_get_active_window (screen);
+    int width, height;
+    decor_t    *d = g_object_get_data (G_OBJECT (window), "decor");
+
+    wnck_window_get_geometry (window, dx, dy, &width, &height);
+
+    *top_height = d->context->extents.top;
+
+    *xid = wnck_window_get_xid (window);
+
+    Box *rect = &d->button_windows[BUTTON_WINDOW_MENU].pos;
+
+    return rect;
+}
+
+void
+on_local_menu_window_menu_updated (gpointer user_data)
+{
+    Window xid = GPOINTER_TO_INT (user_data);
+    WnckWindow *window = wnck_window_get (xid);
+    decor_t *d = g_object_get_data (G_OBJECT (window), "decor");
+
+    queue_decor_draw (d);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -304,6 +335,7 @@
 
     net_wm_state_atom = XInternAtom (xdisplay,"_NET_WM_STATE", 0);
     net_wm_state_modal_atom = XInternAtom (xdisplay, "_NET_WM_STATE_MODAL", 0);
+    ubuntu_appmenu_unique_name_atom = XInternAtom (xdisplay, "_UBUNTU_APPMENU_UNIQUE_NAME", 0);
 
     status = decor_acquire_dm_session (xdisplay,
 				       gdk_screen_get_number (gdkscreen),
@@ -448,8 +480,32 @@
 
     update_default_decorations (gdkscreen);
 
+#ifdef META_HAS_LOCAL_MENUS
+    GDBusConnection *conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+    local_menu_entry_activated_request_funcs funcs =
+    {
+	get_active_window_local_menu_rectangle,
+	on_local_menu_window_menu_updated
+    };
+
+    if (conn)
+    {
+	global_lim_listener = g_dbus_proxy_new_sync (conn, 0, NULL, "com.canonical.Unity.Panel.Service",
+						   "/com/canonical/Unity/Panel/Service",
+						   "com.canonical.Unity.Panel.Service",
+						   NULL, NULL);
+
+	g_signal_connect (G_OBJECT (global_lim_listener), "g-signal", G_CALLBACK (local_menu_entry_activated_request), (gpointer) &funcs);
+    }
+#endif
     gtk_main ();
+#ifdef META_HAS_LOCAL_MENUS
+    if (global_lim_listener)
+	g_object_unref (global_lim_listener);
 
+    if (conn)
+	g_object_unref (conn);
+#endif
     win = windows = wnck_screen_get_windows (screen);
 
     while (win != NULL)
 
=== 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-25 05:11:17 +0000
@@ -306,6 +306,7 @@
 extern Atom toolkit_action_force_quit_dialog_atom;
 extern Atom net_wm_state_atom;
 extern Atom net_wm_state_modal_atom;
+extern Atom ubuntu_appmenu_unique_name_atom;
 
 extern Time dm_sn_timestamp;
 
@@ -328,7 +329,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 +1015,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-25 05:11:17 +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-25 05:11:17 +0000
@@ -0,0 +1,423 @@
+/*
+ * 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 <string.h>
+#include "local-menus.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define GLOBAL 0
+#define LOCAL 1
+
+#define ALLOWED 2
+#define NOT_ALLOWED 1
+
+gint menu_mode = GLOBAL;
+
+GDBusProxy *global_lim_listener;
+
+
+#ifdef META_HAS_LOCAL_MENUS
+static void
+gwd_menu_mode_changed (GSettings *settings,
+		       gchar     *key,
+		       gpointer  user_data)
+{
+    menu_mode = g_settings_get_enum (settings, "menu-mode");
+}
+#endif
+
+active_local_menu *active_menu;
+pending_local_menu *pending_menu;
+
+GHashTable *get_windows_with_menus_table ()
+{
+   static GHashTable *windows_with_menus = NULL;
+
+   if (!windows_with_menus)
+     windows_with_menus = g_hash_table_new (NULL, NULL);
+
+   return windows_with_menus;
+}
+
+static gboolean read_xprop_for_window (Display *dpy, Window xid)
+{
+  Atom ubuntu_appmenu_unique_name = XInternAtom (dpy, "_UBUNTU_APPMENU_UNIQUE_NAME", FALSE);
+  Atom utf8_string = XInternAtom (dpy, "UTF8_STRING", FALSE);
+  Atom actual;
+  int  fmt;
+  unsigned long nitems, nleft;
+  unsigned char *prop;
+  XGetWindowProperty (dpy, xid, ubuntu_appmenu_unique_name,
+		      0L, 16L, FALSE, utf8_string, &actual, &fmt, &nitems, &nleft, &prop);
+
+  if (actual == utf8_string && fmt == 8 && nitems > 1)
+  {
+    g_hash_table_replace (get_windows_with_menus_table (), GINT_TO_POINTER (xid), GINT_TO_POINTER (ALLOWED));
+    return TRUE;
+  }
+  else
+  {
+    g_hash_table_replace (get_windows_with_menus_table (), GINT_TO_POINTER (xid), GINT_TO_POINTER (NOT_ALLOWED));
+    return FALSE;
+  }
+}
+
+gboolean
+local_menu_allowed_on_window (Display *dpy, Window xid)
+{
+  gpointer local_menu_allowed_found = g_hash_table_lookup (get_windows_with_menus_table (), GINT_TO_POINTER (xid));
+
+  if (local_menu_allowed_found)
+    {
+      return GPOINTER_TO_INT (local_menu_allowed_found) == ALLOWED;
+    }
+  else if (dpy && xid)
+    {
+      return read_xprop_for_window (dpy, xid);
+    }
+
+  return FALSE;
+}
+
+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 && win)
+	return menu_mode == LOCAL && local_menu_allowed_on_window (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), wnck_window_get_xid (win));
+#endif
+
+    return FALSE;
+}
+
+gchar *
+gwd_get_entry_id_from_sync_variant (GVariant *args)
+{
+    /* We need to get the indicator data once we've called show */
+
+    GVariantIter* iter            = NULL;
+    gchar*        name_hint       = NULL;
+    gchar*        indicator_id    = NULL;
+    gchar*        entry_id        = NULL;
+    gchar*        label           = NULL;
+    gboolean      label_sensitive = FALSE;
+    gboolean      label_visible   = FALSE;
+    guint32       image_type      = 0;
+    gchar*        image_data      = NULL;
+    gboolean      image_sensitive = FALSE;
+    gboolean      image_visible   = FALSE;
+    gint32        priority        = -1;
+
+    g_variant_get (args, "(a(ssssbbusbbi))", &iter);
+    while (g_variant_iter_loop (iter, "(ssssbbusbbi)",
+			    &indicator_id,
+			    &entry_id,
+			    &name_hint,
+			    &label,
+			    &label_sensitive,
+			    &label_visible,
+			    &image_type,
+			    &image_data,
+			    &image_sensitive,
+			    &image_visible,
+			    &priority))
+    {
+	g_variant_unref (args);
+	return g_strdup (entry_id);
+    }
+
+    g_variant_unref (args);
+    g_assert_not_reached ();
+    return NULL;
+}
+#ifdef META_HAS_LOCAL_MENUS
+static void
+on_local_menu_activated (GDBusProxy *proxy,
+			 gchar      *sender_name,
+			 gchar      *signal_name,
+			 GVariant   *parameters,
+			 gpointer   user_data)
+{
+
+    if (g_strcmp0 (signal_name, "EntryActivated") == 0)
+    {
+	show_local_menu_data *d = (show_local_menu_data *) user_data;
+	gchar *entry_id = NULL;
+	gint            x_out, y_out;
+	guint           width, height;
+
+	g_variant_get (parameters, "(s(iiuu))", &entry_id, &x_out, &y_out, &width, &height, NULL);
+
+	if (!d->local_menu_entry_id)
+	{
+	    GError   *error = NULL;
+	    GVariant *params = g_variant_new ("(s)", "libappmenu.so", NULL);
+	    GVariant *args = g_dbus_proxy_call_sync (proxy, "SyncOne", params, 0, 500, NULL, &error);
+
+	    g_assert_no_error (error);
+	    d->local_menu_entry_id = gwd_get_entry_id_from_sync_variant (args);
+	}
+
+	if (g_strcmp0 (entry_id, d->local_menu_entry_id) == 0)
+	{
+	    d->rect->x = x_out - d->dx;
+	    d->rect->y = y_out - d->dy;
+	    d->rect->width = width;
+	    d->rect->height = height;
+	    (*d->cb) (d->user_data);
+	}
+	else if (g_strcmp0 (entry_id, "") == 0)
+	{
+	    memset (d->rect, 0, sizeof (GdkRectangle));
+	    (*d->cb) (d->user_data);
+
+	    g_signal_handlers_disconnect_by_func (proxy, on_local_menu_activated, d);
+
+	    if (active_menu)
+	    {
+		g_free (active_menu);
+		active_menu = NULL;
+	    }
+
+	    g_free (d->local_menu_entry_id);
+	    g_free (d);
+	}
+    }
+
+}
+#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 (120, gwd_move_window_instead, pending_menu);
+}
+
+#ifdef META_HAS_LOCAL_MENUS
+void
+local_menu_entry_activated_request (GDBusProxy *proxy,
+				    gchar      *sender_name,
+				    gchar      *signal_name,
+				    GVariant   *parameters,
+				    gpointer   user_data)
+{
+  if (g_strcmp0 (signal_name, "EntryActivateRequest") == 0)
+    {
+      gchar *activated_entry_id;
+      gchar *local_menu_entry_id;
+      local_menu_entry_activated_request_funcs *funcs = (local_menu_entry_activated_request_funcs *) user_data;
+
+      g_variant_get (parameters, "(s)", &activated_entry_id, NULL);
+
+      GError   *error = NULL;
+      GVariant *params = g_variant_new ("(s)", "libappmenu.so", NULL);
+      GVariant *args = g_dbus_proxy_call_sync (proxy, "SyncOne", params, 0, 500, NULL, &error);
+
+      g_assert_no_error (error);
+      local_menu_entry_id = gwd_get_entry_id_from_sync_variant (args);
+
+      if (g_strcmp0 (activated_entry_id, local_menu_entry_id) == 0)
+	{
+	  WnckScreen *screen = wnck_screen_get_for_root (gdk_x11_get_default_root_xwindow ());
+	  int dx, dy, top_height;
+	  Window xid;
+
+	  if (screen)
+	    {
+	      Box *rect = (*funcs->active_window_local_menu_rect_callback) ((gpointer) screen, &dx, &dy, &top_height, &xid);
+
+	      if (rect)
+		{
+		  int x = rect->x1;
+		  int y = top_height;
+
+		  gwd_show_local_menu (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
+					   xid, x + dx, y + dy, x, y, 0, 0,
+					   funcs->show_window_menu_hidden_callback, GINT_TO_POINTER (xid));
+		}
+	    }
+	}
+    }
+}
+#endif
+
+gboolean
+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
+
+
+    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);
+
+    GDBusProxy *proxy = global_lim_listener;
+
+    if (proxy)
+    {
+	GVariant *message = g_variant_new ("(uiiu)", frame_xwindow, x, y, time);
+	GError   *error = NULL;
+	g_dbus_proxy_call_sync (proxy, "ShowAppMenu", message, 0, 500, NULL, &error);
+	if (error)
+	{
+	    g_print ("error calling ShowAppMenu: %s\n", error->message);
+	    return FALSE;
+	}
+
+	show_local_menu_data *data = g_new0 (show_local_menu_data, 1);
+
+	if (active_menu)
+	    g_free (active_menu);
+
+	active_menu = g_new0 (active_local_menu, 1);
+
+	data->cb = cb;
+	data->user_data = user_data_show_window_menu;
+	data->rect = &active_menu->rect;
+	data->dx = x - x_win;
+	data->dy = y - y_win;
+	data->local_menu_entry_id = NULL;  
+
+	g_signal_connect (proxy, "g-signal", G_CALLBACK (on_local_menu_activated), data);
+
+	return TRUE;
+    }
+#endif
+    return FALSE;
+}
+
+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
+}
+
+void
+local_menu_cache_notify_window_destroyed (Window xid)
+{
+  g_hash_table_remove (get_windows_with_menus_table (), GINT_TO_POINTER (xid));
+}
+
+void
+local_menu_cache_reload_xwindow (Display *dpy, Window xid)
+{
+  read_xprop_for_window (dpy, xid);
+}
+
+
 
=== 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-25 05:11:17 +0000
@@ -0,0 +1,120 @@
+/*
+ * 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>
+#include <X11/Xregion.h>
+
+
+typedef void (*show_window_menu_hidden_cb) (gpointer);
+typedef void (*start_move_window_cb) (gpointer);
+typedef Box * (*get_active_window_local_menu_rect_cb) (gpointer, int *, int *, int *, Window *);
+
+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;
+extern GDBusProxy        *global_lim_listener;
+
+typedef struct _show_local_menu_data
+{
+    show_window_menu_hidden_cb cb;
+    gpointer        user_data;
+    GdkRectangle    *rect;
+    gint            dx;
+    gint            dy;
+    gchar           *local_menu_entry_id;
+} show_local_menu_data;
+
+typedef struct _local_menu_entry_activated_request_funcs
+{
+    get_active_window_local_menu_rect_cb active_window_local_menu_rect_callback;
+    show_window_menu_hidden_cb show_window_menu_hidden_callback;
+} local_menu_entry_activated_request_funcs;
+
+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 */
+gboolean
+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);
+
+void
+local_menu_cache_notify_window_destroyed (Window xid);
+
+void
+local_menu_cache_reload_xwindow (Display *xdisplay, Window xid);
+
+gboolean
+local_menu_allowed_on_window (Display *dpy, Window xid);
+
+void
+local_menu_entry_activated_request (GDBusProxy *proxy,
+				    gchar      *sender_name,
+				    gchar      *signal_name,
+				    GVariant   *parameters,
+				    gpointer   user_data);
+
+#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-25 05:11:17 +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-25 05:11:17 +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-25 05:11:17 +0000
@@ -0,0 +1,27 @@
+#include "test-local-menu.h"
+
+#define GLOBAL 0
+#define LOCAL 1
+#ifdef META_HAS_LOCAL_MENUS
+
+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);
+}
+#else
+TEST_F (GtkWindowDecoratorTestLocalMenu, NoMenus)
+{
+    ASSERT_TRUE (true) << "Local menus tests not enabled because META_HAS_LOCAL_MENUS is off";
+}
+#endif
 
=== 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-25 05:11:17 +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-25 05:11:17 +0000
@@ -0,0 +1,77 @@
+#include "test-local-menu.h"
+#include <cstring>
+
+#define GLOBAL 0
+#define LOCAL 1
+#ifdef META_HAS_LOCAL_MENUS
+
+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);
+}
+#else
+TEST_F (GtkWindowDecoratorTestLocalMenu, NoMenus)
+{
+    ASSERT_TRUE (true) << "Local menus tests not enabled because META_HAS_LOCAL_MENUS is off";
+}
+#endif
 
=== 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-25 05:11:17 +0000
@@ -0,0 +1,49 @@
+#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:
+
+#ifdef META_HAS_LOCAL_MENUS
+	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);
+	}
+#endif
+
+    private:
+
+	WnckWindow *mWindow;
+	Window     mXWindow;
+	Display    *mXDisplay;
+	GSettings *mSettings;
+};
 
=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2012-02-16 06:51:37 +0000
+++ gtk/window-decorator/metacity.c	2012-02-25 05:11:17 +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)
@@ -538,6 +541,12 @@
 	*flags |= (MetaFrameFlags ) META_FRAME_ABOVE;
 #endif
 
+#ifdef META_HAS_LOCAL_MENUS
+    if (d->win &&
+	local_menu_allowed_on_window (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), wnck_window_get_xid (d->win)))
+	*flags |= (MetaFrameFlags ) META_FRAME_ALLOWS_WINDOW_MENU;
+#endif
+
     meta_theme_get_frame_borders (theme,
 				  frame_type,
 				  d->frame->text_height,
@@ -558,6 +567,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 +585,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 +628,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 +707,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 +934,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 +1116,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 +1313,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 +1539,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	2012-02-10 10:23:27 +0000
+++ gtk/window-decorator/wnck.c	2012-02-25 05:11:17 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "gtk-window-decorator.h"
+#include "local-menus.h"
 
 const gchar *
 get_frame_type (WnckWindow *win)
@@ -738,7 +739,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));
@@ -784,6 +786,8 @@
 window_closed (WnckScreen *screen,
 	       WnckWindow *win)
 {
+    local_menu_cache_notify_window_destroyed (wnck_window_get_xid (win));
+
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
 
     if (d)