Merge lp:~robertcarr/indicator-appmenu/webapps into lp:indicator-appmenu/12.10

[Robert Carr]

Webapp support in indicator-appmenu!

Depends on
https://code.launchpad.net/~robertcarr/bamf/webapps

[Charles Kerr (charlesk)]

Looks good.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-07-11 18:42:01 +0000
+++ configure.ac	2012-08-20 19:17:24 +0000
@@ -20,7 +20,7 @@
 # Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
-AM_PROG_VALAC([0.15.2])
+AM_PROG_VALAC([])
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -82,7 +82,7 @@
 
 PKG_CHECK_MODULES([HUD],[
 		dbusmenu-glib-0.4 >= $DBUSMENU_GLIB_REQUIRED_VERSION
-		libbamf3 >= $BAMF_REQUIRED_VERSION
+		libbamf3 
 		sqlite3 >= $SQLITE_REQUIRED_VERSION
 ])
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-04-11 15:15:24 +0000
+++ src/Makefile.am	2012-08-20 19:17:24 +0000
@@ -112,6 +112,8 @@
 	hudmenumodelcollector.c	\
 	hudappindicatorsource.h	\
 	hudappindicatorsource.c	\
+	hudwebappsource.h \
+	hudwebappsource.c \
 	hudindicatorsource.h	\
 	hudindicatorsource.c	\
 	hudwindowsource.h	\

=== modified file 'src/hud-service.c'
--- src/hud-service.c	2012-03-16 15:25:20 +0000
+++ src/hud-service.c	2012-08-20 19:17:24 +0000
@@ -28,6 +28,7 @@
 
 #include "hudappindicatorsource.h"
 #include "hudindicatorsource.h"
+#include "hudwebappsource.h"
 #include "hudwindowsource.h"
 #include "huddebugsource.h"
 #include "hudsourcelist.h"
@@ -303,6 +304,15 @@
     hud_source_list_add (source_list, HUD_SOURCE (source));
     g_object_unref (source);
   }
+  
+  {
+    HudWebappSource *source;
+    
+    source = hud_webapp_source_new (window_source);
+    hud_source_list_add (source_list, HUD_SOURCE (source));
+    
+    g_object_unref (G_OBJECT (source));
+  }
 
   if (getenv ("HUD_DEBUG_SOURCE"))
     {

=== added file 'src/hudwebappsource.c'
--- src/hudwebappsource.c	1970-01-01 00:00:00 +0000
+++ src/hudwebappsource.c	2012-08-20 19:17:24 +0000
@@ -0,0 +1,376 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Robert Carr
+ */
+
+#include "hudwebappsource.h"
+
+#include <stdio.h>
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+
+#include <libbamf/libbamf.h>
+#include <libbamf/bamf-application.h>
+#include <libbamf/bamf-view.h>
+#include <libbamf/bamf-tab.h>
+
+#include "hudsettings.h"
+#include "huddbusmenucollector.h"
+#include "hudsource.h"
+
+/**
+ * SECTION:hudwebappsource
+ * @title:HudWebappSource
+ * @short_description: a #HudSource to search through the menus of
+ *   webapps registered with the Unity Webapps System.
+ *
+ * #HudWebappsSource searches through the menu items of webapps
+ **/
+
+/**
+ * HudWebappSource:
+ *
+ * This is an opaque structure type.
+ **/
+
+struct _HudWebappSource
+{
+  GObject parent_instance;
+  
+  GList *applications;
+  
+  HudWindowSource *window_source;
+};
+
+typedef GObjectClass HudWebappSourceClass;
+
+typedef struct _HudWebappApplicationSource {
+  BamfApplication *application;
+
+  HudSource *source;
+  HudSource *collector;
+} HudWebappApplicationSource;
+
+static void hud_webapp_source_iface_init (HudSourceInterface *iface);
+G_DEFINE_TYPE_WITH_CODE (HudWebappSource, hud_webapp_source, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (HUD_TYPE_SOURCE, hud_webapp_source_iface_init))
+
+
+
+static void
+hud_webapp_source_collector_changed (HudSource *source,
+				     gpointer   user_data)
+{
+  hud_source_changed ((HudSource *)user_data);
+}
+
+static void
+hud_webapp_source_application_child_moved (BamfApplication *application,
+					     BamfView *child,
+					     gpointer user_data)
+{
+  HudSource *source = HUD_SOURCE (user_data);
+  
+  hud_source_changed (source);
+}
+
+static gboolean
+hud_webapp_source_should_search_app (BamfApplication *application,
+				     guint32 active_xid)
+{
+  GList *children, *walk;
+  gboolean should;
+  
+  should = FALSE;
+  
+  children = bamf_view_get_children (BAMF_VIEW (application));
+
+  for (walk = children; walk != NULL; walk = walk->next)
+    {
+      BamfTab *child;
+      
+      if (BAMF_IS_TAB (walk->data) == FALSE)
+	continue;
+      
+      child = BAMF_TAB (walk->data);
+      
+      if ((active_xid == bamf_tab_get_xid (child)) &&
+	  bamf_tab_get_is_foreground_tab (child))
+	{
+	  should = TRUE;
+	  break;
+	}
+    }
+  
+  g_list_free (children);
+  return should;
+}
+
+static void
+hud_webapp_source_search (HudSource   *hud_source,
+			  GPtrArray   *results_array,
+			  HudTokenList *token_list)
+{
+  HudWebappSource *source;
+  GList *walk;
+  
+  source = HUD_WEBAPP_SOURCE (hud_source);
+  
+  for (walk = source->applications; walk != NULL; walk = walk->next)
+    {
+      HudWebappApplicationSource *application_source;
+      guint32 active_xid;
+      
+      application_source = (HudWebappApplicationSource *)walk->data;
+      
+      active_xid = hud_window_source_get_active_xid (source->window_source);
+
+      if (hud_webapp_source_should_search_app (application_source->application, active_xid))
+	{
+	  hud_source_search (application_source->collector, results_array, token_list);
+	}
+
+    }
+}
+
+HudWebappApplicationSource *
+hud_webapp_application_source_new (HudSource *source,
+				   BamfApplication *application)
+{
+  HudWebappApplicationSource *application_source;
+  gchar *name, *path;
+
+  name = path = NULL;
+  
+  bamf_application_get_application_menu (application,
+					 &name, &path);
+  
+  if (name == NULL || *name == '\0')
+    return NULL;
+
+  application_source = g_malloc0 (sizeof (HudWebappApplicationSource));
+  
+  application_source->application = g_object_ref (G_OBJECT (application));
+  application_source->source = source;
+  
+  application_source->collector = (HudSource *)hud_dbusmenu_collector_new_for_endpoint (bamf_view_get_name (BAMF_VIEW (application)),
+											bamf_view_get_name (BAMF_VIEW (application)),
+											bamf_view_get_icon (BAMF_VIEW (application)),
+											0,
+											name, path);
+  
+  g_signal_connect_object (application, "child-moved",
+			   G_CALLBACK (hud_webapp_source_application_child_moved),
+			   source, 0);
+  
+  
+  
+  g_free (name);
+  g_free (path);
+  
+  return application_source;
+}
+
+static void
+hud_webapp_application_source_free (HudWebappApplicationSource *application_source)
+{
+  g_object_unref (G_OBJECT (application_source->application));
+  g_object_unref (G_OBJECT (application_source->collector));
+  
+  g_free (application_source);
+}
+
+
+static void
+on_active_changed (BamfApplication *application,
+		   gboolean active,
+		   HudSource *source)
+{
+  hud_source_changed (source);
+}
+
+static void
+hud_webapp_source_remove_application (HudWebappSource *source,
+				      BamfApplication *application)
+{
+  HudWebappApplicationSource *application_source;
+  GList *walk;
+  
+  application_source = NULL;
+  
+  for (walk = source->applications; walk != NULL; walk = walk->next)
+    {
+      HudWebappApplicationSource *t;
+      
+      t = (HudWebappApplicationSource *)walk->data;
+      
+      if (t->application == application)
+	application_source = t;
+    }
+  
+  if (application_source == NULL)
+    return;
+  
+  g_signal_handlers_disconnect_by_func (application_source->collector,
+					G_CALLBACK (hud_webapp_source_collector_changed),
+					source);
+  g_signal_handlers_disconnect_by_func (application, G_CALLBACK (on_active_changed),
+					source);
+  
+  source->applications = g_list_remove (source->applications, application_source);
+  
+  hud_webapp_application_source_free (application_source);
+  
+  hud_webapp_source_collector_changed ((HudSource *)source, source);
+  
+}
+
+static void
+hud_webapp_source_bamf_view_closed (BamfMatcher *matcher,
+				    BamfView *view,
+				    gpointer user_data)
+{
+  HudWebappSource *source;
+  
+  source = (HudWebappSource *)user_data;
+  
+  if (BAMF_IS_APPLICATION (view) == FALSE)
+    return;
+  
+  hud_webapp_source_remove_application (source, (BamfApplication *)view);
+}
+
+static void
+hud_webapp_source_register_application (HudWebappSource *source,
+					BamfApplication *application)
+{
+  HudWebappApplicationSource *application_source;
+  
+  application_source = hud_webapp_application_source_new (HUD_SOURCE (source), application);
+  
+  if (application_source == NULL)
+    return;
+  
+  g_signal_connect (application_source->collector, "changed", G_CALLBACK (hud_webapp_source_collector_changed), source);
+  
+  source->applications = g_list_append (source->applications, application_source);
+  
+  hud_webapp_source_collector_changed ((HudSource *)source, source);
+  
+  g_signal_connect (application, "active-changed", G_CALLBACK (on_active_changed), source);
+  
+}
+
+static void
+hud_webapp_source_finalize (GObject *object)
+{
+  g_assert_not_reached ();
+}
+
+static void
+hud_webapp_source_bamf_view_opened (BamfMatcher *matcher,
+				    BamfView *view,
+				    gpointer user_data)
+{
+  HudWebappSource *source;
+  BamfApplication *application;
+  
+  source = (HudWebappSource *)user_data;
+  
+  if (BAMF_IS_APPLICATION (view) == FALSE)
+    return;
+  
+  application = BAMF_APPLICATION (view);
+  
+  if (g_strcmp0 (bamf_application_get_application_type (application), "webapp") != 0)
+    return;
+  
+  hud_webapp_source_register_application (source, application);
+}
+
+static void
+hud_webapp_source_init (HudWebappSource *source)
+{
+  BamfMatcher *matcher;
+  GList *applications, *walk;
+  
+  source->applications = NULL;
+  
+  matcher = bamf_matcher_get_default ();
+  
+  applications = bamf_matcher_get_applications (matcher);
+  
+  for (walk = applications; walk != NULL; walk = walk -> next)
+    {
+      BamfApplication *application;
+      
+      application = (BamfApplication *)walk->data;
+      
+      if (g_strcmp0 (bamf_application_get_application_type (application), "webapp") != 0)
+	continue;
+      
+      hud_webapp_source_register_application (source, application);      
+    }
+  
+  g_signal_connect (matcher, "view-opened", G_CALLBACK (hud_webapp_source_bamf_view_opened), source);
+  g_signal_connect (matcher, "view-closed", G_CALLBACK (hud_webapp_source_bamf_view_closed), source);
+  
+  g_list_free (applications);
+}
+
+static void
+hud_webapp_source_use (HudSource *hud_source)
+{
+}
+
+static void
+hud_webapp_source_unuse (HudSource *hud_source)
+{
+}
+
+static void
+hud_webapp_source_iface_init (HudSourceInterface *iface)
+{
+  iface->search = hud_webapp_source_search;
+  iface->use = hud_webapp_source_use;
+  iface->unuse = hud_webapp_source_unuse;
+}
+
+static void
+hud_webapp_source_class_init (HudWebappSourceClass *class)
+{
+  class->finalize = hud_webapp_source_finalize;
+}
+
+/**
+ * hud_webapp_source_new:
+ *
+ * Creates a #HudWebappSource.
+ *
+ * Returns: a new #HudWebappSource
+ **/
+HudWebappSource *
+hud_webapp_source_new (HudWindowSource *window_source)
+{
+  HudWebappSource *webapp_source;
+  
+  webapp_source = (HudWebappSource *) g_object_new (HUD_TYPE_WEBAPP_SOURCE, NULL);
+  
+  webapp_source->window_source = window_source;
+  
+  return webapp_source;
+}

=== added file 'src/hudwebappsource.h'
--- src/hudwebappsource.h	1970-01-01 00:00:00 +0000
+++ src/hudwebappsource.h	2012-08-20 19:17:24 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <[e-mail]>
+ */
+
+#ifndef __HUD_WEBAPP_SOURCE_H__
+#define __HUD_WEBAPP_SOURCE_H__
+
+#include <glib-object.h>
+#include "hudwindowsource.h"
+
+#define HUD_TYPE_WEBAPP_SOURCE                           (hud_webapp_source_get_type ())
+#define HUD_WEBAPP_SOURCE(inst)                          (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             HUD_TYPE_WEBAPP_SOURCE, HudWebappSource))
+#define HUD_IS_WEBAPP_SOURCE(inst)                       (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             HUD_TYPE_WEBAPP_SOURCE))
+
+typedef struct _HudWebappSource                          HudWebappSource;
+
+GType                   hud_webapp_source_get_type                   (void);
+HudWebappSource *    hud_webapp_source_new                        (HudWindowSource *window_source);
+
+#endif /* __HUD_WEBAPP_SOURCE_H__ */

=== modified file 'src/hudwindowsource.c'
--- src/hudwindowsource.c	2012-04-03 12:26:05 +0000
+++ src/hudwindowsource.c	2012-08-20 19:17:24 +0000
@@ -364,3 +364,9 @@
 {
   return g_object_new (HUD_TYPE_WINDOW_SOURCE, NULL);
 }
+
+guint32 
+hud_window_source_get_active_xid (HudWindowSource *source)
+{
+  return bamf_window_get_xid (source->active_window);
+}

=== modified file 'src/hudwindowsource.h'
--- src/hudwindowsource.h	2012-02-28 18:29:03 +0000
+++ src/hudwindowsource.h	2012-08-20 19:17:24 +0000
@@ -32,5 +32,6 @@
 GType                   hud_window_source_get_type                      (void);
 
 HudWindowSource *       hud_window_source_new                           (void);
+guint32 hud_window_source_get_active_xid (HudWindowSource *source);
 
 #endif /* __HUD_WINDOW_SOURCE_H__ */

=== modified file 'tools-vala/Makefile.am'
--- tools-vala/Makefile.am	2012-03-21 17:27:26 +0000
+++ tools-vala/Makefile.am	2012-08-20 19:17:24 +0000
@@ -1,7 +1,7 @@
 
 EXTRA_DIST = 
-bin_PROGRAMS = \
-	hud-gtk
+bin_PROGRAMS = hud-gtk
+
 
 ####################
 # hud-gtk