Merge lp:~3v1n0/unity/secondary-activate-support into lp:unity

[Marco Trevisan (Treviño)]

Add support to "secondary-activate" event on middle-click, needed both by bug #609860 and bug #812933. See the second for more informations.

This needs the merge of lp:~3v1n0/libindicator/secondary-activate-support

[Mirco Müller (macslow)]

All good seen from here. Approved.

review: Approve

[Mirco Müller (macslow)]

I've not merged this yet to trunk as it needs some stuff to move into libindicator first. Locally I tried this and it works ok.

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

Yes, it just needs support from the low-level, I just hope that the fact of exporting the X/Y mouse position (that I did for following the StatusNotifierItem specs) is accepted by ted :P.

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

I've changed the branch to sync with the change of libindicator that doesn't support the x,y mouse position when sending a secondary-activate signal.

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2011-07-21 14:59:25 +0000
+++ UnityCore/DBusIndicators.cpp	2011-07-21 20:27:23 +0000
@@ -122,6 +122,8 @@
   virtual void OnEntryScroll(std::string const& entry_id, int delta);
   virtual void OnEntryShowMenu(std::string const& entry_id,
                                int x, int y, int timestamp, int button);
+  virtual void OnEntrySecondaryActivate(std::string const& entry_id,
+                                        unsigned int timestamp);
 
   std::string name() const;
   std::string owner_name() const;
@@ -226,6 +228,14 @@
   g_timeout_add(0, (GSourceFunc)send_show_entry, data);
 }
 
+void DBusIndicators::Impl::OnEntrySecondaryActivate(std::string const& entry_id,
+                                                    unsigned int timestamp)
+{
+  g_dbus_proxy_call(proxy_, "SecondaryActivateEntry",
+                    g_variant_new("(su)", entry_id.c_str(), timestamp),
+                    G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+}
+
 void DBusIndicators::Impl::OnEntryScroll(std::string const& entry_id, int delta)
 {
   g_dbus_proxy_call(proxy_, "ScrollEntry",
@@ -474,6 +484,12 @@
   pimpl->OnEntryShowMenu(entry_id, x, y, timestamp, button);
 }
 
+void DBusIndicators::OnEntrySecondaryActivate(std::string const& entry_id,
+                                              unsigned int timestamp)
+{
+  pimpl->OnEntrySecondaryActivate(entry_id, timestamp);
+}
+
 std::string DBusIndicators::name() const
 {
   return pimpl->name();
 
=== modified file 'UnityCore/DBusIndicators.h'
--- UnityCore/DBusIndicators.h	2011-07-21 14:59:25 +0000
+++ UnityCore/DBusIndicators.h	2011-07-21 20:27:23 +0000
@@ -44,6 +44,8 @@
   virtual void OnEntryScroll(std::string const& entry_id, int delta);
   virtual void OnEntryShowMenu(std::string const& entry_id,
                                int x, int y, int timestamp, int button);
+  virtual void OnEntrySecondaryActivate(std::string const& entry_id,
+                                        unsigned int timestamp);
 
   std::string name() const;
   std::string owner_name() const;
 
=== modified file 'UnityCore/Indicator.cpp'
--- UnityCore/Indicator.cpp	2011-07-21 14:59:25 +0000
+++ UnityCore/Indicator.cpp	2011-07-21 20:27:23 +0000
@@ -56,6 +56,7 @@
       Entry::Ptr new_entry = new_entries[new_index];
       entries_.push_back(new_entry);
       new_entry->on_show_menu.connect(sigc::mem_fun(this, &Indicator::OnEntryShowMenu));
+      new_entry->on_secondary_activate.connect(sigc::mem_fun(this, &Indicator::OnEntrySecondaryActivate));
       new_entry->on_scroll.connect(sigc::mem_fun(this, &Indicator::OnEntryScroll));
       on_entry_added.emit(new_entry);
     }
@@ -86,6 +87,12 @@
   on_show_menu.emit(entry_id, x, y, timestamp, button);
 }
 
+void Indicator::OnEntrySecondaryActivate(std::string const& entry_id,
+                                         unsigned int timestamp)
+{
+  on_secondary_activate.emit(entry_id, timestamp);
+}
+
 void Indicator::OnEntryScroll(std::string const& entry_id, int delta)
 {
   on_scroll.emit(entry_id, delta);
 
=== modified file 'UnityCore/Indicator.h'
--- UnityCore/Indicator.h	2011-07-21 14:59:25 +0000
+++ UnityCore/Indicator.h	2011-07-21 20:27:23 +0000
@@ -45,11 +45,13 @@
   Entry::Ptr GetEntry(std::string const& entry_id) const;
 
   void OnEntryShowMenu(std::string const& entry_id, int x, int y, int timestamp, int button);
+  void OnEntrySecondaryActivate(std::string const& entry_id, unsigned int timestamp);
   void OnEntryScroll(std::string const& entry_id, int delta);
 
   // Signals
   sigc::signal<void, Entry::Ptr const&> on_entry_added;
   sigc::signal<void, std::string const&, int, int, int, int> on_show_menu;
+  sigc::signal<void, std::string const&, unsigned int> on_secondary_activate;
   sigc::signal<void, std::string const&, int> on_scroll;
 
 private:
 
=== modified file 'UnityCore/IndicatorEntry.cpp'
--- UnityCore/IndicatorEntry.cpp	2011-07-21 14:59:25 +0000
+++ UnityCore/IndicatorEntry.cpp	2011-07-21 20:27:23 +0000
@@ -157,6 +157,11 @@
   on_show_menu.emit(id_, x, y, timestamp, button);
 }
 
+void Entry::SecondaryActivate(unsigned int timestamp)
+{
+  on_secondary_activate.emit(id_, timestamp);
+}
+
 void Entry::Scroll(int delta)
 {
   on_scroll.emit(id_, delta);
 
=== modified file 'UnityCore/IndicatorEntry.h'
--- UnityCore/IndicatorEntry.h	2011-07-21 14:59:25 +0000
+++ UnityCore/IndicatorEntry.h	2011-07-21 20:27:23 +0000
@@ -80,6 +80,7 @@
   bool IsUnused() const;
 
   void ShowMenu(int x, int y, int timestamp, int button);
+  void SecondaryActivate(unsigned int timestamp);
   void Scroll(int delta);
 
   // Signals
@@ -88,6 +89,7 @@
   sigc::signal<void, bool> show_now_changed;
 
   sigc::signal<void, std::string const&, int, int, int, int> on_show_menu;
+  sigc::signal<void, std::string const&, unsigned int> on_secondary_activate;
   sigc::signal<void, std::string const&, int> on_scroll;
 
 private:
 
=== modified file 'UnityCore/Indicators.cpp'
--- UnityCore/Indicators.cpp	2011-07-21 14:59:25 +0000
+++ UnityCore/Indicators.cpp	2011-07-21 20:27:23 +0000
@@ -108,6 +108,7 @@
   Indicator::Ptr indicator(new Indicator(name));
   // The owner Indicators class is interested in the other events.
   indicator->on_show_menu.connect(sigc::mem_fun(owner_, &Indicators::OnEntryShowMenu));
+  indicator->on_secondary_activate.connect(sigc::mem_fun(owner_, &Indicators::OnEntrySecondaryActivate));
   indicator->on_scroll.connect(sigc::mem_fun(owner_, &Indicators::OnEntryScroll));
   indicators_[name] = indicator;
   owner_->on_object_added.emit(indicator);
 
=== modified file 'UnityCore/Indicators.h'
--- UnityCore/Indicators.h	2011-07-21 14:59:25 +0000
+++ UnityCore/Indicators.h	2011-07-21 20:27:23 +0000
@@ -56,6 +56,8 @@
    */
   virtual void OnEntryShowMenu(std::string const& entry_id,
                                int x, int y, int timestamp, int button) = 0;
+  virtual void OnEntrySecondaryActivate(std::string const& entry_id,
+                                        unsigned int timestamp) = 0;
 
   // Signals
   sigc::signal<void, Indicator::Ptr const&> on_object_added;
 
=== modified file 'plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp'
--- plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-07-21 20:27:23 +0000
@@ -91,11 +91,12 @@
   if (proxy_->active())
     return;
 
-  if ((proxy_->label_visible() && proxy_->label_sensitive()) ||
-      (proxy_->image_visible() && proxy_->image_sensitive()))
+  if (((proxy_->label_visible() && proxy_->label_sensitive()) ||
+       (proxy_->image_visible() && proxy_->image_sensitive())) &&
+      nux::GetEventButton(button_flags) != 2)
   {
-    proxy_->ShowMenu(GetAbsoluteGeometry().x + 1, //cairo translation
-                     GetAbsoluteGeometry().y + PANEL_HEIGHT,
+    proxy_->ShowMenu(GetAbsoluteX() + 1, //cairo translation
+                     GetAbsoluteY() + PANEL_HEIGHT,
                      time(NULL),
                      nux::GetEventButton(button_flags));
   }
@@ -107,6 +108,20 @@
 
 void PanelIndicatorObjectEntryView::OnMouseUp(int x, int y, long button_flags, long key_flags)
 {
+  if (proxy_->active())
+    return;
+
+  nux::Geometry geo = GetAbsoluteGeometry();
+  int px = geo.x + x;
+  int py = geo.y + y;
+
+  if (((proxy_->label_visible() && proxy_->label_sensitive()) ||
+       (proxy_->image_visible() && proxy_->image_sensitive())) &&
+      geo.IsPointInside(px, py) && nux::GetEventButton(button_flags) == 2)
+  {
+    proxy_->SecondaryActivate(time(NULL));
+  }
+
   Refresh();
 }
 
 
=== modified file 'services/panel-main.c'
--- services/panel-main.c	2011-03-29 14:18:06 +0000
+++ services/panel-main.c	2011-07-21 20:27:23 +0000
@@ -67,6 +67,11 @@
   "      <arg type='i' name='button' direction='in'/>"
   "    </method>"
   ""
+  "    <method name='SecondaryActivateEntry'>"
+  "      <arg type='s' name='entry_id' direction='in'/>"
+  "      <arg type='u' name='timestamp' direction='in'/>"
+  "    </method>"
+  ""
   "    <method name='ScrollEntry'>"
   "      <arg type='s' name='entry_id' direction='in'/>"
   "      <arg type='i' name='delta' direction='in'/>"
@@ -186,6 +191,17 @@
       g_dbus_method_invocation_return_value (invocation, NULL);
       g_free (entry_id);
     }
+  else if (g_strcmp0 (method_name, "SecondaryActivateEntry") == 0)
+    {
+      gchar  *entry_id;
+      guint32 timestamp;
+      g_variant_get (parameters, "(su)", &entry_id, &timestamp, NULL);
+
+      panel_service_secondary_activate_entry (service, entry_id, timestamp);
+
+      g_dbus_method_invocation_return_value (invocation, NULL);
+      g_free (entry_id);
+    }
   else if (g_strcmp0 (method_name, "ScrollEntry") == 0)
     {
       gchar *entry_id;
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-07-21 09:50:30 +0000
+++ services/panel-service.c	2011-07-21 20:27:23 +0000
@@ -236,7 +236,7 @@
     {
       XIDeviceEvent *event = cookie->data;
             
-      if (event->evtype == XI_ButtonRelease &&
+      if (event && event->evtype == XI_ButtonRelease &&
           priv->last_menu_button != 0) //FocusChange
         {
           if (event->root_x < priv->last_left ||
@@ -249,7 +249,7 @@
 
           priv->last_menu_button = 0;
         }
-      else if (event->evtype == XI_Motion)
+      else if (event && event->evtype == XI_Motion)
         {
           priv->last_menu_x = event->root_x;
           priv->last_menu_y = event->root_y;
@@ -1159,6 +1159,19 @@
 }
 
 void
+panel_service_secondary_activate_entry (PanelService *self,
+                                        const gchar  *entry_id,
+                                        guint32       timestamp)
+{
+  PanelServicePrivate  *priv = self->priv;
+  IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
+  IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
+
+  g_signal_emit_by_name(object, INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, entry,
+                        timestamp);
+}
+
+void
 panel_service_scroll_entry (PanelService   *self,
                             const gchar    *entry_id,
                             gint32         delta)
 
=== modified file 'services/panel-service.h'
--- services/panel-service.h	2011-03-01 15:39:36 +0000
+++ services/panel-service.h	2011-07-21 20:27:23 +0000
@@ -95,6 +95,10 @@
 					       gint32        y,
 					       gint32        button);
 
+void              panel_service_secondary_activate_entry (PanelService *self,
+					       const gchar  *entry_id,
+					       guint32       timestamp);
+
 void              panel_service_scroll_entry   (PanelService *self,
 						const gchar  *entry_id,
 						gint32       delta);