Merge lp:~canonical-dx-team/unity/unity.shimmer into lp:unity

[Jason Smith]

[Sam Spilsbury (smspillaz)]

Looks good to merge, although it would be nice if you could fix these:

1) You need to either change these to const gchar * or create stack or heap memory for them

/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/src/IntrospectionDBusInterface.cpp:41:1: warning: deprecated conversion from string constant to ‘gchar*’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/src/IntrospectionDBusInterface.cpp:41:1: warning: deprecated conversion from string constant to ‘gchar*’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/src/IntrospectionDBusInterface.cpp:51:1: warning: deprecated conversion from string constant to ‘gchar*’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/src/IntrospectionDBusInterface.cpp:51:1: warning: deprecated conversion from string constant to ‘gchar*’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/src/IntrospectionDBusInterface.cpp:61:1: warning: deprecated conversion from string constant to ‘gchar*’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/src/IntrospectionDBusInterface.cpp:73:1: warning: deprecated conversion from string constant to ‘gchar*’

2) Remove these unused variables

/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘_dbus_handle_unity_place_service_entry_added’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:2664:15: warning: unused variable ‘reply’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘_dbus_handle_unity_place_service_entry_removed’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:2799:15: warning: unused variable ‘reply’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘_dbus_handle_unity_place_entry_service_entry_renderer_info_changed’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:4102:15: warning: unused variable ‘reply’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘_dbus_handle_unity_place_entry_service_global_renderer_info_changed’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:4154:15: warning: unused variable ‘reply’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘_dbus_handle_unity_place_entry_service_place_entry_info_changed’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:4214:15: warning: unused variable ‘reply’

3) This is bad

/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘unity_place_service_impl_dbus_message’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:4851:2: warning: implicit declaration of function ‘unity_place_activation_dbus_message’
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c: In function ‘unity_place_service_impl_dbus_register_object’:
/home/smspillaz/Source/compiz/compiz-glib/unity.shimmer/build/libunity/unity-place.c:4866:2: warning: implicit declaration of f...

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-11-25 07:33:42 +0000
+++ src/Launcher.cpp	2010-11-25 23:52:43 +0000
@@ -331,24 +331,28 @@
 
 bool Launcher::IconNeedsAnimation (LauncherIcon *icon, struct timespec current)
 {
-    struct timespec visible_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_VISIBLE);
-    if (TimeDelta (&current, &visible_time) < ANIM_DURATION_SHORT)
-        return true;
-    
-    struct timespec running_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_RUNNING);
-    if (TimeDelta (&current, &running_time) < ANIM_DURATION_SHORT)
-        return true;
-    
-    struct timespec starting_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_STARTING);
-    if (TimeDelta (&current, &starting_time) < (ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2))
-        return true;
-    
-    struct timespec urgent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
-    if (TimeDelta (&current, &urgent_time) < (ANIM_DURATION_LONG * URGENT_BLINKS * 2))
-        return true;
-    
-    struct timespec present_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
-    if (TimeDelta (&current, &present_time) < ANIM_DURATION)
+    struct timespec time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_VISIBLE);
+    if (TimeDelta (&current, &time) < ANIM_DURATION_SHORT)
+        return true;
+    
+    time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_RUNNING);
+    if (TimeDelta (&current, &time) < ANIM_DURATION_SHORT)
+        return true;
+    
+    time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_STARTING);
+    if (TimeDelta (&current, &time) < (ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2))
+        return true;
+    
+    time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
+    if (TimeDelta (&current, &time) < (ANIM_DURATION_LONG * URGENT_BLINKS * 2))
+        return true;
+    
+    time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
+    if (TimeDelta (&current, &time) < ANIM_DURATION)
+        return true;
+    
+    time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_SHIMMER);
+    if (TimeDelta (&current, &time) < ANIM_DURATION_LONG)
         return true;
     
     return false;
@@ -481,6 +485,13 @@
       return 1.0f - result;
 }
 
+float Launcher::IconShimmerProgress (LauncherIcon *icon, struct timespec current)
+{
+    struct timespec shimmer_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_SHIMMER);
+    int shimmer_ms = TimeDelta (&current, &shimmer_time);
+    return CLAMP ((float) shimmer_ms / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
+}
+
 float Launcher::IconUrgentPulseValue (LauncherIcon *icon, struct timespec current)
 {
     if (!icon->GetQuirk (LAUNCHER_ICON_QUIRK_URGENT))
@@ -530,6 +541,29 @@
     return result;
 }
 
+void Launcher::SetupRenderArg (LauncherIcon *icon, struct timespec current, RenderArg &arg)
+{
+    arg.icon           = icon;
+    arg.alpha          = 1.0f;
+    arg.running_arrow  = false;
+    arg.active_arrow   = icon->GetQuirk (LAUNCHER_ICON_QUIRK_ACTIVE);
+    arg.folding_rads   = 0.0f;
+    arg.skip           = false;
+    
+    arg.window_indicators = MIN (4, icon->RelatedWindows ());
+    
+    // we dont need to show strays
+    if (arg.window_indicators == 1 || !icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING))
+        arg.window_indicators = 0;
+    
+    arg.backlight_intensity = IconBackgroundIntensity (icon, current);
+    arg.shimmer_progress = IconShimmerProgress (icon, current);
+    
+    float urgent_progress = IconUrgentProgress (icon, current);
+    urgent_progress = CLAMP (urgent_progress * 3, 0.0f, 1.0f); // we want to go 3x faster than the urgent normal cycle
+    arg.glow_intensity = urgent_progress;
+}
+
 void Launcher::RenderArgs (std::list<Launcher::RenderArg> &launcher_args, 
                            std::list<Launcher::RenderArg> &shelf_args, 
                            nux::Geometry &box_geo, nux::Geometry &shelf_geo)
@@ -648,24 +682,7 @@
         RenderArg arg;
         LauncherIcon *icon = *it;
         
-        arg.icon           = icon;
-        arg.alpha          = 1.0f;
-        arg.running_arrow  = false;
-        arg.active_arrow   = icon->GetQuirk (LAUNCHER_ICON_QUIRK_ACTIVE);
-        arg.folding_rads   = 0.0f;
-        arg.skip           = false;
-        
-        arg.window_indicators = MIN (4, icon->RelatedWindows ());
-        
-        // we dont need to show strays
-        if (arg.window_indicators == 1 || !icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING))
-            arg.window_indicators = 0;
-        
-        arg.backlight_intensity = IconBackgroundIntensity (icon, current);
-        
-        float urgent_progress = IconUrgentProgress (icon, current);
-        urgent_progress = CLAMP (urgent_progress * 3, 0.0f, 1.0f); // we want to go 3x faster than the urgent normal cycle
-        arg.glow_intensity = urgent_progress;
+        SetupRenderArg (icon, current, arg);
         
         // reset z
         center.z = 0;
@@ -721,22 +738,8 @@
     {
         RenderArg arg;
         LauncherIcon *icon = *it;
-        
-        arg.icon           = icon;
-        arg.alpha          = 1.0f;
-        arg.glow_intensity = 0.0f;
-        arg.running_arrow  = false;
-        arg.active_arrow   = icon->GetQuirk (LAUNCHER_ICON_QUIRK_ACTIVE);
-        arg.folding_rads   = 0.0f;
-        arg.skip           = false;
-        
-        arg.window_indicators = MIN (4, icon->RelatedWindows ());
-        
-        // we dont need to show strays
-        if (arg.window_indicators == 1 || !icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING))
-          arg.window_indicators = 0;
-        
-        arg.backlight_intensity = IconBackgroundIntensity (icon, current);
+
+        SetupRenderArg (icon, current, arg);        
         
         // reset z
         center.z = 0;
@@ -1241,6 +1244,30 @@
                geo,
                false);
   }
+  
+  if (arg.shimmer_progress > 0.0f && arg.shimmer_progress < 1.0f)
+  {
+    nux::Geometry base = GetGeometry ();
+    int x1 = base.x + base.width;
+    int x2 = base.x + base.width;
+    float shimmer_constant = 1.9f;
+    
+    x1 -= geo.width * arg.shimmer_progress * shimmer_constant;
+    GfxContext.PushClippingRectangle(nux::Geometry (x1, geo.y, x2 - x1, geo.height));
+    
+    float fade_out = 1.0f - CLAMP (((x2 - x1) - geo.width) / (geo.width * (shimmer_constant - 1.0f)), 0.0f, 1.0f);
+    
+    RenderIcon(GfxContext, 
+               arg, 
+               _icon_glow_texture,
+               arg.icon->GlowColor (), 
+               fade_out, 
+               arg.icon->_xform_coords["Glow"], 
+               geo,
+               false);
+    
+    GfxContext.PopClippingRectangle();
+  }
 }
 
 void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2010-11-25 01:55:23 +0000
+++ src/Launcher.h	2010-11-25 23:52:43 +0000
@@ -23,7 +23,7 @@
 #include <sys/time.h>
 
 #include <Nux/View.h>
-#include <Nux/BaseWindow.h>
+#include <Nux/BaseWindow.h>
 #include "Introspectable.h"
 #include "LauncherIcon.h"
 #include "NuxGraphics/IOpenGLAsmShader.h"
@@ -65,20 +65,20 @@
     virtual void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
     virtual void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
     virtual void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    virtual void RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags);
-
+    virtual void RecvMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags);
+
     //! Called by LauncherIcon to signal that a Quicklist is becoming active.
     void SetActiveQuicklist (QuicklistView *quicklist);
     //! Get the active qicklist
     QuicklistView *GetActiveQuicklist ();
     //! Called by LauncherIcon to signal that a Quicklist is becoming unactive.
     void CancelActiveQuicklist (QuicklistView *quicklist);
-
-protected:	
-	// Introspectable methods
-	const gchar* GetName ();
+
+protected:	
+	// Introspectable methods
+	const gchar* GetName ();
 	void AddProperties (GVariantBuilder *builder);
-
+
 private:
   typedef enum
   {
@@ -101,6 +101,7 @@
     float         alpha;
     float         backlight_intensity;
     float         glow_intensity;
+    float         shimmer_progress;
     bool          running_arrow;
     bool          active_arrow;
     bool          skip;
@@ -126,6 +127,7 @@
   float AutohideProgress ();
   float IconPresentProgress     (LauncherIcon *icon, struct timespec current);
   float IconUrgentProgress      (LauncherIcon *icon, struct timespec current);
+  float IconShimmerProgress     (LauncherIcon *icon, struct timespec current);
   float IconUrgentPulseValue    (LauncherIcon *icon, struct timespec current);
   float IconStartingPulseValue  (LauncherIcon *icon, struct timespec current);
   float IconBackgroundIntensity (LauncherIcon *icon, struct timespec current);
@@ -135,6 +137,8 @@
   void SetHidden  (bool hidden);
   
   void SetDndDelta (float x, float y, nux::Geometry geo, struct timespec current);
+  
+  void SetupRenderArg (LauncherIcon *icon, struct timespec current, RenderArg &arg);
   void RenderArgs (std::list<Launcher::RenderArg> &launcher_args, 
                    std::list<Launcher::RenderArg> &shelf_args, 
                    nux::Geometry &box_geo, nux::Geometry &shelf_geo);

=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp	2010-11-25 05:40:01 +0000
+++ src/LauncherController.cpp	2010-11-25 23:52:43 +0000
@@ -52,24 +52,28 @@
 LauncherController::PresentIconOwningWindow (Window window)
 {
   LauncherModel::iterator it;
+  LauncherIcon *owner = 0;
   
   for (it = _model->begin (); it != _model->end (); it++)
   {
     if ((*it)->IconOwnsWindow (window))
     {
-      (*it)->Present (2, 600);
-      return;
+      owner = *it;
+      break;
     }
   }
   
-  for (it = _model->shelf_begin (); it != _model->shelf_end (); it++)
+  for (it = _model->shelf_begin (); !owner && it != _model->shelf_end (); it++)
   {
     if ((*it)->IconOwnsWindow (window))
     {
-      (*it)->Present (2, 600);
-      return;
+      owner = *it;
+      break;
     }
   }
+  
+  owner->Present (2, 600);
+  owner->UpdateQuirkTimeDelayed (300, LAUNCHER_ICON_QUIRK_SHIMMER);
 }
 
 void

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2010-11-25 16:23:26 +0000
+++ src/LauncherIcon.cpp	2010-11-25 23:52:43 +0000
@@ -512,6 +512,28 @@
     Present (1, 1500);
 }
 
+gboolean
+LauncherIcon::OnDelayedUpdateTimeout (gpointer data)
+{
+  DelayedUpdateArg *arg = (DelayedUpdateArg *) data;
+  LauncherIcon *self = arg->self;
+
+  clock_gettime (CLOCK_MONOTONIC, &(self->_quirk_times[arg->quirk]));
+  self->needs_redraw.emit (self);
+  
+  return false;
+}
+
+void
+LauncherIcon::UpdateQuirkTimeDelayed (guint ms, LauncherIconQuirk quirk)
+{
+  DelayedUpdateArg *arg = new DelayedUpdateArg ();
+  arg->self = this;
+  arg->quirk = quirk;
+  
+  g_timeout_add (ms, &LauncherIcon::OnDelayedUpdateTimeout, arg);
+}
+
 void
 LauncherIcon::UpdateQuirkTime (LauncherIconQuirk quirk)
 {

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2010-11-25 16:23:26 +0000
+++ src/LauncherIcon.h	2010-11-25 23:52:43 +0000
@@ -58,6 +58,7 @@
   LAUNCHER_ICON_QUIRK_URGENT,
   LAUNCHER_ICON_QUIRK_PRESENTED,
   LAUNCHER_ICON_QUIRK_STARTING,
+  LAUNCHER_ICON_QUIRK_SHIMMER,
   
   LAUNCHER_ICON_QUIRK_LAST,
 } LauncherIconQuirk;
@@ -116,6 +117,7 @@
 protected:
     void SetQuirk (LauncherIconQuirk quirk, bool value);
 
+    void UpdateQuirkTimeDelayed (guint ms, LauncherIconQuirk quirk);
     void UpdateQuirkTime (LauncherIconQuirk quirk);
     void ResetQuirkTime (LauncherIconQuirk quirk);
 
@@ -157,10 +159,17 @@
     friend class LauncherController;
 
 private:
+    typedef struct
+    {
+      LauncherIcon *self;
+      LauncherIconQuirk quirk;
+    } DelayedUpdateArg;
+
     static void ChildRealized (DbusmenuMenuitem *newitem, QuicklistView *quicklist);
     static void RootChanged (DbusmenuClient * client, DbusmenuMenuitem *newroot, QuicklistView *quicklist);
     static gboolean OnPresentTimeout (gpointer data);
     static gboolean OnCenterTimeout (gpointer data);
+    static gboolean OnDelayedUpdateTimeout (gpointer data);
 
     void ColorForIcon (GdkPixbuf *pixbuf, nux::Color &background, nux::Color &glow);