Merge lp:~mhr3/bamf/non-chatty-signals into lp:bamf/0.4

[Michal Hruby]

Added method and signal to list desktop file paths of running applications, this is needed for application lens, which should exclude running applications from the default results and we need to minimize the number of wakeups of the lens daemon.

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

Looks good to me.

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~3v1n0/bamf/libbamf-net-dbus-hints has not yet been merged into lp:bamf.

[Mikkel Kamstrup Erlandsen (kamstrup)]

This looks awesome, just one thing:

  192 + priv->idle_cb_id = g_idle_add (emit_paths_changed, self);

Can you make this a longer timeout? There's no point in guaranteeing super fine granularity in the updates when we have a signal suitable for batching. I am thinking 200ms or maybe as much as 500ms...

review: Needs Fixing

[Michal Hruby (mhr3)]

Changed the idle to 500ms timeout.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Likes!

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~3v1n0/bamf/libbamf-net-dbus-hints has not yet been merged into lp:bamf.

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

Please fix the small conflict that this branch has with newest trunk, then it's ready to go in! :)

review: Needs Fixing

[lp:~mhr3/bamf/non-chatty-signals]

465. By Michal Hruby on 2012-01-20

Merge trunk

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

review: Approve

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2012-01-03 16:23:18 +0000
+++ src/bamf-application.c	2012-01-20 16:06:24 +0000
@@ -65,30 +65,26 @@
   return g_strdup (application->priv->app_type);
 }
 
-char *
+const char *
 bamf_application_get_desktop_file (BamfApplication *application)
 {
   BamfApplicationPrivate *priv;
-  char *result = NULL;
 
   g_return_val_if_fail (BAMF_IS_APPLICATION (application), NULL);
   priv = application->priv;
 
-  result = g_strdup (priv->desktop_file);
-  return result;
+  return priv->desktop_file;
 }
 
-char *
+const char *
 bamf_application_get_wmclass (BamfApplication *application)
 {
   BamfApplicationPrivate *priv;
-  char *result = NULL;
 
   g_return_val_if_fail (BAMF_IS_APPLICATION (application), NULL);
   priv = application->priv;
 
-  result = g_strdup (priv->wmclass);
-  return result;
+  return priv->wmclass;
 }
 
 static gboolean

=== modified file 'src/bamf-application.h'
--- src/bamf-application.h	2011-12-22 00:33:12 +0000
+++ src/bamf-application.h	2012-01-20 16:06:24 +0000
@@ -53,7 +53,7 @@
 
 GType             bamf_application_get_type                   (void) G_GNUC_CONST;
 
-char            * bamf_application_get_desktop_file           (BamfApplication *application);
+const char      * bamf_application_get_desktop_file           (BamfApplication *application);
 void              bamf_application_set_desktop_file           (BamfApplication *application,
                                                                const char * desktop_file);
 
@@ -65,7 +65,7 @@
 gboolean          bamf_application_contains_similar_to_window (BamfApplication *app, 
                                                                BamfWindow *window);
 
-char            * bamf_application_get_wmclass                (BamfApplication *application);
+const char      * bamf_application_get_wmclass                (BamfApplication *application);
 void              bamf_application_set_wmclass                (BamfApplication *application,
                                                                const char *wmclass);
 

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-01-10 14:43:24 +0000
+++ src/bamf-matcher.c	2012-01-20 16:06:24 +0000
@@ -40,6 +40,12 @@
   LAST_SIGNAL,
 };
 
+typedef enum
+{
+  VIEW_ADDED = 0,
+  VIEW_REMOVED
+} ViewChangeType;
+
 static guint matcher_signals[LAST_SIGNAL] = { 0 };
 
 struct _BamfMatcherPrivate
@@ -50,11 +56,13 @@
   GHashTable      * desktop_file_table;
   GHashTable      * desktop_class_table;
   GHashTable      * registered_pids;
+  GHashTable      * opened_closed_paths_table;
   GList           * views;
   GList           * monitors;
   GList           * favorites;
   BamfView        * active_app;
   BamfView        * active_win;
+  guint             dispatch_changes_id;
 };
 
 static void
@@ -117,6 +125,106 @@
 
 static void bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view, gboolean unref);
 
+static gboolean
+emit_paths_changed (gpointer user_data)
+{
+  BamfMatcher *matcher;
+  BamfMatcherPrivate *priv;
+  GHashTableIter iter;
+  guint ht_size;
+  ViewChangeType change_type;
+  gpointer key, value;
+  gchar **opened_apps, **closed_apps;
+  gint i, j;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (user_data), FALSE);
+
+  matcher = (BamfMatcher*) user_data;
+  priv = matcher->priv;
+
+  ht_size = g_hash_table_size (priv->opened_closed_paths_table);
+  /* these will end with NULL pointer */
+  opened_apps = g_new0 (gchar*, ht_size+1);
+  closed_apps = g_new0 (gchar*, ht_size+1);
+  i = 0;
+  j = 0;
+
+  g_hash_table_iter_init (&iter, priv->opened_closed_paths_table);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      change_type = (ViewChangeType) GPOINTER_TO_INT (value);
+      if (change_type == VIEW_ADDED)
+        opened_apps[i++] = (gchar*) key;
+      else
+        closed_apps[j++] = (gchar*) key;
+    }
+
+  /* the strings are owned by the hashtable, so emit the signal and clear
+   * the hashtable then */
+  g_signal_emit_by_name (matcher, "running-applications-changed",
+                         opened_apps, closed_apps);
+
+  g_hash_table_remove_all (priv->opened_closed_paths_table);
+
+  g_free (closed_apps);
+  g_free (opened_apps);
+
+  priv->dispatch_changes_id = 0;
+
+  return FALSE;
+}
+
+static void bamf_matcher_prepare_path_change (BamfMatcher *self, const gchar *desktop_file, ViewChangeType change_type)
+{
+  GList *l;
+  BamfView *view;
+  BamfMatcherPrivate *priv;
+  const char *app_desktop;
+  gboolean found = FALSE;
+
+  if (desktop_file == NULL) return;
+
+  g_return_if_fail (BAMF_IS_MATCHER (self));
+
+  priv = self->priv;
+
+  for (l = priv->views; l; l = l->next)
+    {
+      view = l->data;
+
+      if (!BAMF_IS_APPLICATION (view) || !bamf_view_is_running (view))
+        continue;
+
+      app_desktop = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
+      if (!app_desktop) continue;
+
+      if (g_strcmp0 (desktop_file, app_desktop) == 0)
+        {
+          found = TRUE;
+          break;
+        }
+    }
+
+  /* the app was already running (ADDED) / had more instances which are still
+   * there (REMOVED) */
+  if (found) return;
+
+  if (!priv->opened_closed_paths_table)
+    {
+      priv->opened_closed_paths_table = g_hash_table_new_full (g_str_hash,
+                                                               g_str_equal,
+                                                               g_free, NULL);
+    }
+
+  g_hash_table_insert (priv->opened_closed_paths_table,
+                       g_strdup (desktop_file), GINT_TO_POINTER (change_type));
+
+  if (priv->dispatch_changes_id == 0)
+    {
+      priv->dispatch_changes_id = g_timeout_add (500, emit_paths_changed, self);
+    }
+}
+
 static void
 on_view_closed (BamfView *view, BamfMatcher *self)
 {
@@ -139,6 +247,13 @@
   g_signal_connect (G_OBJECT (view), "active-changed",
                     (GCallback) on_view_active_changed, self);
 
+
+  if (BAMF_IS_APPLICATION (view))
+    {
+      bamf_matcher_prepare_path_change (self,
+        bamf_application_get_desktop_file (BAMF_APPLICATION (view)), VIEW_ADDED);
+    }
+
   self->priv->views = g_list_prepend (self->priv->views, view);
   g_object_ref (view);
 
@@ -166,6 +281,14 @@
   if (unref)
     {
       self->priv->views = g_list_remove (self->priv->views, view);
+
+      if (BAMF_IS_APPLICATION (view))
+        {
+          bamf_matcher_prepare_path_change (self,
+              bamf_application_get_desktop_file (BAMF_APPLICATION (view)),
+              VIEW_REMOVED);
+        }
+
       g_object_unref (view);
     }
 }
@@ -1462,8 +1585,8 @@
   BamfLegacyWindow *window;
   GList *views, *a;
   const char *win_class;
-  char *desktop_file;
-  char *app_class;
+  const char *desktop_file;
+  const char *app_class;
   BamfApplication *app = NULL, *best = NULL;
   BamfView *view;
 
@@ -1512,9 +1635,6 @@
           if (bamf_application_contains_similar_to_window (app, bamf_window) && (!best || !g_strcmp0 (win_class, app_class)))
             best = app;
         }
-
-      g_free (desktop_file);
-      g_free (app_class);
     }
 
   if (!best)
@@ -1723,7 +1843,7 @@
 {
   GList *possible_apps, *l;
   GList *views, *a;
-  char *desktop_file;
+  const char *desktop_file;
   BamfApplication *app = NULL, *best = NULL;
   BamfView *view;
 
@@ -1761,8 +1881,6 @@
                 }
             }
         }
-        
-      g_free (desktop_file);
     }
 
   if (!best)
@@ -1991,7 +2109,7 @@
 bamf_matcher_application_is_running (BamfMatcher *matcher,
                                      const char *application)
 {
-  char * desktop_file;
+  const char * desktop_file;
   GList *l;
   BamfView *view;
   BamfMatcherPrivate *priv;
@@ -2010,10 +2128,8 @@
       desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
       if (g_strcmp0 (desktop_file, application) == 0)
         {
-          g_free (desktop_file);
           return bamf_view_is_running (view);
         }
-      g_free (desktop_file);
     }
 
   return FALSE;
@@ -2084,7 +2200,7 @@
                                         const char *application)
 {
   const char * path = "";
-  char * desktop_file;
+  const char * desktop_file;
   GList *l;
   BamfView *view;
   BamfMatcherPrivate *priv;
@@ -2105,7 +2221,6 @@
         {
           path = bamf_view_get_path (view);
         }
-      g_free (desktop_file);
     }
 
   return path;
@@ -2176,6 +2291,59 @@
 }
 
 GVariant *
+bamf_matcher_running_applications_desktop_files (BamfMatcher *matcher)
+{
+  GList *l;
+  BamfView *view;
+  BamfMatcherPrivate *priv;
+  GSequence *paths;
+  GSequenceIter *iter;
+  const char *desktop_file;
+  GVariantBuilder b;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
+
+  g_variant_builder_init (&b, G_VARIANT_TYPE ("(as)"));
+  g_variant_builder_open (&b, G_VARIANT_TYPE ("as"));
+
+  paths = g_sequence_new (NULL);
+  
+  priv = matcher->priv;
+
+  for (l = priv->views; l; l = l->next)
+    {
+      view = l->data;
+
+      if (!BAMF_IS_APPLICATION (view) || !bamf_view_is_running (view))
+        continue;
+
+      desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
+      if (!desktop_file) continue;
+      
+      if (g_sequence_lookup (paths, (gpointer) desktop_file,
+                             (GCompareDataFunc) g_strcmp0, NULL) == NULL)
+        {
+          g_sequence_insert_sorted (paths, (gpointer) desktop_file, 
+                                    (GCompareDataFunc) g_strcmp0, NULL);
+        }
+    }
+
+  iter = g_sequence_get_begin_iter (paths);
+  while (!g_sequence_iter_is_end (iter))
+    {
+      g_variant_builder_add (&b, "s", g_sequence_get (iter));
+
+      iter = g_sequence_iter_next (iter);
+    }
+
+  g_sequence_free (paths);
+
+  g_variant_builder_close (&b);
+
+  return g_variant_builder_end (&b);
+}
+
+GVariant *
 bamf_matcher_tab_dbus_paths (BamfMatcher *matcher)
 {
   GVariantBuilder b;
@@ -2192,7 +2360,7 @@
 {
   GVariantBuilder b;
   GVariant *xids;
-  char * desktop_file;
+  const char * desktop_file;
   GList *l;
   BamfView *view;
   BamfMatcherPrivate *priv;
@@ -2213,10 +2381,8 @@
       if (g_strcmp0 (desktop_file, application) == 0)
         {
           xids = bamf_application_get_xids (BAMF_APPLICATION (view));
-          g_free (desktop_file);
           break;
         }
-      g_free (desktop_file);
     }
 
   if (!xids)
@@ -2288,6 +2454,17 @@
 }
 
 static gboolean
+on_dbus_handle_running_applications_desktop_files (BamfDBusMatcher *interface,
+                                                   GDBusMethodInvocation *invocation,
+                                                   BamfMatcher *self)
+{
+  GVariant *paths = bamf_matcher_running_applications_desktop_files (self);
+  g_dbus_method_invocation_return_value (invocation, paths);
+
+  return TRUE;
+}
+
+static gboolean
 on_dbus_handle_active_application (BamfDBusMatcher *interface,
                                    GDBusMethodInvocation *invocation,
                                    BamfMatcher *self)
@@ -2436,6 +2613,9 @@
   g_signal_connect (self, "handle-running-applications",
                     G_CALLBACK (on_dbus_handle_running_applications), self);
 
+  g_signal_connect (self, "handle-running-applications-desktop-files",
+                    G_CALLBACK (on_dbus_handle_running_applications_desktop_files), self);
+  
   g_signal_connect (self, "handle-active-window",
                     G_CALLBACK (on_dbus_handle_active_window), self);
 
@@ -2497,6 +2677,17 @@
   g_hash_table_destroy (priv->desktop_class_table);
   g_hash_table_destroy (priv->registered_pids);
 
+  if (priv->opened_closed_paths_table)
+    {
+      g_hash_table_destroy (priv->opened_closed_paths_table);
+    }
+
+  if (priv->dispatch_changes_id != 0)
+    {
+      g_source_remove (priv->dispatch_changes_id);
+      priv->dispatch_changes_id = 0;
+    }
+
   g_list_free_full (priv->views, g_object_unref);
 
   g_signal_handlers_disconnect_by_func (screen, handle_window_opened, self);

=== modified file 'src/org.ayatana.bamf.xml'
--- src/org.ayatana.bamf.xml	2012-01-10 14:28:44 +0000
+++ src/org.ayatana.bamf.xml	2012-01-20 16:06:24 +0000
@@ -30,6 +30,9 @@
     <method name="RunningApplications">
       <arg name="paths" type="as" direction="out"/>
     </method>
+    <method name="RunningApplicationsDesktopFiles">
+      <arg name="paths" type="as" direction="out"/>
+    </method>
     <method name="RegisterFavorites">
       <arg name="favorites" type="as" direction="in"/>
     </method>
@@ -79,5 +82,9 @@
     </signal>
     <signal name="StackingOrderChanged">
     </signal>
+    <signal name="RunningApplicationsChanged">
+      <arg name="opened_desktop_files" type="as"/>
+      <arg name="closed_desktop_files" type="as"/>
+    </signal>
   </interface>
 </node>