Merge lp:~didrocks/unity/dont-ack-multiple-place-requests into lp:unity

[Didier Roche-Tolomelli]

Don't ack double/triple click or super press on bfb and places icons.
(LP: #766776)
This is workarounded in different files right now, the correct fix will be to
handle that in the ubus level (too risky at this stage), added FIXME to remember
that for oneiric.

There is one glitch though, which cannot been tackled without the ubus rewrite:
- if you open a place, then, double click on a placeicon in the launcher to
  close it, it will be closed by will be reactivated (this is because we send
  the UBUS_PLACE_ENTRY_ACTIVATE_REQUEST again on click).
- so, the next super press will not show the home dash, but the active place
  (closing/opening it again will reset to the home dash)

I still think it's an improvment (see Charline's report in maverick for double
clicking on bfb and people being puzzled) and the last described glitch only
impact people double clicking on a place LauncherIcon for closing it…

=== modified file 'src/PanelTitlebarGrabAreaView.cpp'
--- src/PanelTitlebarGrabAreaView.cpp	2011-03-17 15:34:34 +0000
+++ src/PanelTitlebarGrabAreaView.cpp	2011-04-20 12:42:18 +0000
@@ -90,11 +90,11 @@
   clock_gettime(CLOCK_MONOTONIC, &event_time);
   delta = time_diff (_last_click_time, event_time);
 
+  _last_click_time.tv_sec = event_time.tv_sec;
+  _last_click_time.tv_nsec = event_time.tv_nsec;
+
   if ((delta.tv_sec == 0) && (delta.tv_nsec < DELTA_MOUSE_DOUBLE_CLICK))
     RecvMouseDoubleClick (x, y, button_flags, key_flags);
-  
-  _last_click_time.tv_sec = event_time.tv_sec;
-  _last_click_time.tv_nsec = event_time.tv_nsec;
 }
 
 struct timespec PanelTitlebarGrabArea::time_diff (struct timespec start, struct timespec end)

=== modified file 'src/PlacesController.cpp'
--- src/PlacesController.cpp	2011-04-15 10:08:19 +0000
+++ src/PlacesController.cpp	2011-04-20 12:42:18 +0000
@@ -34,6 +34,7 @@
 #include "PlacesController.h"
 
 #define PANEL_HEIGHT 24
+#define DELTA_DOUBLE_REQUEST 500000000
 
 int PlacesController::_launcher_size = 66;
 
@@ -47,6 +48,8 @@
   for (unsigned int i = 0; i < G_N_ELEMENTS (_ubus_handles); i++)
     _ubus_handles[i] = 0;
 
+  _last_activate_time.tv_sec = 0;
+  _last_activate_time.tv_nsec = 0;
   // register interest with ubus so that we get activation messages
   UBusServer *ubus = ubus_server_get_default ();
   _ubus_handles[0] = ubus_server_register_interest (ubus,
@@ -311,30 +314,53 @@
                                        height));
 }
 
+bool PlacesController::IsActivationValid ()
+{
+  struct timespec event_time, delta;
+  clock_gettime(CLOCK_MONOTONIC, &event_time);
+  delta = time_diff (_last_activate_time, event_time);
+
+  _last_activate_time.tv_sec = event_time.tv_sec;
+  _last_activate_time.tv_nsec = event_time.tv_nsec;
+
+  // FIXME: this should be handled by ubus (not sending the request twice
+  // for some selected ones). Too intrusive for now.
+  if (!((delta.tv_sec == 0) && (delta.tv_nsec < DELTA_DOUBLE_REQUEST)))
+    return true;
+  return false;
+}
+
 void
 PlacesController::ExternalActivation (GVariant *data, void *val)
 {
   PlacesController *self = (PlacesController*)val;
-  self->ToggleShowHide ();
+
+  if (self->IsActivationValid ())
+    self->ToggleShowHide ();
+
 }
 
 void
 PlacesController::CloseRequest (GVariant *data, void *val)
 {
   PlacesController *self = (PlacesController*)val;
-  self->Hide ();
+  
+  if (self->IsActivationValid ())
+    self->Hide ();
 }
 
 void
 PlacesController::RecvMouseDownOutsideOfView  (int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  Hide ();
+  if (IsActivationValid ())
+    Hide ();
 }
 
 void
 PlacesController::OnActivePlaceEntryChanged (PlaceEntry *entry)
 {
-  entry ? Show () : Hide ();
+  if (IsActivationValid ())
+    entry ? Show () : Hide ();
 }
 
 void
@@ -361,3 +387,17 @@
 {
   // We don't need to do anything just yet over here, it's a placeholder for when we do
 }
+
+// TODO: put that in some "util" toolbox
+struct timespec PlacesController::time_diff (struct timespec start, struct timespec end)
+{
+  struct timespec temp;
+  if ((end.tv_nsec - start.tv_nsec) < 0) {
+    temp.tv_sec = end.tv_sec - start.tv_sec-1;
+    temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
+  } else {
+    temp.tv_sec = end.tv_sec - start.tv_sec;
+    temp.tv_nsec = end.tv_nsec - start.tv_nsec;
+  }
+  return temp;
+}

=== modified file 'src/PlacesController.h'
--- src/PlacesController.h	2011-04-13 07:49:27 +0000
+++ src/PlacesController.h	2011-04-20 12:42:18 +0000
@@ -31,6 +31,8 @@
 #include "PlacesView.h"
 #include "Introspectable.h"
 
+#include <time.h>
+
 #include <Nux/BaseWindow.h>
 #include <Nux/TimelineEasings.h>
 
@@ -81,6 +83,10 @@
   gint64            _start_time;
   GdkRectangle      _monitor_rect;
   
+  bool IsActivationValid ();
+  struct timespec time_diff (struct timespec start, struct timespec end);
+  struct timespec _last_activate_time;
+  
   bool              _need_show;
 
   guint             _ubus_handles[2];

=== modified file 'src/PlacesHomeView.cpp'
--- src/PlacesHomeView.cpp	2011-04-14 13:52:20 +0000
+++ src/PlacesHomeView.cpp	2011-04-20 12:42:18 +0000
@@ -51,6 +51,8 @@
 #define MAIL_DIR     "/desktop/gnome/url-handlers/mailto"
 #define MEDIA_DIR    DESKTOP_DIR"/media"
 
+#define DELTA_DOUBLE_REQUEST 500000000
+
 enum
 {
   TYPE_PLACE=0,
@@ -132,6 +134,9 @@
                           (GConfClientNotifyFunc)OnKeyChanged,
                           this,
                           NULL, NULL);
+                          
+  _last_activate_time.tv_sec = 0;
+  _last_activate_time.tv_nsec = 0;
 
   _ubus_handle = ubus_server_register_interest (ubus_server_get_default (),
                                                 UBUS_DASH_EXTERNAL_ACTIVATION,
@@ -180,7 +185,19 @@
 PlacesHomeView::DashVisible (GVariant *data, void *val)
 {
   PlacesHomeView *self = (PlacesHomeView*)val;
-  self->Refresh ();
+  
+  struct timespec event_time, delta;
+  clock_gettime(CLOCK_MONOTONIC, &event_time);
+  delta = self->time_diff (self->_last_activate_time, event_time);
+
+  self->_last_activate_time.tv_sec = event_time.tv_sec;
+  self->_last_activate_time.tv_nsec = event_time.tv_nsec;
+
+  // FIXME: this should be handled by ubus (not sending the request twice
+  // for some selected ones). Too intrusive for now.
+  if (!((delta.tv_sec == 0) && (delta.tv_nsec < DELTA_DOUBLE_REQUEST)))
+    self->Refresh ();
+
 }
 
 void
@@ -404,3 +421,17 @@
   g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));
   g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));
 }
+
+// TODO: put that in some "util" toolbox
+struct timespec PlacesHomeView::time_diff (struct timespec start, struct timespec end)
+{
+  struct timespec temp;
+  if ((end.tv_nsec - start.tv_nsec) < 0) {
+    temp.tv_sec = end.tv_sec - start.tv_sec-1;
+    temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
+  } else {
+    temp.tv_sec = end.tv_sec - start.tv_sec;
+    temp.tv_nsec = end.tv_nsec - start.tv_nsec;
+  }
+  return temp;
+}

=== modified file 'src/PlacesHomeView.h'
--- src/PlacesHomeView.h	2011-04-12 14:34:08 +0000
+++ src/PlacesHomeView.h	2011-04-20 12:42:18 +0000
@@ -33,6 +33,7 @@
 #include "PlacesGroup.h"
 
 #include <gconf/gconf-client.h>
+#include <time.h>
 
 class PlacesHomeView : public Introspectable, public PlacesGroup
 {
@@ -66,6 +67,9 @@
   std::vector<std::string> _photo_alternatives;
   std::vector<std::string> _email_alternatives;
   std::vector<std::string> _music_alternatives;
+  
+  struct timespec time_diff (struct timespec start, struct timespec end);
+  struct timespec _last_activate_time;
 
   guint _ubus_handle;
 };