Merge lp:~3v1n0/unity/fix-multiscreen-indicators-geometries into lp:unity/4.0

[Marco Trevisan (Treviño)]

Add support to multi-geometries indicator entries in unity-panel-service to fix bug #869196

[Neil J. Patel (njpatel)]

Excellent work.

review: Approve

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-10-07 13:26:30 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-10-11 15:07:25 +0000
@@ -136,6 +136,7 @@
 {
   if (_track_menu_pointer_id)
     g_source_remove(_track_menu_pointer_id);
+
   _style->UnReference();
   UBusServer *ubus = ubus_server_get_default();
   ubus_server_unregister_interest(ubus, _handle_bg_color_update);
@@ -143,6 +144,9 @@
   ubus_server_unregister_interest(ubus, _handle_dash_shown);
   _on_indicator_updated_connections.clear();
 
+  indicator::EntryLocationMap locations;
+  _remote->SyncGeometries(GetName() + boost::lexical_cast<std::string>(_monitor), locations);
+
   delete _bg_layer;
 }
 
@@ -272,7 +276,7 @@
 
   GfxContext.PopClippingRectangle();
 
-  if (_needs_geo_sync && _menu_view->GetControlsActive())
+  if (_needs_geo_sync)
   {
     SyncGeometries();
     _needs_geo_sync = false;
@@ -622,9 +626,13 @@
 PanelView::SyncGeometries()
 {
   indicator::EntryLocationMap locations;
-  _menu_view->GetGeometryForSync(locations);
+  std::string panel_id = GetName() + boost::lexical_cast<std::string>(_monitor);
+
+  if (_menu_view->GetControlsActive())
+    _menu_view->GetGeometryForSync(locations);
+
   _indicators->GetGeometryForSync(locations);
-  _remote->SyncGeometries(GetName(), locations);
+  _remote->SyncGeometries(panel_id, locations);
 }
 
 void
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-09-28 15:26:17 +0000
+++ services/panel-service.c	2011-10-11 15:07:25 +0000
@@ -49,7 +49,7 @@
 {
   GSList     *indicators;
   GHashTable *entry2indicator_hash;
-  GHashTable *entry2geometry_hash;
+  GHashTable *panel2entries_hash;
 
   guint  initial_sync_id;
   gint32 timeouts[N_TIMEOUT_SLOTS];
@@ -134,7 +134,7 @@
   gint i;
 
   g_hash_table_destroy (priv->entry2indicator_hash);
-  g_hash_table_destroy (priv->entry2geometry_hash);
+  g_hash_table_destroy (priv->panel2entries_hash);
 
   gdk_window_remove_filter (NULL, (GdkFilterFunc)event_filter, object);
 
@@ -300,19 +300,25 @@
 static IndicatorObjectEntry *
 get_entry_at (PanelService *self, gint x, gint y)
 {
-  GHashTableIter iter;
-  gpointer key, value;
+  GHashTableIter panel_iter, entries_iter;
+  gpointer key, value, k, v;
 
-  g_hash_table_iter_init (&iter, self->priv->entry2geometry_hash);
-  while (g_hash_table_iter_next (&iter, &key, &value)) 
+  g_hash_table_iter_init (&panel_iter, self->priv->panel2entries_hash);
+  while (g_hash_table_iter_next (&panel_iter, &key, &value))
     {
-      IndicatorObjectEntry *entry = key;
-      GdkRectangle *geo = value;
+      GHashTable *entry2geometry_hash = value;
+      g_hash_table_iter_init (&entries_iter, entry2geometry_hash);
 
-      if (x >= geo->x && x <= (geo->x + geo->width) &&
-          y >= geo->y && y <= (geo->y + geo->height))
+      while (g_hash_table_iter_next (&entries_iter, &k, &v))
         {
-          return entry;
+          IndicatorObjectEntry *entry = k;
+          GdkRectangle *geo = v;
+
+          if (x >= geo->x && x <= (geo->x + geo->width) &&
+              y >= geo->y && y <= (geo->y + geo->height))
+            {
+              return entry;
+            }
         }
     }
 
@@ -350,8 +356,9 @@
   gdk_window_add_filter (NULL, (GdkFilterFunc)event_filter, self);
 
   priv->entry2indicator_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-  priv->entry2geometry_hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-                                                     NULL, g_free);
+  priv->panel2entries_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                    g_free,
+                                                    (GDestroyNotify) g_hash_table_destroy);
 
   suppress_signals = TRUE;
   load_indicators (self);
@@ -388,7 +395,19 @@
       for (l = entries; l; l = l->next)
         {
           g_hash_table_remove (self->priv->entry2indicator_hash, l->data);
-          g_hash_table_remove (self->priv->entry2geometry_hash, l->data);
+
+          GHashTableIter iter;
+          gpointer key, value;
+          g_hash_table_iter_init (&iter, self->priv->panel2entries_hash);
+          while (g_hash_table_iter_next (&iter, &key, &value))
+            {
+              GHashTable *entry2geometry_hash = value;
+
+              if (g_hash_table_size (entry2geometry_hash) > 1)
+                g_hash_table_remove (entry2geometry_hash, l->data);
+              else
+                g_hash_table_iter_remove (&iter);
+            }
         }
 
       g_list_free (entries);
@@ -649,7 +668,7 @@
   priv = self->priv;
 
   g_hash_table_remove (priv->entry2indicator_hash, entry);
-  /* Don't remove here the value from priv->entry2geometry_hash, this should
+  /* Don't remove here the value from priv->panel2entries_hash, this should
    * be done in during the sync, to avoid false positive.
    * FIXME this in libappmenu.so to avoid to send an "entry-removed" signal
    * when switching the focus from a window to one of its dialog children */
@@ -1033,6 +1052,7 @@
   priv->last_top = 0;
   priv->last_bottom = 0;
 
+  priv->use_event = FALSE;
   priv->pressed_entry = NULL;
 
   g_signal_emit (self, _service_signals[ENTRY_ACTIVATED], 0, "");
@@ -1105,12 +1125,12 @@
 
 void
 panel_service_sync_geometry (PanelService *self,
-           const gchar *indicator_id,
-           const gchar *entry_id,
-           gint x,
-           gint y,
-           gint width,
-           gint height)
+                             const gchar *panel_id,
+                             const gchar *entry_id,
+                             gint x,
+                             gint y,
+                             gint width,
+                             gint height)
 {
   PanelServicePrivate *priv = self->priv;
   IndicatorObjectEntry *entry = get_entry_by_id (entry_id);
@@ -1118,18 +1138,42 @@
 
   if (entry)
     {
+      GHashTable *entry2geometry_hash = g_hash_table_lookup (priv->panel2entries_hash, panel_id);
+
       if (width < 0 || height < 0)
         {
-          g_hash_table_remove (priv->entry2geometry_hash, entry);
+          if (entry2geometry_hash)
+            {
+              if (g_hash_table_size (entry2geometry_hash) > 1)
+                {
+                  g_hash_table_remove (entry2geometry_hash, entry);
+                }
+              else
+                {
+                  g_hash_table_remove (priv->panel2entries_hash, panel_id);
+                }
+            }
         }
       else
         {
-          GdkRectangle *geo = g_hash_table_lookup (priv->entry2geometry_hash, entry);
+          GdkRectangle *geo = NULL;
+
+          if (entry2geometry_hash == NULL)
+          {
+            entry2geometry_hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                                         g_free, g_free);
+            g_hash_table_insert (priv->panel2entries_hash, g_strdup (panel_id),
+                                 entry2geometry_hash);
+          }
+          else
+          {
+            geo = g_hash_table_lookup (entry2geometry_hash, entry);
+          }
 
           if (geo == NULL)
             {
               geo = g_new (GdkRectangle, 1);
-              g_hash_table_insert (priv->entry2geometry_hash, entry, geo);
+              g_hash_table_insert (entry2geometry_hash, entry, geo);
             }
 
           geo->x = x;