Merge lp:~3v1n0/bamf/g-control-center-rematching into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Fixed bug bug #801784 making gnome-control-center to rematch in BAMF

Used a similar hack used for re-matching libreoffice. Here the gnome-control-center window is rematched when its name changes, getting its ID from the defined WM_WINDOW_ROLE.

Also I've fixed a bug that caused all the gnome-control-center desktop to be ignored by the matcher, only the last parsed was considered by bamf before (due to this when doing "gnome-control-center display" in a terminal, the window was matched as a generic g-c-c window, not as the display one). To do this, I've added a white-list regex to match the prefixes that must not be ignored and that should be included into the exec string (I guess that this can be useful also for fixing the matching of the wine apps).

Note that this branch to work correctly needs lp:~3v1n0/ubuntu/precise/gnome-control-center/add-window-role-to-panels
If no patched gnome-control-center is found, all the gnome-control-center windows will always be shown as generic g-c-c windows.

[lp:~3v1n0/bamf/g-control-center-rematching]

432. By Marco Trevisan (Treviño) on 2012-01-26

BamfMatcher: don't include bzr as a good prefix.

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-01-17 08:57:56 +0000
+++ src/bamf-matcher.c	2012-01-26 14:33:26 +0000
@@ -51,6 +51,7 @@
 struct _BamfMatcherPrivate
 {
   GArray          * bad_prefixes;
+  GArray          * good_prefixes;
   GArray          * known_pids;
   GHashTable      * desktop_id_table;
   GHashTable      * desktop_file_table;
@@ -297,7 +298,9 @@
 get_open_office_window_hint (BamfMatcher * self, BamfLegacyWindow * window)
 {
   const gchar *name;
+  const gchar *class;
   char *exec = NULL;
+  BamfWindowType type;
   GHashTable *desktopFileTable;
   GList *list;
 
@@ -305,8 +308,8 @@
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
   name = bamf_legacy_window_get_name (window);
-  const gchar *class = bamf_legacy_window_get_class_name (window);
-  BamfWindowType type = bamf_legacy_window_get_window_type (window);
+  class = bamf_legacy_window_get_class_name (window);
+  type = bamf_legacy_window_get_window_type (window);
 
   if (name == NULL && class == NULL)
     return NULL;
@@ -418,6 +421,7 @@
   gchar **parts;
   gint i, j;
   gboolean regexFail;
+  gboolean goodPrefix = FALSE;
   GRegex *regex;
 
   if (!execString || (execString && execString[0] == '\0'))
@@ -431,29 +435,57 @@
     {
       part = parts[i];
 
-      if (!g_str_has_prefix (part, "-"))
+      if (part[0] != '-')
         {
-          tmp = g_utf8_strrchr (part, -1, G_DIR_SEPARATOR);
-          if (tmp)
-                  part = tmp + 1;
-
-          regexFail = FALSE;
-          for (j = 0; j < self->priv->bad_prefixes->len; j++)
-            {
-              regex = g_array_index (self->priv->bad_prefixes, GRegex *, j);
-              if (g_regex_match (regex, part, 0, NULL))
-                {
-                  regexFail = TRUE;
+          if (goodPrefix)
+            {
+              gchar *tmp = g_strconcat (result, " ", part, NULL);
+              g_free (result);
+              result = tmp;
+            }
+          else
+            {
+              for (j = 0; j < self->priv->good_prefixes->len; j++)
+                {
+                  regex = g_array_index (self->priv->good_prefixes, GRegex *, j);
+                  if (g_regex_match (regex, part, 0, NULL))
+                    {
+                      goodPrefix = TRUE;
+                      result = g_strdup (part);
+                      break;
+                    }
+                }
+            }
+
+          if (!goodPrefix)
+            {
+              tmp = g_utf8_strrchr (part, -1, G_DIR_SEPARATOR);
+              if (tmp)
+                part = tmp + 1;
+
+              regexFail = FALSE;
+              for (j = 0; j < self->priv->bad_prefixes->len; j++)
+                {
+                  regex = g_array_index (self->priv->bad_prefixes, GRegex *, j);
+                  if (g_regex_match (regex, part, 0, NULL))
+                    {
+                      regexFail = TRUE;
+                      break;
+                    }
+                }
+
+              if (!regexFail)
+                {
+                  result = g_strdup (part);
                   break;
                 }
             }
+        }
+      else if (goodPrefix)
+        {
+          break;
+        }
 
-          if (!regexFail)
-            {
-              result = g_strdup (part);
-              break;
-            }
-        }
       i++;
     }
 
@@ -479,7 +511,7 @@
 }
 
 static GArray *
-prefix_strings (BamfMatcher * self)
+bad_prefix_strings (void)
 {
   GArray *arr = g_array_new (FALSE, TRUE, sizeof (char *));
 
@@ -514,6 +546,17 @@
 }
 
 static GArray *
+good_prefix_strings (void)
+{
+  GArray *arr = g_array_new (FALSE, TRUE, sizeof (char *));
+
+  char *str = "^gnome-control-center$";
+  g_array_append_val (arr, str);
+
+  return arr;
+}
+
+static GArray *
 pid_parent_tree (BamfMatcher *self, gint pid)
 {
   BamfMatcherPrivate *priv;
@@ -1269,11 +1312,8 @@
 }
 
 static char *
-get_window_hint (BamfMatcher *self,
-                 BamfLegacyWindow *window,
-                 const char *atom_name)
+get_window_hint (BamfLegacyWindow *window, const char *atom_name)
 {
-  g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
   Window xid = bamf_legacy_window_get_xid (window);
@@ -1281,12 +1321,8 @@
 }
 
 static void
-set_window_hint (BamfMatcher * self,
-                 BamfLegacyWindow * window,
-                 const char *atom_name,
-                 const char *data)
+set_window_hint (BamfLegacyWindow * window, const char *atom_name, const char *data)
 {
-  g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_LEGACY_WINDOW (window));
 
   Window xid = bamf_legacy_window_get_xid (window);
@@ -1452,7 +1488,7 @@
 
   window = bamf_window_get_window (bamf_window);
 
-  hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
+  hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
   const char *window_class = bamf_legacy_window_get_class_name (window);
 
   if (hint && hint[0] != '\0' && !is_web_app_window(self, window))
@@ -1690,7 +1726,7 @@
       return;
     }
 
-  window_hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
+  window_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
   if (window_hint)
     {
       if (window_hint[0] != '\0')
@@ -1732,7 +1768,7 @@
   g_array_free (pids, TRUE);
 
   if (window_hint)
-    set_window_hint (self, window, _NET_WM_DESKTOP_FILE, window_hint);
+    set_window_hint (window, _NET_WM_DESKTOP_FILE, window_hint);
 }
 
 static void
@@ -1769,7 +1805,7 @@
   char *old_hint;
   const char *new_hint;
 
-  old_hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
+  old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
   new_hint = get_open_office_window_hint (self, window);
 
   if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
@@ -1787,6 +1823,67 @@
   g_object_unref (window);
 }
 
+static char *
+get_gnome_control_center_window_hint (BamfMatcher * self, BamfLegacyWindow * window)
+{
+  gchar *role;
+  gchar *exec;
+  GHashTable *desktopFileTable;
+  GList *list;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
+  g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
+
+  role = get_window_hint (window, WM_WINDOW_ROLE);
+
+  if (role && role[0] == '\0')
+    {
+      g_free (role);
+      role = NULL;
+    }
+
+  exec = g_strconcat ("gnome-control-center", (role ? " " : NULL), role, NULL);
+
+  desktopFileTable = self->priv->desktop_file_table;
+  list = g_hash_table_lookup (desktopFileTable, exec);
+
+  if (!list && g_strcmp0 ("gnome-control-center", exec) != 0)
+    {
+      list = g_hash_table_lookup (desktopFileTable, "gnome-control-center");
+    }
+
+  g_free (exec);
+
+  return (list ? (char *) list->data : NULL);
+}
+
+static void
+on_gnome_control_center_window_name_changed (BamfLegacyWindow *window, BamfMatcher* self)
+{
+  g_return_if_fail (BAMF_IS_MATCHER (self));
+  g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
+
+  char *old_hint;
+  const char *new_hint;
+
+  old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+  new_hint = get_gnome_control_center_window_hint (self, window);
+
+  if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
+    {
+      bamf_legacy_window_reopen (window);
+    }
+
+  g_free (old_hint);
+}
+
+static void
+on_gnome_control_center_window_closed (BamfLegacyWindow *window, BamfMatcher* self)
+{
+  g_signal_handlers_disconnect_by_func (window, on_gnome_control_center_window_name_changed, self);
+  g_object_unref (window);
+}
+
 static void
 handle_window_opened (BamfLegacyScreen * screen, BamfLegacyWindow * window, BamfMatcher *self)
 {
@@ -1813,12 +1910,12 @@
           return;
         }
 
-      char *old_hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
+      char *old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
       const char *new_hint = get_open_office_window_hint (self, window);
 
       if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
         {
-          set_window_hint (self, window, _NET_WM_DESKTOP_FILE, new_hint);
+          set_window_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
         }
 
       g_object_ref (window);
@@ -1827,6 +1924,22 @@
 
       g_free (old_hint);
     }
+  else if (g_strcmp0 (bamf_legacy_window_get_class_name (window), "Gnome-control-center") == 0)
+    {
+      char *old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+      const char *new_hint = get_gnome_control_center_window_hint (self, window);
+
+      if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
+        {
+          set_window_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
+        }
+
+      g_object_ref (window);
+      g_signal_connect (window, "name-changed", (GCallback) on_gnome_control_center_window_name_changed, self);
+      g_signal_connect (window, "closed", (GCallback) on_gnome_control_center_window_closed, self);
+
+      g_free (old_hint);
+    }
 
   /* we have a window who is ready to be matched */
   handle_raw_window (self, window);
@@ -2567,17 +2680,26 @@
 
   priv->known_pids = g_array_new (FALSE, TRUE, sizeof (gint));
   priv->bad_prefixes = g_array_new (FALSE, TRUE, sizeof (GRegex *));
+  priv->good_prefixes = g_array_new (FALSE, TRUE, sizeof (GRegex *));
   priv->registered_pids = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                                  NULL, g_free);
 
-  prefixstrings = prefix_strings (self);
+  prefixstrings = bad_prefix_strings ();
   for (i = 0; i < prefixstrings->len; i++)
     {
       char *str = g_array_index (prefixstrings, char *, i);
       GRegex *regex = g_regex_new (str, G_REGEX_OPTIMIZE, 0, NULL);
       g_array_append_val (priv->bad_prefixes, regex);
     }
+  g_array_free (prefixstrings, TRUE);
 
+  prefixstrings = good_prefix_strings ();
+  for (i = 0; i < prefixstrings->len; i++)
+    {
+      char *str = g_array_index (prefixstrings, char *, i);
+      GRegex *regex = g_regex_new (str, G_REGEX_OPTIMIZE, 0, NULL);
+      g_array_append_val (priv->good_prefixes, regex);
+    }
   g_array_free (prefixstrings, TRUE);
 
   create_desktop_file_table (self, &(priv->desktop_file_table),
@@ -2670,7 +2792,14 @@
       g_regex_unref (regex);
     }
 
+  for (i = 0; i < priv->good_prefixes->len; i++)
+    {
+      GRegex *regex = g_array_index (priv->good_prefixes, GRegex *, i);
+      g_regex_unref (regex);
+    }
+
   g_array_free (priv->bad_prefixes, TRUE);
+  g_array_free (priv->good_prefixes, TRUE);
   g_array_free (priv->known_pids, TRUE);
   g_hash_table_destroy (priv->desktop_id_table);
   g_hash_table_destroy (priv->desktop_file_table);

=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h	2012-01-09 18:02:45 +0000
+++ src/bamf-matcher.h	2012-01-26 14:33:26 +0000
@@ -46,6 +46,7 @@
 #define BAMF_MATCHER_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
 
 #define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"
+#define WM_WINDOW_ROLE       "WM_WINDOW_ROLE"
 
 typedef struct _BamfMatcher BamfMatcher;
 typedef struct _BamfMatcherClass BamfMatcherClass;