Merge lp:~didrocks/unity/fix-661049 into lp:unity

[Didier Roche-Tolomelli]

Enabling double click on the launcher to restore a maximized window
(LP: #661049)

This isn't the best fix as nux seems to have some broken piece in
OnMouseDoubleClick but rather a temporary solution. Fixing it in nux will enable
us to depend on system setup and such. For now, the faked double-click time is
500ms.

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-01-25 15:35:00 +0000
+++ src/PanelMenuView.cpp	2011-01-26 14:21:33 +0000
@@ -78,6 +78,7 @@
 
   _panel_titlebar_grab_area = new PanelTitlebarGrabArea ();
   _panel_titlebar_grab_area->mouse_down.connect (sigc::mem_fun (this, &PanelMenuView::OnMaximizedGrab));
+  _panel_titlebar_grab_area->mouse_doubleclick.connect (sigc::mem_fun (this, &PanelMenuView::OnRestoreClicked));
 
   win_manager = WindowManager::Default ();
 

=== modified file 'src/PanelTitlebarGrabAreaView.cpp'
--- src/PanelTitlebarGrabAreaView.cpp	2010-12-30 15:57:11 +0000
+++ src/PanelTitlebarGrabAreaView.cpp	2011-01-26 14:21:33 +0000
@@ -15,6 +15,7 @@
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
  * Authored by: Sam Spilsbury <[e-mail]>
+ * Authored by: Didier Roche <[e-mail]>
  */
 
 #include "Nux/Nux.h"
@@ -30,6 +31,8 @@
 
 #include <glib.h>
 
+#define DELTA_MOUSE_DOUBLE_CLICK 500000000
+
 enum
 {
   BUTTON_CLOSE=0,
@@ -40,7 +43,16 @@
 
 PanelTitlebarGrabArea::PanelTitlebarGrabArea ()
 : InputArea (NUX_TRACKER_LOCATION)
-{
+{  
+  // 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
+  /*InputArea::EnableDoubleClick (true);
+  InputArea::OnMouseDoubleClick.connect (sigc::mem_fun (this, &PanelTitlebarGrabArea::RecvMouseDoubleClick));*/
+  InputArea::OnMouseClick.connect (sigc::mem_fun (this, &PanelTitlebarGrabArea::RecvMouseClick));
+  _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::OnMouseDown.connect (sigc::mem_fun (this, &PanelTitlebarGrabArea::RecvMouseDown));
 }
 
@@ -49,6 +61,43 @@
 {
 }
 
+void PanelTitlebarGrabArea::RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags)
+{
+  mouse_down.emit (x, y);
+}
+
+void PanelTitlebarGrabArea::RecvMouseDoubleClick (int x, int y, unsigned long button_flags, unsigned long key_flags)
+{
+  mouse_doubleclick.emit ();
+}
+
+// TODO: can be safely removed once OnMouseDoubleClick is fixed in nux
+void PanelTitlebarGrabArea::RecvMouseClick (int x, int y, unsigned long button_flags, unsigned long key_flags)
+{
+  struct timespec event_time, delta;
+  clock_gettime(CLOCK_MONOTONIC, &event_time);
+  delta = time_diff (_last_click_time, event_time);
+
+  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)
+{
+  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;
+}
+
 const gchar *
 PanelTitlebarGrabArea::GetName ()
 {
@@ -72,10 +121,3 @@
   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));
 }
-
-void PanelTitlebarGrabArea::RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags)
-{
-  mouse_down.emit (x, y);
-}
-
-

=== modified file 'src/PanelTitlebarGrabAreaView.h'
--- src/PanelTitlebarGrabAreaView.h	2010-12-30 15:57:11 +0000
+++ src/PanelTitlebarGrabAreaView.h	2011-01-26 14:21:33 +0000
@@ -15,11 +15,16 @@
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
  * Authored by: Sam Spilsbury <[e-mail]>
+ * Authored by: Didier Roche <[e-mail]>
  */
 
 #ifndef PANEL_TITLEBAR_GRAB_AREA_H
 #define PANEL_TITLEBAR_GRAB_AREA_H_H
 
+
+// TODO: remove once double click will work in nux
+#include <time.h>
+
 #include <Nux/View.h>
 
 #include "Introspectable.h"
@@ -34,13 +39,20 @@
   ~PanelTitlebarGrabArea ();
 
   sigc::signal <void, int, int> mouse_down;
+  sigc::signal <void> mouse_doubleclick;
 
 protected:
+  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 RecvMouseClick (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 RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags);
 };
 
 #endif