Merge lp:~mterry/indicator-appmenu/emit-show-now-changed into lp:indicator-appmenu/0.3

[Michael Terry]

This branch notices changes in its client window Status property and turns them into emissions of show-now-changed on the IndicatorObject. This is in the service of making Alt presses show the appmenu.

This branch requires [1] to work at all and [2] to be useful.

[1] https://code.launchpad.net/~mterry/dbusmenu/wrap-propertieschanged/+merge/52581
[2] https://code.launchpad.net/~mterry/dbusmenu/pass-mnemonics/+merge/52577

[Ted Gould (ted)]

On Tue, 2011-03-08 at 17:16 +0000, Michael Terry wrote:
> + /* Set up initial state for new entries if needed */
> + if (window_menus_get_status (iapp->default_app) != DBUSMENU_STATUS_NORMAL) {
> + window_status_changed (iapp->default_app,
> + window_menus_get_status (iapp->default_app),
> + iapp);
> + }

I think that we need to ensure that the one we're switching from wasn't
setting the status to alert as well. I think that the best way to do
this to track the state and see if it changes as we change menus.

  review needsfixing

review: Needs Fixing

[Michael Terry (mterry)]

But right before that bit of code, we removed all entries, so there shouldn't be a problem.

Though there is a bug, because that bit is called before we set up the new entries, so it when it iterates over entries, they won't have been added yet. I can fix that, but I'm not sure I grok the issue you mentioned.

[Michael Terry (mterry)]

There. Now the code won't notify about new entries' statuses before notifying that the new entries even exist.

But I still don't think we have to worry about old entries' statuses, because we've already notified that we removed them.

[lp:~mterry/indicator-appmenu/emit-show-now-changed]

109. By Michael Terry on 2011-03-09

notify about new entries' statuses after adding new entries, not before

[Ted Gould (ted)]

I agree, I had forgot that we were deleting them so that would effectively invalidate their status. Looks good.

review: Approve

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2011-02-17 20:09:37 +0000
+++ src/indicator-appmenu.c	2011-03-09 14:18:09 +0000
@@ -90,6 +90,7 @@
 
 	gulong sig_entry_added;
 	gulong sig_entry_removed;
+	gulong sig_status_changed;
 	gulong sig_show_menu;
 	gulong sig_a11y_update;
 
@@ -166,6 +167,9 @@
 static void window_entry_removed                                     (WindowMenus * mw,
                                                                       IndicatorObjectEntry * entry,
                                                                       gpointer user_data);
+static void window_status_changed                                    (WindowMenus * mw,
+                                                                      DbusmenuStatus status,
+                                                                      IndicatorAppmenu * iapp);
 static void window_show_menu                                         (WindowMenus * mw,
                                                                       IndicatorObjectEntry * entry,
                                                                       guint timestamp,
@@ -1088,6 +1092,10 @@
 		g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_entry_removed);
 		iapp->sig_entry_removed = 0;
 	}
+	if (iapp->sig_status_changed != 0) {
+		g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_status_changed);
+		iapp->sig_status_changed = 0;
+	}
 	if (iapp->sig_show_menu != 0) {
 		g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_show_menu);
 		iapp->sig_show_menu = 0;
@@ -1117,6 +1125,10 @@
 		                                           WINDOW_MENUS_SIGNAL_ENTRY_REMOVED,
 		                                           G_CALLBACK(window_entry_removed),
 		                                           iapp);
+		iapp->sig_status_changed = g_signal_connect(G_OBJECT(iapp->default_app),
+		                                           WINDOW_MENUS_SIGNAL_STATUS_CHANGED,
+		                                           G_CALLBACK(window_status_changed),
+		                                           iapp);
 		iapp->sig_show_menu     = g_signal_connect(G_OBJECT(iapp->default_app),
 		                                           WINDOW_MENUS_SIGNAL_SHOW_MENU,
 		                                           G_CALLBACK(window_show_menu),
@@ -1154,6 +1166,14 @@
 
 	g_list_free(entry_head);
 
+	/* Set up initial state for new entries if needed */
+	if (iapp->default_app != NULL &&
+            window_menus_get_status (iapp->default_app) != DBUSMENU_STATUS_NORMAL) {
+		window_status_changed (iapp->default_app,
+		                       window_menus_get_status (iapp->default_app),
+		                       iapp);
+	}
+
 	return;
 }
 
@@ -1394,6 +1414,23 @@
 	return;
 }
 
+/* Pass up the status changed event */
+static void
+window_status_changed (WindowMenus * mw, DbusmenuStatus status, IndicatorAppmenu * iapp)
+{
+	gboolean show_now = (status == DBUSMENU_STATUS_NOTICE);
+	GList * entry_head, * entries;
+
+	entry_head = indicator_object_get_entries(INDICATOR_OBJECT(iapp));
+
+	for (entries = entry_head; entries != NULL; entries = g_list_next(entries)) {
+		IndicatorObjectEntry * entry = (IndicatorObjectEntry *)entries->data;
+		g_signal_emit(G_OBJECT(iapp), INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID, 0, entry, show_now);
+	}
+
+	return;
+}
+
 /* Pass up the show menu event */
 static void
 window_show_menu (WindowMenus * mw, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data)
 
=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-02-28 18:56:06 +0000
+++ src/window-menus.c	2011-03-09 14:18:09 +0000
@@ -62,6 +62,7 @@
 	ENTRY_ADDED,
 	ENTRY_REMOVED,
 	ERROR_STATE,
+	STATUS_CHANGED,
 	SHOW_MENU,
 	A11Y_UPDATE,
 	LAST_SIGNAL
@@ -116,6 +117,13 @@
 	                                      NULL, NULL,
 	                                      g_cclosure_marshal_VOID__BOOLEAN,
 	                                      G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
+	signals[STATUS_CHANGED] = g_signal_new(WINDOW_MENUS_SIGNAL_STATUS_CHANGED,
+	                                      G_TYPE_FROM_CLASS(klass),
+	                                      G_SIGNAL_RUN_LAST,
+	                                      G_STRUCT_OFFSET (WindowMenusClass, status_changed),
+	                                      NULL, NULL,
+	                                      g_cclosure_marshal_VOID__INT,
+	                                      G_TYPE_NONE, 1, G_TYPE_INT, G_TYPE_NONE);
 	signals[SHOW_MENU] =     g_signal_new(WINDOW_MENUS_SIGNAL_SHOW_MENU,
 	                                      G_TYPE_FROM_CLASS(klass),
 	                                      G_SIGNAL_RUN_LAST,
@@ -366,6 +374,23 @@
 	return;
 }
 
+/* Called when the client changes its status.  Used to show panel if requested.
+   (Say, by an Alt press.) */
+static void
+status_changed (DbusmenuClient * client, GParamSpec * pspec, gpointer user_data)
+{
+	g_signal_emit(G_OBJECT(user_data), signals[STATUS_CHANGED], 0, dbusmenu_client_get_status (client));
+}
+
+DbusmenuStatus
+window_menus_get_status (WindowMenus * wm)
+{
+	g_return_val_if_fail(IS_WINDOW_MENUS(wm), DBUSMENU_STATUS_NORMAL);
+	WindowMenusPrivate * priv = WINDOW_MENUS_GET_PRIVATE(wm);
+
+	return dbusmenu_client_get_status (DBUSMENU_CLIENT (priv->client));
+}
+
 /* Build a new window menus object and attach to the signals to build
    up the representative menu. */
 WindowMenus *
@@ -402,6 +427,7 @@
 	g_signal_connect(G_OBJECT(priv->client), DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(root_changed),   newmenu);
 	g_signal_connect(G_OBJECT(priv->client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), newmenu);
 	g_signal_connect(G_OBJECT(priv->client), DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE, G_CALLBACK(item_activate), newmenu);
+	g_signal_connect(G_OBJECT(priv->client), "notify::" DBUSMENU_CLIENT_PROP_STATUS, G_CALLBACK(status_changed), newmenu);
 
 	DbusmenuMenuitem * root = dbusmenu_client_get_root(DBUSMENU_CLIENT(priv->client));
 	if (root != NULL) {
 
=== modified file 'src/window-menus.h'
--- src/window-menus.h	2011-02-17 19:45:57 +0000
+++ src/window-menus.h	2011-03-09 14:18:09 +0000
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <libindicator/indicator-object.h>
+#include <libdbusmenu-glib/client.h>
 
 G_BEGIN_DECLS
 
@@ -38,6 +39,7 @@
 #define WINDOW_MENUS_SIGNAL_ENTRY_ADDED    "entry-added"
 #define WINDOW_MENUS_SIGNAL_ENTRY_REMOVED  "entry-removed"
 #define WINDOW_MENUS_SIGNAL_ERROR_STATE    "error-state"
+#define WINDOW_MENUS_SIGNAL_STATUS_CHANGED "status-changed"
 #define WINDOW_MENUS_SIGNAL_SHOW_MENU      "show-menu"
 #define WINDOW_MENUS_SIGNAL_A11Y_UPDATE    "a11y-update"
 
@@ -52,6 +54,7 @@
 	void (*entry_removed) (WindowMenus * wm, IndicatorObjectEntry * entry, gpointer user_data);
 
 	void (*error_state)   (WindowMenus * wm, gboolean state, gpointer user_data);
+	void (*status_changed) (WindowMenus * wm, DbusmenuStatus status, gpointer user_data);
 
 	void (*show_menu)     (WindowMenus * wm, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
 	void (*a11y_update)   (WindowMenus * wm, IndicatorObjectEntry * entry, gpointer user_data);
@@ -71,6 +74,7 @@
 gchar * window_menus_get_address (WindowMenus * wm);
 
 gboolean window_menus_get_error_state (WindowMenus * wm);
+DbusmenuStatus window_menus_get_status (WindowMenus * wm);
 void window_menus_entry_restore (WindowMenus * wm, IndicatorObjectEntry * entry);
 
 void window_menus_entry_activate (WindowMenus * wm, IndicatorObjectEntry * entry, guint timestamp);