Merge lp:~3v1n0/unity/panelmenu-fixes into lp:unity

[Marco Trevisan (Treviño)]

Fixed lots of other PanelMenuView related bugs (see the linked list of "In Progress bugs" for reference).

In particular, I've also changed these things:
 - Moving to nux::GetGraphicsDisplay()->GetMouseScreenCoord() (instead of gdk functions,
   warning this needs nux bzr-453 or newer not to crash, thanks to Jay for fixing!)
 - Checking for mouse position after closing menus to hide/show them (bug bug #843670)
 - Checking for mouse position after dragging a window to to hide/show menus
 - Fix for PluginAdapter not to consider unmapped windows as maximized (bug #781215)
 - Panel-service: correctly close menus when releasing mouse outside a menu title (bug #844309)
 - Panel-service: cache the indicator entries geometry and use the values for checking mouse position
 - Don't redecorate windows on maximization drag (bug #838923)
 - panel-service: Remove id2entry_hash and use sscanf to parse the entries IDs
 - PanelView: track mouse position only when it has been changed (fix bug #834065)
 - PanelMenuView / PanelIndicatorsView: remove code duplication for adding an entry
 - Better mouse grab management using only PanelTitleGrabArea
 - PanelMenuView: even more checks to avoid to show/hide menus when we shouldn't
 - PanelView: sync geometries for real

See the related commit logs for more informations.

This branch, to work properly, needs the updated UnityCore code that I've pushed in my lp:~3v1n0/unity/menus-switching-hacks branch (for the entries geometry things), so in the case that the other branch isn't accepted, we need to port its UnityCore changes here.

PS: for the record, this is the previous merge request for this branch: https://code.launchpad.net/~3v1n0/unity/panelmenu-fixes/+merge/73622

[Jason Smith (jassmith)]

Has a merge conflict if you merge your other branch in first. Conflicts are non-trivial (at least for me to fix)

review: Needs Fixing

[Gord Allott (gordallott)]

looks okay from here +1

review: Approve

[Jason Smith (jassmith)]

Switching to approved

review: Approve

[Neil J. Patel (njpatel)]

Excellent work Marco, approved.

review: Approve

=== modified file 'plugins/unityshell/src/PanelIndicatorsView.cpp'
--- plugins/unityshell/src/PanelIndicatorsView.cpp	2011-09-20 17:25:06 +0000
+++ plugins/unityshell/src/PanelIndicatorsView.cpp	2011-09-25 12:09:24 +0000
@@ -21,14 +21,9 @@
 #include <Nux/Nux.h>
 #include <Nux/Area.h>
 #include <Nux/HLayout.h>
-#include <Nux/VLayout.h>
 
 #include <NuxCore/Logger.h>
 
-#include <NuxGraphics/GLThread.h>
-#include <Nux/BaseWindow.h>
-#include <Nux/WindowCompositor.h>
-
 #include "PanelIndicatorsView.h"
 
 #include <UnityCore/Variant.h>
@@ -55,9 +50,9 @@
 
 PanelIndicatorsView::~PanelIndicatorsView()
 {
-  for (auto it = indicators_connections_.begin(); it != indicators_connections_.end(); it++)
+  for (auto ind : indicators_connections_)
   {
-    for (auto conn : it->second)
+    for (auto conn : ind.second)
       conn.disconnect();
   }
 }
@@ -130,11 +125,9 @@
 PanelIndicatorsView::QueueDraw()
 {
   nux::View::QueueDraw();
-  for (auto i = entries_.begin(), end = entries_.end(); i != end; ++i)
-  {
-    if (i->second)
-      i->second->QueueDraw();
-  }
+
+  for (auto entry : entries_)
+    entry.second->QueueDraw();
 }
 
 bool
@@ -155,9 +148,9 @@
 bool
 PanelIndicatorsView::ActivateIfSensitive()
 {
-  for (auto i = entries_.begin(), end = entries_.end(); i != end; ++i)
+  for (auto entry : entries_)
   {
-    PanelIndicatorEntryView* view = i->second;
+    PanelIndicatorEntryView* view = entry.second;
     if (view->IsSensitive())
     {
       view->Activate();
@@ -170,11 +163,8 @@
 void
 PanelIndicatorsView::GetGeometryForSync(indicator::EntryLocationMap& locations)
 {
-  for (auto i = entries_.begin(), end = entries_.end(); i != end; ++i)
-  {
-    if (i->second)
-      i->second->GetGeometryForSync(locations);
-  }
+  for (auto entry : entries_)
+    entry.second->GetGeometryForSync(locations);
 }
 
 bool
@@ -228,37 +218,45 @@
 PanelIndicatorsView::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   GfxContext.PushClippingRectangle(GetGeometry());
-  if (layout_)
-    layout_->ProcessDraw(GfxContext, force_draw);
+  layout_->ProcessDraw(GfxContext, force_draw);
   GfxContext.PopClippingRectangle();
 }
 
-void
-PanelIndicatorsView::OnEntryAdded(indicator::Entry::Ptr const& entry)
+PanelIndicatorEntryView *
+PanelIndicatorsView::AddEntry(indicator::Entry::Ptr const& entry, int padding, IndicatorEntryPosition pos)
 {
-  auto view = new PanelIndicatorEntryView(entry);
+  PanelIndicatorEntryView *view;
+  int entry_pos = pos;
+
+  if (padding > -1)
+    view = new PanelIndicatorEntryView(entry, padding);
+  else
+    view = new PanelIndicatorEntryView(entry);
+
   view->refreshed.connect(sigc::mem_fun(this, &PanelIndicatorsView::OnEntryRefreshed));
 
-  int indicator_pos = nux::NUX_LAYOUT_BEGIN;
-
-  if (entry->priority() > -1)
+  if (entry_pos == IndicatorEntryPosition::AUTO)
   {
-    for (nux::Area* &area : layout_->GetChildren())
+    entry_pos = nux::NUX_LAYOUT_BEGIN;
+
+    if (entry->priority() > -1)
     {
-      auto en = dynamic_cast<PanelIndicatorEntryView*>(area);
-
-      if (en)
+      for (auto area : layout_->GetChildren())
       {
-        if (en && entry->priority() <= en->GetEntryPriority())
-          break;
-
-        indicator_pos++;
+        auto en = dynamic_cast<PanelIndicatorEntryView*>(area);
+
+        if (en)
+        {
+          if (en && entry->priority() <= en->GetEntryPriority())
+            break;
+
+          entry_pos++;
+        }
       }
     }
   }
 
-  nux::LayoutPosition pos = (nux::LayoutPosition) indicator_pos;
-  layout_->AddView(view, 0, nux::eCenter, nux::eFull, 1.0, pos);
+  layout_->AddView(view, 0, nux::eCenter, nux::eFull, 1.0, (nux::LayoutPosition) entry_pos);
   layout_->SetContentDistribution(nux::eStackRight);
   entries_[entry->id()] = view;
 
@@ -267,6 +265,14 @@
   QueueDraw();
 
   on_indicator_updated.emit(view);
+
+  return view;
+}
+
+void
+PanelIndicatorsView::OnEntryAdded(indicator::Entry::Ptr const& entry)
+{
+  AddEntry(entry);
 }
 
 void
@@ -279,28 +285,36 @@
 }
 
 void
-PanelIndicatorsView::OnEntryRemoved(std::string const& entry_id)
+PanelIndicatorsView::RemoveEntry(std::string const& entry_id)
 {
   PanelIndicatorEntryView* view = entries_[entry_id];
 
   if (view)
   {
-    on_indicator_updated.emit(view);
     layout_->RemoveChildObject(view);
     entries_.erase(entry_id);
+    on_indicator_updated.emit(view);
 
     QueueRelayout();
     QueueDraw();
   }
 }
 
-void PanelIndicatorsView::DashShown()
+void
+PanelIndicatorsView::OnEntryRemoved(std::string const& entry_id)
+{
+  RemoveEntry(entry_id);
+}
+
+void
+PanelIndicatorsView::DashShown()
 {
   for (auto entry: entries_)
     entry.second->DashShown();
 }
 
-void PanelIndicatorsView::DashHidden()
+void
+PanelIndicatorsView::DashHidden()
 {
   for (auto entry: entries_)
     entry.second->DashHidden();
 
=== modified file 'plugins/unityshell/src/PanelIndicatorsView.h'
--- plugins/unityshell/src/PanelIndicatorsView.h	2011-09-15 11:33:58 +0000
+++ plugins/unityshell/src/PanelIndicatorsView.h	2011-09-25 12:09:24 +0000
@@ -22,6 +22,7 @@
 #define PANEL_INDICATORS_VIEW_H
 
 #include <Nux/View.h>
+#include <Nux/Layout.h>
 
 #include <UnityCore/Indicator.h>
 
@@ -41,6 +42,17 @@
   void AddIndicator(indicator::Indicator::Ptr const& indicator);
   void RemoveIndicator(indicator::Indicator::Ptr const& indicator);
 
+  typedef enum {
+    AUTO = -1,
+    START = nux::NUX_LAYOUT_BEGIN,
+    END = nux::NUX_LAYOUT_END,
+  } IndicatorEntryPosition;
+
+  PanelIndicatorEntryView* AddEntry(indicator::Entry::Ptr const& entry,
+                                    int padding = -1,
+                                    IndicatorEntryPosition pos = AUTO);
+  void RemoveEntry(std::string const& entry_id);
+
   bool OnPointerMoved(int x, int y);
   bool ActivateEntry(std::string const& entry_id);
   bool ActivateIfSensitive();
@@ -51,7 +63,7 @@
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void QueueDraw();
 
-  virtual void OnEntryAdded(indicator::Entry::Ptr const& proxy);
+  virtual void OnEntryAdded(indicator::Entry::Ptr const& entry);
   virtual void OnEntryRefreshed(PanelIndicatorEntryView* view);
   virtual void OnEntryRemoved(std::string const& entry_id);
 
 
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-09-19 03:03:53 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-09-25 12:09:24 +0000
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 #include <glib.h>
 #include <pango/pangocairo.h>
 #include <gtk/gtk.h>
-#include <X11/cursorfont.h>
 
 #include <Nux/Nux.h>
 #include <Nux/HLayout.h>
@@ -64,7 +64,6 @@
     _title_layer(NULL),
     _util_cg(CAIRO_FORMAT_ARGB32, 1, 1),
     _gradient_texture(NULL),
-    _title_tex(NULL),
     _is_inside(false),
     _is_maximized(false),
     _is_own_window(false),
@@ -77,15 +76,12 @@
     _monitor(0),
     _active_xid(0),
     _active_moved_id(0),
+    _update_show_now_id(0),
     _place_shown_interest(0),
     _place_hidden_interest(0)
 {
   WindowManager* win_manager;
 
-  _matcher = bamf_matcher_get_default();
-  _activate_window_changed_id = g_signal_connect(_matcher, "active-window-changed",
-                                                 G_CALLBACK(on_active_window_changed), this);
-
   // TODO: kill _menu_layout - should just use the _layout defined
   // in the base class.
   _menu_layout = new nux::HLayout("", NUX_TRACKER_LOCATION);
@@ -96,6 +92,10 @@
    */
   layout_ = _menu_layout;
 
+  _matcher = bamf_matcher_get_default();
+  _activate_window_changed_id = g_signal_connect(_matcher, "active-window-changed",
+                                                 G_CALLBACK(on_active_window_changed), this);
+
   _padding = padding;
   _name_changed_callback_instance = NULL;
   _name_changed_callback_id = 0;
@@ -109,23 +109,23 @@
   _window_buttons->restore_clicked.connect(sigc::mem_fun(this, &PanelMenuView::OnRestoreClicked));
   _window_buttons->mouse_enter.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseEnter));
   _window_buttons->mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
-  _window_buttons->mouse_move.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseMove));
+  //_window_buttons->mouse_move.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseMove));
 
   _panel_titlebar_grab_area = new PanelTitlebarGrabArea();
   _panel_titlebar_grab_area->SetParentObject(this);
   _panel_titlebar_grab_area->SinkReference();
+  _panel_titlebar_grab_area->mouse_down.connect(sigc::mem_fun(this, &PanelMenuView::OnMouseMiddleClicked));
   _panel_titlebar_grab_area->mouse_down.connect(sigc::mem_fun(this, &PanelMenuView::OnMaximizedGrabStart));
   _panel_titlebar_grab_area->mouse_drag.connect(sigc::mem_fun(this, &PanelMenuView::OnMaximizedGrabMove));
   _panel_titlebar_grab_area->mouse_up.connect(sigc::mem_fun(this, &PanelMenuView::OnMaximizedGrabEnd));
-  _panel_titlebar_grab_area->mouse_doubleleftclick.connect(sigc::mem_fun(this, &PanelMenuView::OnMouseDoubleClicked));
-  _panel_titlebar_grab_area->mouse_middleclick.connect(sigc::mem_fun(this, &PanelMenuView::OnMouseMiddleClicked));
+  _panel_titlebar_grab_area->mouse_double_click.connect(sigc::mem_fun(this, &PanelMenuView::OnMouseDoubleClicked));
 
   win_manager = WindowManager::Default();
 
   win_manager->window_minimized.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowMinimized));
   win_manager->window_unminimized.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowUnminimized));
-  win_manager->initiate_spread.connect(sigc::mem_fun(this, &PanelMenuView::OnSpreadInitiate));
-  win_manager->terminate_spread.connect(sigc::mem_fun(this, &PanelMenuView::OnSpreadTerminate));
+  //win_manager->initiate_spread.connect(sigc::mem_fun(this, &PanelMenuView::OnSpreadInitiate));
+  //win_manager->terminate_spread.connect(sigc::mem_fun(this, &PanelMenuView::OnSpreadTerminate));
 
   win_manager->window_maximized.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowMaximized));
   win_manager->window_restored.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowRestored));
@@ -136,7 +136,7 @@
 
   mouse_enter.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseEnter));
   mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
-  mouse_move.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseMove));
+  //mouse_move.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseMove));
 
   _panel_titlebar_grab_area->mouse_enter.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseEnter));
   _panel_titlebar_grab_area->mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
@@ -166,8 +166,6 @@
 
   if (_title_layer)
     delete _title_layer;
-  if (_title_tex)
-    _title_tex->UnReference();
 
   _menu_layout->UnReference();
   _window_buttons->UnReference();
@@ -345,11 +343,9 @@
   else
   {
     bool have_valid_entries = false;
-    Entries::iterator it, eit = entries_.end();
-
-    for (it = entries_.begin(); it != eit; ++it)
+    for (auto entry : entries_)
     {
-      if (it->second->IsEntryValid())
+      if (entry.second->IsEntryValid())
       {
         have_valid_entries = true;
         break;
@@ -408,12 +404,12 @@
       nux::TexCoordXForm texxform1;
 
       // Modulate the checkboard and the gradient texture
-      if (_title_tex)
+      if (_title_layer)
         GfxContext.QRP_2TexMod(geo.x, geo.y,
                                geo.width, geo.height,
                                _gradient_texture, texxform0,
                                nux::color::White,
-                               _title_tex->GetDeviceTexture(),
+                               _title_layer->GetDeviceTexture(),
                                texxform1,
                                nux::color::White);
 
@@ -449,14 +445,16 @@
   if (!_is_own_window && !_places_showing && _we_control_active)
   {
     if (_is_inside || _last_active_view || _show_now_activated)
-      layout_->ProcessDraw(GfxContext, force_draw);
-  }
-
-    if ((!_is_own_window && _we_control_active && _is_maximized && (_is_inside || _show_now_activated)) ||
-        _places_showing)
     {
-      _window_buttons->ProcessDraw(GfxContext, true);
+      _menu_layout->ProcessDraw(GfxContext, force_draw);
     }
+  }
+
+  if ((!_is_own_window && _we_control_active && _is_maximized &&
+      (_is_inside || _show_now_activated)) || _places_showing)
+  {
+    _window_buttons->ProcessDraw(GfxContext, true);
+  }
 
   GfxContext.PopClippingRectangle();
 }
@@ -682,12 +680,7 @@
                                        nux::color::White,
                                        true,
                                        rop);
-
-  if (_title_tex)
-    _title_tex->UnReference();
-
-  _title_tex = texture2D;
-
+  texture2D->UnReference();
   g_free(label);
 }
 
@@ -709,26 +702,26 @@
   FullRedraw();
 }
 
-void PanelMenuView::OnEntryAdded(unity::indicator::Entry::Ptr const& proxy)
+void
+PanelMenuView::OnEntryAdded(unity::indicator::Entry::Ptr const& entry)
 {
-  PanelIndicatorEntryView* view = new PanelIndicatorEntryView(proxy, 6);
+  auto view = AddEntry(entry, 6, IndicatorEntryPosition::END);
+
+  entry->show_now_changed.connect(sigc::mem_fun(this, &PanelMenuView::UpdateShowNow));
+
   view->active_changed.connect(sigc::mem_fun(this, &PanelMenuView::OnActiveChanged));
-  view->refreshed.connect(sigc::mem_fun(this, &PanelIndicatorsView::OnEntryRefreshed));
-  proxy->show_now_changed.connect(sigc::mem_fun(this, &PanelMenuView::UpdateShowNow));
-
-  _menu_layout->AddView(view, 0, nux::eCenter, nux::eFull, 1.0, nux::NUX_LAYOUT_END);
-  _menu_layout->SetContentDistribution(nux::eStackLeft);
-
-  entries_[proxy->id()] = view;
-  AddChild(view);
-
   view->mouse_enter.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseEnter));
   view->mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
-
-  QueueRelayout();
-  QueueDraw();
-
-  on_indicator_updated.emit(view);
+}
+
+void
+PanelMenuView::AllMenusClosed()
+{
+  auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+  _is_inside = GetAbsoluteGeometry().IsPointInside(mouse.x, mouse.y);
+  _last_active_view = NULL;
+
+  FullRedraw();
 }
 
 void
@@ -815,7 +808,6 @@
 void
 PanelMenuView::OnWindowMinimized(guint32 xid)
 {
-
   if (WindowManager::Default()->IsWindowMaximized(xid))
   {
     WindowManager::Default()->Decorate(xid);
@@ -844,25 +836,32 @@
 PanelMenuView::OnWindowMaximized(guint xid)
 {
   BamfWindow* window;
+  bool updated = false;
 
   window = bamf_matcher_get_active_window(_matcher);
   if (BAMF_IS_WINDOW(window) && bamf_window_get_xid(window) == xid)
   {
     _is_maximized = true;
+
+    // We need to update the _is_inside state in the case of maximization by grab
+    auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+    _is_inside = GetAbsoluteGeometry().IsPointInside(mouse.x, mouse.y);
+    updated = true;
   }
 
   // update the state of the window in the _decor_map
   _decor_map[xid] = WindowManager::Default()->IsWindowDecorated(xid);
 
   if (_decor_map[xid])
-  {
     WindowManager::Default()->Undecorate(xid);
-  }
 
   _maximized_set.insert(xid);
 
-  Refresh();
-  FullRedraw();
+  if (updated)
+  {
+    Refresh();
+    FullRedraw();
+  }
 }
 
 void
@@ -870,6 +869,9 @@
 {
   BamfWindow* window;
 
+  if (_maximized_set.find(xid) == _maximized_set.end())
+    return;
+
   window = bamf_matcher_get_active_window(_matcher);
   if (BAMF_IS_WINDOW(window) && bamf_window_get_xid(window) == xid)
   {
@@ -878,9 +880,7 @@
   }
 
   if (_decor_map[xid])
-  {
     WindowManager::Default()->Decorate(xid);
-  }
 
   _maximized_set.erase(xid);
 
@@ -976,7 +976,7 @@
   nux::Geometry monitor =  UScreen::GetDefault()->GetMonitorGeometry(_monitor);
 
   // Find the front-most of the maximized windows we are controlling
-  foreach(guint32 xid, _maximized_set)
+  for (auto xid : _maximized_set)
   {
     // We can safely assume only the front-most is visible
     if (WindowManager::Default()->IsWindowOnCurrentDesktop(xid)
@@ -994,37 +994,48 @@
 }
 
 void
-PanelMenuView::OnMaximizedGrabStart(int x, int y)
+PanelMenuView::OnMaximizedGrabStart(int x, int y, unsigned long button_flags, unsigned long)
 {
+  if (nux::GetEventButton(button_flags) != 1 || _places_showing)
+    return;
+
   // When Start dragging the panelmenu of a maximized window, change cursor
   // to simulate the dragging, waiting to go out of the panel area.
   //
   // This is a workaround to avoid that the grid plugin would be fired
   // showing the window shape preview effect. See bug #838923
   if (GetMaximizedWindow() != 0)
-  {
-    Display* d = nux::GetGraphicsDisplay()->GetX11Display();
-    nux::BaseWindow *bw = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-    Cursor c = XCreateFontCursor(d, XC_fleur);
-    XDefineCursor(d, bw->GetInputWindowId(), c);
-    XFreeCursor(d, c);
-  }
+    _panel_titlebar_grab_area->SetGrabbed(true);
 }
 
 void
-PanelMenuView::OnMaximizedGrabMove(int x, int y, int, int, unsigned long, unsigned long)
+PanelMenuView::OnMaximizedGrabMove(int x, int y, int, int, unsigned long button_flags, unsigned long)
 {
+//  FIXME nux doesn't export it with drag event.
+//  if (nux::GetEventButton(button_flags) != 1)
+//    return;
+
+  // We use this, due to the problem above
+  if (!_panel_titlebar_grab_area->IsGrabbed())
+    return;
+
+  auto panel = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+
+  if (!panel)
+    return;
+
+  x += _panel_titlebar_grab_area->GetAbsoluteX();
+  y += _panel_titlebar_grab_area->GetAbsoluteY();
+
   guint32 window_xid = GetMaximizedWindow();
 
   // When the drag goes out from the Panel, start the real movement.
   //
   // This is a workaround to avoid that the grid plugin would be fired
   // showing the window shape preview effect. See bug #838923
-  if (window_xid != 0 && !GetAbsoluteGeometry().IsPointInside(x, y))
+  if (window_xid != 0 && panel && !panel->GetAbsoluteGeometry().IsPointInside(x, y))
   {
-    Display* d = nux::GetGraphicsDisplay()->GetX11Display();
-    nux::BaseWindow *bw = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-    XUndefineCursor(d, bw->GetInputWindowId());
+    _panel_titlebar_grab_area->SetGrabbed(false);
 
     WindowManager::Default()->Activate(window_xid);
     _is_inside = true;
@@ -1038,15 +1049,25 @@
 void
 PanelMenuView::OnMaximizedGrabEnd(int x, int y, unsigned long, unsigned long)
 {
-  // Restore the window cursor to default.
-  Display* d = nux::GetGraphicsDisplay()->GetX11Display();
-  nux::BaseWindow *bw = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-  XUndefineCursor(d, bw->GetInputWindowId());
+  _panel_titlebar_grab_area->SetGrabbed(false);
+
+  x += _panel_titlebar_grab_area->GetAbsoluteX();
+  y += _panel_titlebar_grab_area->GetAbsoluteY();
+  _is_inside = GetAbsoluteGeometry().IsPointInside(x, y);
+
+  if (!_is_inside)
+    _is_grabbed = false;
+
+  Refresh();
+  FullRedraw();
 }
 
 void
-PanelMenuView::OnMouseDoubleClicked()
+PanelMenuView::OnMouseDoubleClicked(int x, int y, unsigned long button_flags, unsigned long)
 {
+  if (nux::GetEventButton(button_flags) != 1)
+    return;
+
   guint32 window_xid = GetMaximizedWindow();
 
   if (window_xid != 0)
@@ -1057,8 +1078,11 @@
 }
 
 void
-PanelMenuView::OnMouseMiddleClicked()
+PanelMenuView::OnMouseMiddleClicked(int x, int y, unsigned long button_flags, unsigned long)
 {
+  if (nux::GetEventButton(button_flags) != 2)
+    return;
+
   guint32 window_xid = GetMaximizedWindow();
 
   if (window_xid != 0)
@@ -1120,23 +1144,58 @@
   self->QueueDraw();
 }
 
-void PanelMenuView::UpdateShowNow(bool ignore)
+gboolean
+PanelMenuView::UpdateShowNowWithDelay(PanelMenuView *self)
 {
-  // NOTE: This is sub-optimal.  We are getting a dbus event for every menu,
-  // and every time that is setting the show now status of an indicator entry,
-  // we are getting the event raised, and we are ignoring the status, and
-  // looking through all the entries to see if any are shown.
-  _show_now_activated = false;
+  bool active = false;
 
-  for (Entries::iterator it = entries_.begin(); it != entries_.end(); ++it)
+  for (auto entry : self->entries_)
   {
-    PanelIndicatorEntryView* view = it->second;
-    if (view->GetShowNow()) {
-      _show_now_activated = true;
+    if (entry.second->GetShowNow())
+    {
+      active = true;
       break;
     }
   }
-  QueueDraw();
+
+  self->_update_show_now_id = 0;
+
+  if (active)
+  {
+    self->_show_now_activated = true;
+    self->QueueDraw();
+  }
+
+  return FALSE;
+}
+
+void
+PanelMenuView::UpdateShowNow(bool status)
+{
+  /* When we get a show now event, if we are requested to show the menus,
+   * we take the last incoming event and we wait for small delay (to avoid the
+   * Alt+Tab conflict) then we check if any menuitem has requested to show.
+   * If the status is false, we just check that the menus entries are hidden
+   * and we remove any eventual delayed request */
+
+  if (!status && _show_now_activated)
+  {
+    _show_now_activated = false;
+    QueueDraw();
+  }
+
+  if (_update_show_now_id != 0)
+  {
+    g_source_remove(_update_show_now_id);
+    _update_show_now_id = 0;
+  }
+
+  if (status && !_show_now_activated)
+  {
+    _update_show_now_id = g_timeout_add(180, (GSourceFunc)
+                                        &PanelMenuView::UpdateShowNowWithDelay,
+                                        this);
+  }
 }
 
 void
@@ -1167,6 +1226,7 @@
       _is_grabbed = false;
     else
       _is_inside = true;
+
     FullRedraw();
   }
 }
 
=== modified file 'plugins/unityshell/src/PanelMenuView.h'
--- plugins/unityshell/src/PanelMenuView.h	2011-09-03 02:47:41 +0000
+++ plugins/unityshell/src/PanelMenuView.h	2011-09-25 12:09:24 +0000
@@ -76,13 +76,14 @@
 
   guint32 GetMaximizedWindow();
 
-  void OnMaximizedGrabStart(int x, int y);
+  void OnMaximizedGrabStart(int, int, unsigned long, unsigned long);
   void OnMaximizedGrabMove(int, int, int, int, unsigned long, unsigned long);
-  void OnMaximizedGrabEnd(int x, int y, unsigned long, unsigned long);
-  void OnMouseDoubleClicked();
-  void OnMouseMiddleClicked();
+  void OnMaximizedGrabEnd(int, int, unsigned long, unsigned long);
+  void OnMouseDoubleClicked(int, int, unsigned long, unsigned long);
+  void OnMouseMiddleClicked(int, int, unsigned long, unsigned long);
 
   void Refresh();
+  void AllMenusClosed();
 
   void OnCloseClicked();
   void OnMinimizeClicked();
@@ -101,7 +102,7 @@
   void OnPanelViewMouseEnter(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state);
   void OnPanelViewMouseLeave(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state);
   void OnPanelViewMouseMove(int x, int y, int dx, int dy, unsigned long mouse_button_state, unsigned long special_keys_state);
-  virtual void OnEntryAdded(unity::indicator::Entry::Ptr const& proxy);
+  virtual void OnEntryAdded(unity::indicator::Entry::Ptr const& entry);
 
 private:
   gchar* GetActiveViewName();
@@ -109,15 +110,15 @@
   static void OnPlaceViewHidden(GVariant* data, PanelMenuView* self);
   void UpdateShowNow(bool ignore);
   static gboolean UpdateActiveWindowPosition(PanelMenuView* self);
+  static gboolean UpdateShowNowWithDelay(PanelMenuView* self);
 
 private:
   BamfMatcher* _matcher;
 
-  nux::AbstractPaintLayer* _title_layer;
+  nux::TextureLayer*       _title_layer;
   nux::HLayout*            _menu_layout;
   nux::CairoGraphics       _util_cg;
   nux::ObjectPtr<nux::IOpenGLBaseTexture> _gradient_texture;
-  nux::BaseTexture*        _title_tex;
 
   bool _is_inside;
   bool _is_grabbed;
@@ -144,6 +145,7 @@
   int  _monitor;
   guint32 _active_xid;
   guint32 _active_moved_id;
+  guint32 _update_show_now_id;
   nux::Geometry _monitor_geo;
 
   gulong _activate_window_changed_id;
 
=== modified file 'plugins/unityshell/src/PanelTitlebarGrabAreaView.cpp'
--- plugins/unityshell/src/PanelTitlebarGrabAreaView.cpp	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/PanelTitlebarGrabAreaView.cpp	2011-09-25 12:09:24 +0000
@@ -1,3 +1,4 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
  * Copyright (C) 2010 Canonical Ltd
  *
@@ -14,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
- * Authored by: Sam Spilsbury <[e-mail]>
- * Authored by: Didier Roche <[e-mail]>
+ *              Sam Spilsbury <[e-mail]>
+ *              Didier Roche <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  */
 
 #include <Nux/Nux.h>
@@ -31,19 +33,13 @@
 #include <UnityCore/Variant.h>
 
 #include <glib.h>
+#include <X11/cursorfont.h>
 
 #define DELTA_MOUSE_DOUBLE_CLICK 500000000
 
-enum
-{
-  BUTTON_CLOSE = 0,
-  BUTTON_MINIMISE,
-  BUTTON_UNMAXIMISE
-};
-
-
 PanelTitlebarGrabArea::PanelTitlebarGrabArea()
   : InputArea(NUX_TRACKER_LOCATION)
+  , _grab_cursor(None)
 {
   // FIXME: the two following functions should be used instead of the insane trick with fixed value. But nux is broken
   // right now and we need jay to focus on other things
@@ -52,38 +48,44 @@
   InputArea::mouse_up.connect(sigc::mem_fun(this, &PanelTitlebarGrabArea::RecvMouseUp));
   _last_click_time.tv_sec = 0;
   _last_click_time.tv_nsec = 0;
-
-  // connect the *Click events before the *Down ones otherwise, weird race happens
-  InputArea::mouse_down.connect(sigc::mem_fun(this, &PanelTitlebarGrabArea::RecvMouseDown));
 }
 
 
 PanelTitlebarGrabArea::~PanelTitlebarGrabArea()
 {
-}
-
-void PanelTitlebarGrabArea::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
-{
-  int button = nux::GetEventButton(button_flags);
-  if (button == 1)
-  {
-    mouse_down.emit(x, y);
-  }
-  else if (button == 2)
-  {
-    mouse_middleclick.emit();
-  }
+  if (_grab_cursor)
+    XFreeCursor(nux::GetGraphicsDisplay()->GetX11Display(), _grab_cursor);
+}
+
+void PanelTitlebarGrabArea::SetGrabbed(bool enabled)
+{
+  auto display = nux::GetGraphicsDisplay()->GetX11Display();
+  auto panel_window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+
+  if (!panel_window || !display)
+    return;
+
+  if (enabled && !_grab_cursor)
+  {
+    _grab_cursor = XCreateFontCursor(display, XC_fleur);
+    XDefineCursor(display, panel_window->GetInputWindowId(), _grab_cursor);
+  }
+  else if (!enabled && _grab_cursor)
+  {
+    XUndefineCursor(display, panel_window->GetInputWindowId());
+    XFreeCursor(display, _grab_cursor);
+    _grab_cursor = None;
+  }
+}
+
+bool PanelTitlebarGrabArea::IsGrabbed()
+{
+  return _grab_cursor != None;
 }
 
 void PanelTitlebarGrabArea::RecvMouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  int button = nux::GetEventButton(button_flags);
-  if (button == 1)
-  {
-    mouse_doubleleftclick.emit();
-    return;
-  }
-  mouse_doubleclick.emit();
+  mouse_double_click.emit(x, y, button_flags, key_flags);
 }
 
 // TODO: can be safely removed once OnMouseDoubleClick is fixed in nux
 
=== modified file 'plugins/unityshell/src/PanelTitlebarGrabAreaView.h'
--- plugins/unityshell/src/PanelTitlebarGrabAreaView.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PanelTitlebarGrabAreaView.h	2011-09-25 12:09:24 +0000
@@ -1,3 +1,4 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
  * Copyright (C) 2010 Canonical Ltd
  *
@@ -14,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
- * Authored by: Sam Spilsbury <[e-mail]>
- * Authored by: Didier Roche <[e-mail]>
+ *              Sam Spilsbury <[e-mail]>
+ *              Didier Roche <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  */
 
 #ifndef PANEL_TITLEBAR_GRAB_AREA_H
@@ -38,23 +40,22 @@
   PanelTitlebarGrabArea();
   ~PanelTitlebarGrabArea();
 
-  sigc::signal <void, int, int> mouse_down;
-  sigc::signal <void> mouse_middleclick;
-  sigc::signal <void> mouse_doubleclick;
-  sigc::signal <void> mouse_doubleleftclick;
+  void SetGrabbed(bool enabled);
+  bool IsGrabbed();
 
-protected:
+private:
   void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
   // TODO: can be safely removed once OnMouseDoubleClick is fixed in nux
   void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
   struct timespec time_diff(struct timespec start, struct timespec end);
 
-  struct timespec _last_click_time;
-
   const gchar* GetName();
   const gchar* GetChildsName();
-  void          AddProperties(GVariantBuilder* builder);
+  void         AddProperties(GVariantBuilder* builder);
+
+  struct timespec _last_click_time;
+  Cursor _grab_cursor;
 };
 
 #endif
 
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-09-20 16:23:55 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-09-25 12:09:24 +0000
@@ -190,7 +190,7 @@
 
 const gchar* PanelView::GetName()
 {
-  return "Panel";
+  return "UnityPanel";
 }
 
 const gchar*
@@ -459,6 +459,7 @@
 
 void PanelView::OnIndicatorViewUpdated(PanelIndicatorEntryView* view)
 {
+  _needs_geo_sync = true;
   ComputeChildLayout();
 }
 
@@ -488,12 +489,19 @@
   if (!ret) _indicators->ActivateEntry(entry_id);
 }
 
-static gboolean track_menu_pointer(gpointer data)
-{
-  PanelView *self = (PanelView*)data;
-  gint x, y;
-  gdk_display_get_pointer(gdk_display_get_default(), NULL, &x, &y, NULL);
-  self->OnMenuPointerMoved(x, y);
+void PanelView::TrackMenuPointer()
+{
+  auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+  if (_tracked_pointer_pos != mouse)
+  {
+    OnMenuPointerMoved(mouse.x, mouse.y);
+    _tracked_pointer_pos = mouse;
+  }
+}
+
+static gboolean track_menu_pointer(PanelView *self)
+{
+  self->TrackMenuPointer();
   return TRUE;
 }
 
@@ -512,7 +520,7 @@
     // process. All the motion events will go to unity-panel-service while
     // scrubbing because the active panel menu has (needs) the pointer grab.
     //
-    _track_menu_pointer_id = g_timeout_add(16, track_menu_pointer, this);
+    _track_menu_pointer_id = g_timeout_add(16, (GSourceFunc) track_menu_pointer, this);
   }
   else if (!active)
   {
@@ -521,6 +529,8 @@
       g_source_remove(_track_menu_pointer_id);
       _track_menu_pointer_id = 0;
     }
+    _menu_view->AllMenusClosed();
+    _tracked_pointer_pos = {-1, -1};
   }
 }
 
@@ -603,7 +613,8 @@
   _is_primary = primary;
 }
 
-void PanelView::SyncGeometries()
+void
+PanelView::SyncGeometries()
 {
   indicator::EntryLocationMap locations;
   _menu_view->GetGeometryForSync(locations);
 
=== modified file 'plugins/unityshell/src/PanelView.h'
--- plugins/unityshell/src/PanelView.h	2011-09-15 09:58:21 +0000
+++ plugins/unityshell/src/PanelView.h	2011-09-25 12:09:24 +0000
@@ -72,6 +72,8 @@
   void EndFirstMenuShow();
 
   void SetOpacity(float opacity);
+  
+  void TrackMenuPointer();
 
   unsigned int GetTrayXid ();
 
@@ -120,6 +122,7 @@
   guint       _handle_dash_shown;
   guint       _handle_bg_color_update;
   guint       _track_menu_pointer_id;
+  nux::Point  _tracked_pointer_pos;
 
   std::vector<sigc::connection> _on_indicator_updated_connections;
   BackgroundEffectHelper bg_effect_helper_;
 
=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2011-09-21 03:40:33 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2011-09-25 12:09:24 +0000
@@ -375,7 +375,36 @@
 bool
 PluginAdapter::IsWindowDecorated(guint32 xid)
 {
-  Window win = (Window)xid;
+  Display* display = m_Screen->dpy();
+  Window win = xid;
+  Atom hints_atom = None;
+  MotifWmHints* hints = NULL;
+  Atom type = None;
+  gint format;
+  gulong nitems;
+  gulong bytes_after;
+  bool ret = true;
+
+  hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
+
+  XGetWindowProperty(display, win, hints_atom, 0,
+                     sizeof(MotifWmHints) / sizeof(long), False,
+                     hints_atom, &type, &format, &nitems, &bytes_after,
+                     (guchar**)&hints);
+
+  if (!hints)
+    return ret;
+
+  if (type == hints_atom && format != 0 && hints->flags & MWM_HINTS_DECORATIONS)
+  {
+    ret = hints->decorations & (MwmDecorAll | MwmDecorTitle);
+  }
+
+  XFree(hints);
+  return ret;
+
+/* FIXME compiz is too slow to update this value, and this could lead to
+ * issues like the bug #838923, since the read value isn't valid anymore
   CompWindow* window;
 
   window = m_Screen->findWindow(win);
@@ -386,6 +415,7 @@
     return decor & (MwmDecorAll | MwmDecorTitle);
   }
   return true;
+*/
 }
 
 bool
@@ -419,6 +449,8 @@
     {
       if (sibling->defaultViewport() == window_vp
           && !sibling->minimized()
+          && sibling->isMapped()
+          && sibling->isViewable()
           && (sibling->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE)
         return true;
     }
 
=== modified file 'plugins/unityshell/src/WindowButtons.cpp'
--- plugins/unityshell/src/WindowButtons.cpp	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/WindowButtons.cpp	2011-09-25 12:09:24 +0000
@@ -55,6 +55,7 @@
       _prelight_dash_tex(NULL),
       _pressed_dash_tex(NULL),
       _dash_is_open(false),
+      _mouse_is_down(false),
       _place_shown_interest(0),
       _place_hidden_interest(0)
   {
@@ -69,6 +70,14 @@
     _place_hidden_interest = ubus_server_register_interest(ubus, UBUS_PLACE_VIEW_HIDDEN,
                                                            (UBusCallback)&WindowButton::OnPlaceViewHidden,
                                                            this);
+
+    /* FIXME HasMouseFocus() doesn't seem to work correctly, so we use this workaround */
+    mouse_down.connect([&_mouse_is_down](int, int, unsigned long, unsigned long) {
+      _mouse_is_down = true;
+    });
+    mouse_up.connect([&_mouse_is_down](int, int, unsigned long, unsigned long) {
+      _mouse_is_down = false;
+    });
   }
 
   ~WindowButton()
@@ -98,7 +107,8 @@
 
     if (_dash_is_open)
     {
-      if (HasMouseFocus() && IsMouseInside())
+      //FIXME should use HasMouseFocus()
+      if (_mouse_is_down && IsMouseInside())
         tex = _pressed_dash_tex;
       else if (IsMouseInside())
         tex = _prelight_dash_tex;
@@ -107,7 +117,8 @@
     }
     else
     {
-      if (HasMouseFocus() && IsMouseInside())
+      //FIXME should use HasMouseFocus()
+      if (_mouse_is_down && IsMouseInside())
         tex = _pressed_tex;
       else if (IsMouseInside())
         tex = _prelight_tex;
@@ -217,6 +228,7 @@
   nux::BaseTexture* _prelight_dash_tex;
   nux::BaseTexture* _pressed_dash_tex;
   bool _dash_is_open;
+  bool _mouse_is_down;
   guint32 _place_shown_interest;
   guint32 _place_hidden_interest;
 
 
=== modified file 'plugins/unityshell/src/WindowManager.cpp'
--- plugins/unityshell/src/WindowManager.cpp	2011-09-19 16:36:21 +0000
+++ plugins/unityshell/src/WindowManager.cpp	2011-09-25 12:09:24 +0000
@@ -1,3 +1,4 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
  * Copyright (C) 2010 Canonical Ltd
  *
@@ -26,7 +27,7 @@
   {
     return 0;
   }
-  
+
   bool IsScreenGrabbed()
   {
     return false;
@@ -181,6 +182,9 @@
 void
 WindowManager::StartMove(guint32 xid, int x, int y)
 {
+  if (x < 0 || y < 0)
+    return;
+
   XEvent ev;
   Display* d = nux::GetGraphicsDisplay()->GetX11Display();
 
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-09-08 11:53:46 +0000
+++ services/panel-service.c	2011-09-25 12:09:24 +0000
@@ -16,6 +16,7 @@
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
  *              Rodrigo Moya <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  */
 
 #if HAVE_CONFIG_H
@@ -47,8 +48,8 @@
 struct _PanelServicePrivate
 {
   GSList     *indicators;
-  GHashTable *id2entry_hash;
   GHashTable *entry2indicator_hash;
+  GHashTable *entry2geometry_hash;
 
   guint  initial_sync_id;
   gint32 timeouts[N_TIMEOUT_SLOTS];
@@ -64,6 +65,9 @@
   gint     last_right;
   gint     last_bottom;
   guint32  last_menu_button;
+
+  IndicatorObjectEntry *pressed_entry;
+  gboolean use_event;
 };
 
 /* Globals */
@@ -113,6 +117,7 @@
 static void sort_indicators (PanelService    *self);
 
 static void notify_object (IndicatorObject *object);
+static IndicatorObjectEntry *get_entry_at (PanelService *self, gint x, gint y);
 
 static GdkFilterReturn event_filter (GdkXEvent    *ev,
                                      GdkEvent     *gev,
@@ -128,8 +133,8 @@
   PanelServicePrivate *priv = PANEL_SERVICE (object)->priv;
   gint i;
 
-  g_hash_table_destroy (priv->id2entry_hash);
   g_hash_table_destroy (priv->entry2indicator_hash);
+  g_hash_table_destroy (priv->entry2geometry_hash);
 
   gdk_window_remove_filter (NULL, (GdkFilterFunc)event_filter, object);
 
@@ -239,25 +244,83 @@
   if (cookie->type == GenericEvent)
     {
       XIDeviceEvent *event = cookie->data;
-
-      if (event && event->evtype == XI_ButtonRelease &&
-          priv->last_menu_button != 0) //FocusChange
-        {
-          if (event->root_x < priv->last_left ||
-              event->root_x > priv->last_right ||
-              event->root_y < priv->last_top ||
-              event->root_y > priv->last_bottom)
-          {
-            ret = GDK_FILTER_REMOVE;
-          }
-
-          priv->last_menu_button = 0;
+      if (!event)
+        return ret;
+
+      if (event->evtype == XI_ButtonPress)
+        {
+          priv->pressed_entry = get_entry_at (self, event->root_x, event->root_y);
+          priv->use_event = (priv->pressed_entry == NULL);
+        }
+
+      if (event->evtype == XI_ButtonRelease)
+        {
+          if (priv->use_event)
+            {
+              priv->use_event = FALSE;
+            }
+          else
+            {
+              IndicatorObjectEntry *entry;
+              entry = get_entry_at (self, event->root_x, event->root_y);
+
+              if (entry)
+                {
+                  if (entry != priv->pressed_entry)
+                    {
+                      ret = GDK_FILTER_REMOVE;
+                      priv->use_event = TRUE;
+                    }
+                  else if (priv->last_entry && entry != priv->last_entry)
+                    {
+                      /* If we were navigating over indicators using the keyboard
+                       * and now we click over the indicator under the mouse, we
+                       * must force it to show back again, not make it close */
+                      gchar *entry_id = g_strdup_printf ("%p", entry);
+                      g_signal_emit (self, _service_signals[ENTRY_ACTIVATE_REQUEST], 0, entry_id);
+                      g_free (entry_id);
+                    }
+                }
+            }
         }
     }
 
   return ret;
 }
 
+static IndicatorObjectEntry *
+get_entry_at (PanelService *self, gint x, gint y)
+{
+  GHashTableIter iter;
+  gpointer key, value;
+
+  g_hash_table_iter_init (&iter, self->priv->entry2geometry_hash);
+  while (g_hash_table_iter_next (&iter, &key, &value)) 
+    {
+      IndicatorObjectEntry *entry = key;
+      GdkRectangle *geo = value;
+
+      if (x >= geo->x && x <= (geo->x + geo->width) &&
+          y >= geo->y && y <= (geo->y + geo->height))
+        {
+          return entry;
+        }
+    }
+
+  return NULL;
+}
+
+static IndicatorObjectEntry *
+get_entry_by_id (const gchar *entry_id)
+{
+  IndicatorObjectEntry *entry;
+  
+  if (sscanf (entry_id, "%p", &entry) == 1)
+    return entry;
+
+  return NULL;
+}
+
 static gboolean
 initial_resync (PanelService *self)
 {
@@ -277,9 +340,9 @@
 
   gdk_window_add_filter (NULL, (GdkFilterFunc)event_filter, self);
 
-  priv->id2entry_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                               g_free, NULL);
   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);
 
   suppress_signals = TRUE;
   load_indicators (self);
@@ -315,10 +378,8 @@
     {
       for (l = entries; l; l = l->next)
         {
-          gchar *id = g_strdup_printf ("%p", l->data);
-          g_hash_table_remove (self->priv->id2entry_hash, id);
           g_hash_table_remove (self->priv->entry2indicator_hash, l->data);
-          g_free (id);
+          g_hash_table_remove (self->priv->entry2geometry_hash, l->data);
         }
 
       g_list_free (entries);
@@ -520,14 +581,11 @@
                 PanelService         *self)
 {
   PanelServicePrivate *priv;
-  gchar *id;
 
   g_return_if_fail (PANEL_IS_SERVICE (self));
   g_return_if_fail (entry != NULL);
   priv = self->priv;
 
-  id = g_strdup_printf ("%p", entry);
-  g_hash_table_insert (priv->id2entry_hash, id, entry);
   g_hash_table_insert (priv->entry2indicator_hash, entry, object);
 
   if (GTK_IS_LABEL (entry->label))
@@ -576,17 +634,16 @@
                   PanelService         *self)
 {
   PanelServicePrivate *priv;
-  gchar *id;
-
   g_return_if_fail (PANEL_IS_SERVICE (self));
   g_return_if_fail (entry != NULL);
 
   priv = self->priv;
 
-  id = g_strdup_printf ("%p", entry);
   g_hash_table_remove (priv->entry2indicator_hash, entry);
-  g_hash_table_remove (priv->id2entry_hash, id);
-  g_free (id);
+  /* Don't remove here the value from priv->entry2geometry_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 */
 
   notify_object (object);
 }
@@ -628,7 +685,7 @@
                                     PanelService         *self)
 {
   gchar *entry_id;
-
+  
   g_return_if_fail (PANEL_IS_SERVICE (self));
   if (entry == NULL)
     {
@@ -637,7 +694,7 @@
     }
 
   entry_id = g_strdup_printf ("%p", entry);
-  
+
   g_signal_emit (self, _service_signals[ENTRY_SHOW_NOW_CHANGED], 0, entry_id, show_now_changed);
 
   g_free (entry_id);
@@ -967,6 +1024,8 @@
   priv->last_top = 0;
   priv->last_bottom = 0;
 
+  priv->pressed_entry = NULL;
+
   g_signal_emit (self, _service_signals[ENTRY_ACTIVATED], 0, "");
 }
 
@@ -1045,9 +1104,32 @@
            gint height)
 {
   PanelServicePrivate *priv = self->priv;
-  IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
+  IndicatorObjectEntry *entry = get_entry_by_id (entry_id);
   IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
 
+  if (entry)
+    {
+      if (width < 0 || height < 0)
+        {
+          g_hash_table_remove (priv->entry2geometry_hash, entry);
+        }
+      else
+        {
+          GdkRectangle *geo = g_hash_table_lookup (priv->entry2geometry_hash, entry);
+
+          if (geo == NULL)
+            {
+              geo = g_new (GdkRectangle, 1);
+              g_hash_table_insert (priv->entry2geometry_hash, entry, geo);
+            }
+
+          geo->x = x;
+          geo->y = y;
+          geo->width = width;
+          geo->height = height;
+        }
+    }
+
   g_signal_emit (self, _service_signals[GEOMETRIES_CHANGED], 0, object, entry, x, y, width, height);
 }
 
@@ -1176,8 +1258,7 @@
   priv = self->priv;
 
   /* Not interested in up or down */
-  if (direction == GTK_MENU_DIR_NEXT
-      || direction == GTK_MENU_DIR_PREV)
+  if (direction == GTK_MENU_DIR_NEXT || direction == GTK_MENU_DIR_PREV)
     return;
 
   /* We don't want to distrupt going into submenus */
@@ -1221,15 +1302,17 @@
                           gint32        button)
 {
   PanelServicePrivate  *priv = self->priv;
-  IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
+  IndicatorObjectEntry *entry = get_entry_by_id (entry_id);
   IndicatorObject      *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
   GtkWidget            *last_menu;
 
+  g_return_if_fail (entry);
+
   if (priv->last_entry == entry)
     return;
 
   last_menu = GTK_WIDGET (priv->last_menu);
-  
+
   if (GTK_IS_MENU (priv->last_menu))
     {
       priv->last_x = 0;
@@ -1247,6 +1330,8 @@
 
   if (entry != NULL)
     {
+      g_signal_emit (self, _service_signals[ENTRY_ACTIVATED], 0, entry_id);
+
       if (GTK_IS_MENU (entry->menu))
         {
           priv->last_menu = entry->menu;
@@ -1294,8 +1379,6 @@
         priv->last_top = 0;
         priv->last_bottom = 0;
       }
-
-      g_signal_emit (self, _service_signals[ENTRY_ACTIVATED], 0, entry_id);
     }
 
   /* We popdown the old one last so we don't accidently send key focus back to the
@@ -1312,7 +1395,9 @@
                                         guint32       timestamp)
 {
   PanelServicePrivate  *priv = self->priv;
-  IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
+  IndicatorObjectEntry *entry = get_entry_by_id (entry_id);
+  g_return_if_fail (entry);
+
   IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
 
   g_signal_emit_by_name(object, INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, entry,
@@ -1325,11 +1410,12 @@
                             gint32         delta)
 {
   PanelServicePrivate  *priv = self->priv;
-  IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
+  IndicatorObjectEntry *entry = get_entry_by_id (entry_id);
+  g_return_if_fail (entry);
+
   IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
   GdkScrollDirection direction = delta < 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
 
   g_signal_emit_by_name(object, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry,
                         abs(delta/120), direction);
 }
-