Merge lp:~canonical-dx-team/unity/unity.launcher-action-items into lp:unity

[Jason Smith]

[Neil J. Patel (njpatel)]

Works as expected, code looks good. Approved.

review: Approve

=== modified file 'resources/focused_indicator.png'
Binary files resources/focused_indicator.png	2010-11-02 23:27:40 +0000 and resources/focused_indicator.png	2010-12-04 21:47:02 +0000 differ
=== modified file 'resources/running_indicator.png'
Binary files resources/running_indicator.png	2010-11-02 23:27:40 +0000 and resources/running_indicator.png	2010-12-04 21:47:02 +0000 differ
=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2010-12-03 00:01:41 +0000
+++ src/BamfLauncherIcon.cpp	2010-12-04 21:47:02 +0000
@@ -129,64 +129,124 @@
 }
 
 void
+BamfLauncherIcon::Focus ()
+{
+  GList *children, *l;
+  BamfView *view;
+  
+  children = bamf_view_get_children (BAMF_VIEW (m_App));
+  
+  CompWindowList windows;
+  
+  /* get the list of windows */
+  for (l = children; l; l = l->next)
+  {
+    view = (BamfView *) l->data;
+
+    if (BAMF_IS_WINDOW (view))
+    {
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
+  
+      CompWindow *window = m_Screen->findWindow ((Window) xid);
+  
+      if (window)
+        windows.push_back (window);
+    }
+  }
+  
+  if (windows.empty ())
+    return;
+
+  /* sort the list */
+  CompWindowList tmp;
+  CompWindowList::iterator it;
+  for (it = m_Screen->windows ().begin (); it != m_Screen->windows ().end (); it++)
+  {
+    if (std::find (windows.begin (), windows.end (), *it) != windows.end ())
+      tmp.push_back (*it);
+  }
+  windows = tmp;
+  
+  
+  /* filter based on workspace */
+  bool any_on_current = false;    
+  
+  for (it = windows.begin (); it != windows.end (); it++)
+  {
+    if ((*it)->defaultViewport () == m_Screen->vp ())
+    {
+      any_on_current = true;
+      break;
+    }
+  }
+  
+  /* activate our windows */
+  
+  if (any_on_current)
+  {
+    for (it = windows.begin (); it != windows.end (); it++)
+    {
+      if ((*it)->defaultViewport () == m_Screen->vp ())
+      {  
+        (*it)->activate ();
+      }
+    }
+  }
+  else
+  {
+    (*(windows.rbegin ()))->activate ();
+  }
+  
+  g_list_free (children);
+}
+
+void
+BamfLauncherIcon::Spread ()
+{
+  BamfView *view;
+  GList *children, *l;
+  children = bamf_view_get_children (BAMF_VIEW (m_App));
+  
+  std::list<Window> windowList;
+  for (l = children; l; l = l->next)
+  {
+    view = (BamfView *) l->data;
+
+    if (BAMF_IS_WINDOW (view))
+    {
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
+        
+      windowList.push_back ((Window) xid);
+    }
+  }
+  
+  if (windowList.size () > 1)
+  {
+    std::string *match = PluginAdapter::Default ()->MatchStringForXids (&windowList);
+    PluginAdapter::Default ()->InitiateScale (match);
+    delete match;
+  }
+  
+  g_list_free (children);
+}
+
+void
 BamfLauncherIcon::OnMouseClick (int button)
 {
   if (button != 1)
     return;
   
-  BamfView *view;
-  GList *children, *l;
   bool active, running;
   
-  children = bamf_view_get_children (BAMF_VIEW (m_App));
   active = bamf_view_is_active (BAMF_VIEW (m_App));
   running = bamf_view_is_running (BAMF_VIEW (m_App));
   
   if (!running)
-  {
     OpenInstance ();
-    return;
-  }
-  
-  if (active)
-  {
-    std::list<Window> windowList;
-    for (l = children; l; l = l->next)
-    {
-      view = (BamfView *) l->data;
-  
-      if (BAMF_IS_WINDOW (view))
-      {
-        guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
-          
-        windowList.push_back ((Window) xid);
-      }
-    }
-    
-    if (windowList.size () > 1)
-    {
-      std::string *match = PluginAdapter::Default ()->MatchStringForXids (&windowList);
-      PluginAdapter::Default ()->InitiateScale (match);
-      delete match;
-    }
-  }
+  else if (active)
+    Spread ();
   else
-  {
-    for (l = children; l; l = l->next)
-    {
-      view = (BamfView *) l->data;
-  
-      if (BAMF_IS_WINDOW (view))
-      {
-        guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
-    
-        CompWindow *window = m_Screen->findWindow ((Window) xid);
-    
-        if (window)
-          window->activate ();
-      }
-    }
-  }
+    Focus ();
 }
 
 void
@@ -248,6 +308,8 @@
   }
   
   SetRelatedWindows (count);
+  
+  g_list_free (children);
 }
 
 void
@@ -287,6 +349,8 @@
     DbusmenuClient *client = dbusmenu_client_new (bamf_indicator_get_remote_address (indicator), path.c_str ());
     _menu_clients[path] = client;
   }
+  
+  g_list_free (children);
 }
 
 void
@@ -316,6 +380,8 @@
         window->close (self->m_Screen->getCurrentTime ());
     }
   }
+  
+  g_list_free (children);
 }
 
 void
@@ -461,6 +527,8 @@
                        (unsigned char *) data, 4);
     }
   }
+  
+  g_list_free (children);
 }
 
 void 

=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2010-12-02 16:01:38 +0000
+++ src/BamfLauncherIcon.h	2010-12-04 21:47:02 +0000
@@ -61,6 +61,8 @@
     void UpdateMenus ();
     
     void OpenInstance ();
+    void Focus ();
+    void Spread ();
     
     void EnsureMenuItemsReady ();
     

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-12-03 16:27:48 +0000
+++ src/Launcher.cpp	2010-12-04 21:47:02 +0000
@@ -49,7 +49,7 @@
 #define BACKLIGHT_STRENGTH  0.9f
 
 int
-TimeDelta (struct timespec *x, struct timespec *y)
+TimeDelta (struct timespec const *x, struct timespec const *y)
 {
   return ((x->tv_sec - y->tv_sec) * 1000) + ((x->tv_nsec - y->tv_nsec) / 1000000);
 }
@@ -279,9 +279,12 @@
 void
 Launcher::AddProperties (GVariantBuilder *builder)
 {
-  g_variant_builder_add (builder, "{sv}", "hover-progress", g_variant_new_double ((double) GetHoverProgress ()));
-  g_variant_builder_add (builder, "{sv}", "dnd-exit-progress", g_variant_new_double ((double) DnDExitProgress ()));
-  g_variant_builder_add (builder, "{sv}", "autohide-progress", g_variant_new_double ((double) AutohideProgress ()));
+  struct timespec current;
+  clock_gettime (CLOCK_MONOTONIC, &current);
+
+  g_variant_builder_add (builder, "{sv}", "hover-progress", g_variant_new_double ((double) GetHoverProgress (current)));
+  g_variant_builder_add (builder, "{sv}", "dnd-exit-progress", g_variant_new_double ((double) DnDExitProgress (current)));
+  g_variant_builder_add (builder, "{sv}", "autohide-progress", g_variant_new_double ((double) AutohideProgress (current)));
   
   g_variant_builder_add (builder, "{sv}", "dnd-delta", g_variant_new_int32 (_dnd_delta));
   g_variant_builder_add (builder, "{sv}", "floating", g_variant_new_boolean (_floating));
@@ -294,33 +297,24 @@
 
 /* Render Layout Logic */
 
-float Launcher::GetHoverProgress ()
+float Launcher::GetHoverProgress (struct timespec const &current)
 {
-    struct timespec current;
-    clock_gettime (CLOCK_MONOTONIC, &current);
-    
     if (_hovered)
         return CLAMP ((float) (TimeDelta (&current, &_enter_time)) / (float) ANIM_DURATION, 0.0f, 1.0f);
     else
         return 1.0f - CLAMP ((float) (TimeDelta (&current, &_exit_time)) / (float) ANIM_DURATION, 0.0f, 1.0f);
 }
 
-float Launcher::DnDExitProgress ()
+float Launcher::DnDExitProgress (struct timespec const &current)
 {
-    struct timespec current;
-    clock_gettime (CLOCK_MONOTONIC, &current);
-    
     return 1.0f - CLAMP ((float) (TimeDelta (&current, &_drag_end_time)) / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
 }
 
-float Launcher::AutohideProgress ()
+float Launcher::AutohideProgress (struct timespec const &current)
 {
     if (!_autohide)
         return 0.0f;
         
-    struct timespec current;
-    clock_gettime (CLOCK_MONOTONIC, &current);
-    
     if (_hidden)
         return CLAMP ((float) (TimeDelta (&current, &_autohide_time)) / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
     else
@@ -352,7 +346,7 @@
         _anim_handle = g_timeout_add (1000 / 60 - 1, &Launcher::AnimationTimeout, this);
 }
 
-bool Launcher::IconNeedsAnimation (LauncherIcon *icon, struct timespec current)
+bool Launcher::IconNeedsAnimation (LauncherIcon *icon, struct timespec const &current)
 {
     struct timespec time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_VISIBLE);
     if (TimeDelta (&current, &time) < ANIM_DURATION_SHORT)
@@ -442,7 +436,7 @@
     timer->tv_nsec = current.tv_nsec;
 }
 
-float IconVisibleProgress (LauncherIcon *icon, struct timespec current)
+float IconVisibleProgress (LauncherIcon *icon, struct timespec const &current)
 {
     if (icon->GetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE))
     {
@@ -458,7 +452,7 @@
     }
 }
 
-void Launcher::SetDndDelta (float x, float y, nux::Geometry geo, struct timespec current)
+void Launcher::SetDndDelta (float x, float y, nux::Geometry geo, struct timespec const &current)
 {
     LauncherIcon *anchor = 0;
     LauncherModel::iterator it;
@@ -484,7 +478,7 @@
     }
 }
 
-float Launcher::IconPresentProgress (LauncherIcon *icon, struct timespec current)
+float Launcher::IconPresentProgress (LauncherIcon *icon, struct timespec const &current)
 {
     struct timespec icon_present_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_PRESENTED);
     int ms = TimeDelta (&current, &icon_present_time);
@@ -496,7 +490,7 @@
         return 1.0f - result;
 }
 
-float Launcher::IconUrgentProgress (LauncherIcon *icon, struct timespec current)
+float Launcher::IconUrgentProgress (LauncherIcon *icon, struct timespec const &current)
 {
     struct timespec urgent_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_URGENT);
     int urgent_ms = TimeDelta (&current, &urgent_time);
@@ -508,14 +502,14 @@
       return 1.0f - result;
 }
 
-float Launcher::IconShimmerProgress (LauncherIcon *icon, struct timespec current)
+float Launcher::IconShimmerProgress (LauncherIcon *icon, struct timespec const &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)
+float Launcher::IconUrgentPulseValue (LauncherIcon *icon, struct timespec const &current)
 {
     if (!icon->GetQuirk (LAUNCHER_ICON_QUIRK_URGENT))
         return 1.0f; // we are full on in a normal condition
@@ -524,7 +518,7 @@
     return 0.5f + (float) (std::cos (M_PI * (float) (URGENT_BLINKS * 2) * urgent_progress)) * 0.5f;
 }
 
-float Launcher::IconStartingPulseValue (LauncherIcon *icon, struct timespec current)
+float Launcher::IconStartingPulseValue (LauncherIcon *icon, struct timespec const &current)
 {
     struct timespec starting_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_STARTING);
     int starting_ms = TimeDelta (&current, &starting_time);
@@ -533,7 +527,7 @@
     return 1.0f - (0.5f + (float) (std::cos (M_PI * (float) (MAX_STARTING_BLINKS * 2) * starting_progress)) * 0.5f);
 }
 
-float Launcher::IconBackgroundIntensity (LauncherIcon *icon, struct timespec current)
+float Launcher::IconBackgroundIntensity (LauncherIcon *icon, struct timespec const &current)
 {
     float result = 0.0f;
     struct timespec running_time = icon->GetQuirkTime (LAUNCHER_ICON_QUIRK_RUNNING);
@@ -564,20 +558,23 @@
     return result;
 }
 
-void Launcher::SetupRenderArg (LauncherIcon *icon, struct timespec current, RenderArg &arg)
+void Launcher::SetupRenderArg (LauncherIcon *icon, struct timespec const &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.icon            = icon;
+    arg.alpha           = 1.0f;
+    arg.running_arrow   = icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING);
+    arg.active_arrow    = icon->GetQuirk (LAUNCHER_ICON_QUIRK_ACTIVE);
+    arg.running_colored = icon->GetQuirk (LAUNCHER_ICON_QUIRK_URGENT);
+    arg.active_colored  = false;
+    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))
+    if (!icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING))
         arg.window_indicators = 0;
+    else
+        arg.window_indicators = MIN (4, icon->RelatedWindows ());
     
     arg.backlight_intensity = IconBackgroundIntensity (icon, current);
     arg.shimmer_progress = IconShimmerProgress (icon, current);
@@ -597,18 +594,18 @@
 }
 
 void Launcher::RenderArgs (std::list<Launcher::RenderArg> &launcher_args, 
-                           std::list<Launcher::RenderArg> &shelf_args, 
-                           nux::Geometry &box_geo, nux::Geometry &shelf_geo)
+                           nux::Geometry &box_geo)
 {
     nux::Geometry geo = GetGeometry ();
     LauncherModel::iterator it;
     nux::Point3 center;
-    float hover_progress = GetHoverProgress ();
+    struct timespec current;
+    clock_gettime (CLOCK_MONOTONIC, &current);
+    
+    float hover_progress = GetHoverProgress (current);
     float folded_z_distance = _folded_z_distance * (1.0f - hover_progress);
     float animation_neg_rads = _neg_folded_angle * (1.0f - hover_progress);
     int vertical_offset = _parent->GetGeometry ().y;
-    struct timespec current;
-    clock_gettime (CLOCK_MONOTONIC, &current);
 
     float folding_constant = 0.25f;
     float folding_not_constant = folding_constant + ((1.0f - folding_constant) * hover_progress);
@@ -620,19 +617,7 @@
     center.y = _space_between_icons;
     center.z = 0;
     
-    // compute required height of shelf
-    float shelf_sum = 0.0f;
-    for (it = _model->shelf_begin (); it != _model->shelf_end (); it++)
-    {
-        float height = (_icon_size + _space_between_icons) * IconVisibleProgress (*it, current);
-        shelf_sum += height;    
-    }
-    
-    // add bottom padding
-    if (shelf_sum > 0.0f)
-      shelf_sum += _space_between_icons;
-    
-    int launcher_height = geo.height - shelf_sum;
+    int launcher_height = geo.height;
     
     // compute required height of launcher AND folding threshold
     float sum = 0.0f + center.y;
@@ -648,10 +633,10 @@
         float present_progress = IconPresentProgress (*it, current);
         folding_threshold -= CLAMP (sum - launcher_height, 0.0f, height * magic_constant) * (folding_constant + (1.0f - folding_constant) * present_progress);
     }
-
+    
     // this happens on hover, basically its a flag and a value in one, we translate this into a dnd offset
     if (_enter_y != 0 && _enter_y + _icon_size / 2 > folding_threshold)
-        SetDndDelta (center.x, center.y, nux::Geometry (geo.x, geo.y, geo.width, geo.height - shelf_sum), current);
+        SetDndDelta (center.x, center.y, nux::Geometry (geo.x, geo.y, geo.width, geo.height), current);
 
     _enter_y = 0;
 
@@ -671,7 +656,7 @@
         
         if (_launcher_action_state != ACTION_DRAG_LAUNCHER)
         {
-            float dnd_progress = DnDExitProgress ();
+            float dnd_progress = DnDExitProgress (current);
 
             if (_dnd_delta > max)
                 delta_y = max + (delta_y - max) * dnd_progress;
@@ -690,7 +675,7 @@
         _dnd_delta = 0;
     }
     
-    float autohide_progress = AutohideProgress ();
+    float autohide_progress = AutohideProgress (current);
     float autohide_offset = 0.0f;
     if (_autohide && autohide_progress > 0.0f)
     {
@@ -700,108 +685,136 @@
     // Inform the painter where to paint the box
     box_geo = geo;
 
-    if (_floating)
-        box_geo.height = sum + shelf_sum + _space_between_icons;
-    
     if (_autohide)
         box_geo.x += autohide_offset;
     
-    shelf_geo = nux::Geometry (box_geo.x, box_geo.height - shelf_sum, box_geo.width, shelf_sum);
-    
     // The functional position we wish to represent for these icons is not smooth. Rather than introducing
     // special casing to represent this, we use MIN/MAX functions. This helps ensure that even though our
     // function is not smooth it is continuous, which is more important for our visual representation (icons
     // wont start jumping around).  As a general rule ANY if () statements that modify center.y should be seen
     // as bugs.
-    for (it = _model->begin (); it != _model->end (); it++)
-    {
-        RenderArg arg;
-        LauncherIcon *icon = *it;
-        
-        SetupRenderArg (icon, current, arg);
-        
-        // reset z
-        center.z = 0;
-        
-        float size_modifier = IconVisibleProgress (icon, current);
-        if (size_modifier < 1.0f)
-        {
-            arg.alpha = size_modifier;
-            center.z = 300.0f * (1.0f - size_modifier);
-        }
-        
-        if (size_modifier <= 0.0f)
-        {
-            arg.skip = true;
-            continue;
-        }
-        
-        // goes for 0.0f when fully unfolded, to 1.0f folded
-        float folding_progress = CLAMP ((center.y + _icon_size - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
-        float present_progress = IconPresentProgress (icon, current);
-        
-        folding_progress *= 1.0f - present_progress;
-        
-        float half_size = (folded_size / 2.0f) + (_icon_size / 2.0f - folded_size / 2.0f) * (1.0f - folding_progress);
-        
-        float icon_hide_offset = autohide_offset;
-        
-        if (icon->PresentUrgency () == 1)
-          icon_hide_offset *= 0.5f + 0.5f * (1.0f - present_progress);
-        else if (icon->PresentUrgency () >= 2)
-          icon_hide_offset *= 1.0f - present_progress;
-        
-        // icon is crossing threshold, start folding
-        center.z += folded_z_distance * folding_progress;
-        arg.folding_rads = animation_neg_rads * folding_progress;
-        
-        center.y += half_size * size_modifier;   // move to center
-        arg.center = nux::Point3 (center.x + icon_hide_offset, center.y, center.z);       // copy center
-        icon->SetCenter (nux::Point3 (center.x, center.y + vertical_offset, center.z));
-        center.y += half_size * size_modifier;   // move to end
-        
-        float spacing_overlap = CLAMP ((float) (center.y + (_space_between_icons * size_modifier) - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
-        //add spacing
-        center.y += (_space_between_icons * (1.0f - spacing_overlap) + folded_spacing * spacing_overlap) * size_modifier;
-        
-        launcher_args.push_back (arg);
-    }
-    
-    center.y = (box_geo.y + box_geo.height) - shelf_sum + _space_between_icons;
-    
-    // Place shelf icons
-    for (it = _model->shelf_begin (); it != _model->shelf_end (); it++)
-    {
-        RenderArg arg;
-        LauncherIcon *icon = *it;
-
-        SetupRenderArg (icon, current, arg);        
-        
-        // reset z
-        center.z = 0;
-        
-        float size_modifier = IconVisibleProgress (icon, current);
-        if (size_modifier < 1.0f)
-        {
-            arg.alpha = size_modifier;
-            center.z = 300.0f * (1.0f - size_modifier);
-        }
-        
-        if (size_modifier <= 0.0f)
-        {
-            arg.skip = true;
-            continue;
-        }
-        
-        float half_size = _icon_size / 2.0f;
-      
-        center.y += half_size * size_modifier;   // move to center
-        arg.center = nux::Point3 (center.x + autohide_offset, center.y, center.z);       // copy center
-        icon->SetCenter (nux::Point3 (center.x, center.y + vertical_offset, center.z));
-        center.y += half_size * size_modifier;   // move to end
-        center.y += _space_between_icons * size_modifier;
-        
-        shelf_args.push_back (arg);
+    for (it = _model->main_begin (); it != _model->main_end (); it++)
+    {
+        RenderArg arg;
+        LauncherIcon *icon = *it;
+        
+        SetupRenderArg (icon, current, arg);
+        
+        // reset z
+        center.z = 0;
+        
+        float size_modifier = IconVisibleProgress (icon, current);
+        if (size_modifier < 1.0f)
+        {
+            arg.alpha = size_modifier;
+            center.z = 300.0f * (1.0f - size_modifier);
+        }
+        
+        if (size_modifier <= 0.0f)
+        {
+            arg.skip = true;
+            continue;
+        }
+        
+        // goes for 0.0f when fully unfolded, to 1.0f folded
+        float folding_progress = CLAMP ((center.y + _icon_size - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
+        float present_progress = IconPresentProgress (icon, current);
+        
+        folding_progress *= 1.0f - present_progress;
+        
+        float half_size = (folded_size / 2.0f) + (_icon_size / 2.0f - folded_size / 2.0f) * (1.0f - folding_progress);
+        
+        float icon_hide_offset = autohide_offset;
+        
+        if (icon->PresentUrgency () == 1)
+          icon_hide_offset *= 0.5f + 0.5f * (1.0f - present_progress);
+        else if (icon->PresentUrgency () >= 2)
+          icon_hide_offset *= 1.0f - present_progress;
+        
+        // icon is crossing threshold, start folding
+        center.z += folded_z_distance * folding_progress;
+        arg.folding_rads = animation_neg_rads * folding_progress;
+        
+        center.y += half_size * size_modifier;   // move to center
+        arg.center = nux::Point3 (center.x + icon_hide_offset, center.y, center.z);       // copy center
+        icon->SetCenter (nux::Point3 (center.x, center.y + vertical_offset, center.z));
+        center.y += half_size * size_modifier;   // move to end
+        
+        float spacing_overlap = CLAMP ((float) (center.y + (_space_between_icons * size_modifier) - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
+        //add spacing
+        center.y += (_space_between_icons * (1.0f - spacing_overlap) + folded_spacing * spacing_overlap) * size_modifier;
+        
+        launcher_args.push_back (arg);
+    }
+    
+    // compute maximum height of shelf
+    float shelf_sum = 0.0f;
+    for (it = _model->shelf_begin (); it != _model->shelf_end (); it++)
+    {
+        float height = (_icon_size + _space_between_icons) * IconVisibleProgress (*it, current);
+        shelf_sum += height;    
+    }
+    
+    // add bottom padding
+    if (shelf_sum > 0.0f)
+      shelf_sum += _space_between_icons;
+    
+    float shelf_delta = MAX (((launcher_height - shelf_sum) + _space_between_icons) - center.y, 0.0f);
+    folding_threshold += shelf_delta;
+    center.y += shelf_delta;
+    
+    for (it = _model->shelf_begin (); it != _model->shelf_end (); it++)
+    {
+        RenderArg arg;
+        LauncherIcon *icon = *it;
+        
+        SetupRenderArg (icon, current, arg);
+        
+        // reset z
+        center.z = 0;
+        
+        float size_modifier = IconVisibleProgress (icon, current);
+        if (size_modifier < 1.0f)
+        {
+            arg.alpha = size_modifier;
+            center.z = 300.0f * (1.0f - size_modifier);
+        }
+        
+        if (size_modifier <= 0.0f)
+        {
+            arg.skip = true;
+            continue;
+        }
+        
+        // goes for 0.0f when fully unfolded, to 1.0f folded
+        float folding_progress = CLAMP ((center.y + _icon_size - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
+        float present_progress = IconPresentProgress (icon, current);
+        
+        folding_progress *= 1.0f - present_progress;
+        
+        float half_size = (folded_size / 2.0f) + (_icon_size / 2.0f - folded_size / 2.0f) * (1.0f - folding_progress);
+        
+        float icon_hide_offset = autohide_offset;
+        
+        if (icon->PresentUrgency () == 1)
+          icon_hide_offset *= 0.5f + 0.5f * (1.0f - present_progress);
+        else if (icon->PresentUrgency () >= 2)
+          icon_hide_offset *= 1.0f - present_progress;
+        
+        // icon is crossing threshold, start folding
+        center.z += folded_z_distance * folding_progress;
+        arg.folding_rads = animation_neg_rads * folding_progress;
+        
+        center.y += half_size * size_modifier;   // move to center
+        arg.center = nux::Point3 (center.x + icon_hide_offset, center.y, center.z);       // copy center
+        icon->SetCenter (nux::Point3 (center.x, center.y + vertical_offset, center.z));
+        center.y += half_size * size_modifier;   // move to end
+        
+        float spacing_overlap = CLAMP ((float) (center.y + (_space_between_icons * size_modifier) - folding_threshold) / (float) _icon_size, 0.0f, 1.0f);
+        //add spacing
+        center.y += (_space_between_icons * (1.0f - spacing_overlap) + folded_spacing * spacing_overlap) * size_modifier;
+        
+        launcher_args.push_back (arg);
     }
 }
 
@@ -909,9 +922,6 @@
     
     _enter_y = (int) _mouse_position.y;
     
-    if (_last_shelf_area.y - _enter_y < 5 && _last_shelf_area.y - _enter_y >= 0)
-        _enter_y = _last_shelf_area.y - 5;
-    
     _hovered = true;
     SetTimeStruct (&_enter_time, &_exit_time, ANIM_DURATION);
 }
@@ -969,7 +979,7 @@
 
 void Launcher::OnOrderChanged ()
 {
-
+    EnsureAnimation ();
 }
 
 void Launcher::SetModel (LauncherModel *model)
@@ -997,14 +1007,88 @@
 
 }
 
+void Launcher::RenderIndicators (nux::GraphicsEngine& GfxContext, 
+                                 RenderArg arg, 
+                                 int running, 
+                                 int active, 
+                                 nux::Geometry geo)
+{
+  int markerCenter = (int) arg.center.y;
+  
+  if (running > 0)
+  {
+    if (!m_RunningIndicator)
+    {
+      GdkPixbuf *pbuf = gdk_pixbuf_new_from_file (PKGDATADIR"/running_indicator.png", NULL);
+      m_RunningIndicator = nux::CreateTextureFromPixbuf (pbuf);
+      g_object_unref (pbuf);
+    }
+    nux::TexCoordXForm texxform;
+    
+    nux::Color color = nux::Color::White;
+    
+    if (arg.running_colored)
+      color = nux::Color::SkyBlue;
+    
+    std::vector<int> markers;
+    if (running == 1)
+    {
+      markers.push_back (markerCenter);
+    }
+    else if (running == 2)
+    {
+      markers.push_back (markerCenter - 2);
+      markers.push_back (markerCenter + 2);
+    }
+    else
+    {
+      markers.push_back (markerCenter - 4);
+      markers.push_back (markerCenter);
+      markers.push_back (markerCenter + 4);
+    }
+    
+    std::vector<int>::iterator it;
+    for (it = markers.begin (); it != markers.end (); it++)
+    {
+      int center = *it;
+      GfxContext.QRP_GLSL_1Tex (geo.x,
+                                center - (m_RunningIndicator->GetHeight () / 2), 
+                                (float) m_RunningIndicator->GetWidth(), 
+                                (float) m_RunningIndicator->GetHeight(), 
+                                m_RunningIndicator->GetDeviceTexture(), 
+                                texxform, 
+                                color);
+    }
+  }
+  
+  if (active > 0)
+  {
+    if (!m_ActiveIndicator)
+    {
+      GdkPixbuf *pbuf = gdk_pixbuf_new_from_file (PKGDATADIR"/focused_indicator.png", NULL);
+      m_ActiveIndicator = nux::CreateTextureFromPixbuf (pbuf);
+      g_object_unref (pbuf);
+    }
+    nux::TexCoordXForm texxform;
+    
+    nux::Color color = nux::Color::White;
+    GfxContext.QRP_GLSL_1Tex ((geo.x + geo.width) - m_ActiveIndicator->GetWidth (), 
+                              markerCenter - (m_ActiveIndicator->GetHeight () / 2),
+                              (float) m_ActiveIndicator->GetWidth(), 
+                              (float) m_ActiveIndicator->GetHeight(), 
+                              m_ActiveIndicator->GetDeviceTexture(), 
+                              texxform, 
+                              color);
+  }
+}
+
 void Launcher::RenderIcon(nux::GraphicsEngine& GfxContext, 
                           RenderArg arg, 
                           nux::BaseTexture *icon, 
                           nux::Color bkg_color, 
                           float alpha, 
                           nux::Vector4 xform_coords[], 
-                          nux::Geometry geo,
-                          bool render_indicators)
+                          nux::Geometry geo)
 {
   nux::Matrix4 ObjectMatrix;
   nux::Matrix4 ViewMatrix;
@@ -1151,30 +1235,6 @@
   {
     _AsmShaderProg->End();
   }
-  
-  int markerCenter = (v1.y + v0.y) / 2;
-  
-  if (arg.running_arrow && render_indicators)
-  {
-    if (!m_RunningIndicator)
-    {
-      GdkPixbuf *pbuf = gdk_pixbuf_new_from_file (PKGDATADIR"/running_indicator.png", NULL);
-      m_RunningIndicator = nux::CreateTextureFromPixbuf (pbuf);
-      g_object_unref (pbuf);
-    }
-    gPainter.Draw2DTexture (GfxContext, m_RunningIndicator, geo.x, markerCenter - (m_ActiveIndicator->GetHeight () / 2));
-  }
-  
-  if (arg.active_arrow && render_indicators)
-  {
-    if (!m_ActiveIndicator)
-    {
-      GdkPixbuf *pbuf = gdk_pixbuf_new_from_file (PKGDATADIR"/focused_indicator.png", NULL);
-      m_ActiveIndicator = nux::CreateTextureFromPixbuf (pbuf);
-      g_object_unref (pbuf);
-    }
-    gPainter.Draw2DTexture (GfxContext, m_ActiveIndicator, (geo.x + geo.width) - m_ActiveIndicator->GetWidth (), markerCenter - (m_ActiveIndicator->GetHeight () / 2));
-  }
 }
 
 void Launcher::DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg arg, nux::Geometry geo)
@@ -1195,8 +1255,7 @@
                nux::Color(0xAAFFFFFF), 
                1.0f - arg.backlight_intensity, 
                arg.icon->_xform_coords["Tile"], 
-               geo,
-               false);
+               geo);
   }
   
   if (arg.backlight_intensity > 0.0f)
@@ -1207,8 +1266,7 @@
                arg.icon->BackgroundColor (), 
                arg.backlight_intensity, 
                arg.icon->_xform_coords["Tile"], 
-               geo,
-               false);
+               geo);
   }
   
   GfxContext.GetRenderStates ().SetSeparateBlend (true,
@@ -1224,8 +1282,7 @@
               nux::Color::White,
               arg.alpha,
               arg.icon->_xform_coords["Image"],
-              geo,
-              true);
+              geo);
   
   if (arg.backlight_intensity > 0.0f)
   {
@@ -1235,42 +1292,41 @@
                nux::Color::White, 
                arg.backlight_intensity, 
                arg.icon->_xform_coords["Tile"], 
-               geo,
-               false);
+               geo);
   }
   
-  switch (arg.window_indicators)
+  if (false)
   {
-    case 2:
-      RenderIcon(GfxContext, 
-                 arg, 
-                 _icon_2indicator, 
-                 nux::Color::White, 
-                 1.0f, 
-                 arg.icon->_xform_coords["Tile"], 
-                 geo,
-                 false);
-      break;
-    case 3:
-      RenderIcon(GfxContext, 
-                  arg, 
-                  _icon_3indicator, 
-                  nux::Color::White, 
-                  1.0f, 
-                  arg.icon->_xform_coords["Tile"], 
-                  geo,
-                  false);
-      break;
-    case 4:
-      RenderIcon(GfxContext, 
-                 arg, 
-                 _icon_4indicator, 
-                 nux::Color::White, 
-                 1.0f, 
-                 arg.icon->_xform_coords["Tile"], 
-                 geo,
-                 false);
-      break;
+    switch (arg.window_indicators)
+    {
+      case 2:
+        RenderIcon(GfxContext, 
+                   arg, 
+                   _icon_2indicator, 
+                   nux::Color::White, 
+                   1.0f, 
+                   arg.icon->_xform_coords["Tile"], 
+                   geo);
+        break;
+      case 3:
+        RenderIcon(GfxContext, 
+                    arg, 
+                    _icon_3indicator, 
+                    nux::Color::White, 
+                    1.0f, 
+                    arg.icon->_xform_coords["Tile"], 
+                    geo);
+        break;
+      case 4:
+        RenderIcon(GfxContext, 
+                   arg, 
+                   _icon_4indicator, 
+                   nux::Color::White, 
+                   1.0f, 
+                   arg.icon->_xform_coords["Tile"], 
+                   geo);
+        break;
+    }
   }
   
   if (arg.glow_intensity > 0.0f)
@@ -1281,8 +1337,7 @@
                arg.icon->GlowColor (), 
                arg.glow_intensity, 
                arg.icon->_xform_coords["Glow"], 
-               geo,
-               false);
+               geo);
   }
   
   if (arg.shimmer_progress > 0.0f && arg.shimmer_progress < 1.0f)
@@ -1303,11 +1358,16 @@
                arg.icon->GlowColor (), 
                fade_out, 
                arg.icon->_xform_coords["Glow"], 
-               geo,
-               false);
+               geo);
     
     GfxContext.PopClippingRectangle();
   }
+  
+  RenderIndicators (GfxContext,
+                    arg, 
+                    arg.running_arrow ? arg.window_indicators : 0, 
+                    arg.active_arrow ? 1 : 0, 
+                    geo);
 }
 
 void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -1315,17 +1375,16 @@
     nux::Geometry base = GetGeometry();
     GfxContext.PushClippingRectangle(base);
     nux::Geometry bkg_box;
-    nux::Geometry shelf_box;
     std::list<Launcher::RenderArg> args;
-    std::list<Launcher::RenderArg> shelf_args; 
+    std::list<Launcher::RenderArg>::reverse_iterator rev_it;
+    std::list<Launcher::RenderArg>::iterator it;
     
     nux::ROPConfig ROP;
     ROP.Blend = false;
     ROP.SrcBlend = GL_SRC_ALPHA;
     ROP.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
-    RenderArgs (args, shelf_args, bkg_box, shelf_box);
-    _last_shelf_area = shelf_box;
+    RenderArgs (args, bkg_box);
 
     // clear region    
     gPainter.PushDrawColorLayer(GfxContext, base, nux::Color(0x00000000), true, ROP);
@@ -1341,11 +1400,9 @@
     gPainter.Paint2DQuadColor (GfxContext, bkg_box, nux::Color(0xAA000000));
     
     UpdateIconXForm (args);
-    UpdateIconXForm (shelf_args);
     EventLogic ();
-    
-    /* drag launcher */
-    std::list<Launcher::RenderArg>::reverse_iterator rev_it;
+
+    /* draw launcher */
     for (rev_it = args.rbegin (); rev_it != args.rend (); rev_it++)
     {
       if ((*rev_it).folding_rads >= 0.0f || (*rev_it).skip)
@@ -1354,7 +1411,6 @@
       DrawRenderArg (GfxContext, *rev_it, bkg_box);
     }
 
-    std::list<Launcher::RenderArg>::iterator it;
     for (it = args.begin(); it != args.end(); it++)
     {
       if ((*it).folding_rads < 0.0f || (*it).skip)
@@ -1363,22 +1419,6 @@
       DrawRenderArg (GfxContext, *it, bkg_box);
     }
     
-    /* draw shelf */
-    nux::Color shelf_color = nux::Color (0xCC000000);
-    nux::Color shelf_zero = nux::Color (0x00000000);
-    int shelf_shadow_height = 35;
-    
-    nux::Geometry shelf_shadow = nux::Geometry (shelf_box.x, shelf_box.y - shelf_shadow_height, shelf_box.width, shelf_shadow_height);
-    gPainter.Paint2DQuadColor (GfxContext, shelf_shadow, shelf_zero, shelf_color, shelf_color, shelf_zero);
-    gPainter.Paint2DQuadColor (GfxContext, shelf_box, shelf_color);
-
-    for (it = shelf_args.begin(); it != shelf_args.end(); it++)
-    {
-      if ((*it).skip)
-        continue;
-      
-      DrawRenderArg (GfxContext, *it, bkg_box);
-    }
     
     gPainter.Paint2DQuadColor (GfxContext, nux::Geometry (bkg_box.x + bkg_box.width - 1, bkg_box.y, 1, bkg_box.height), nux::Color(0x60FFFFFF));
 
@@ -1487,8 +1527,7 @@
   _mouse_position = nux::Point2 (x, y);
   _mouse_inside_launcher = true;
   
-  if (!_last_shelf_area.IsInside (nux::Point (x, y)))
-      SetHover ();
+  SetHover ();
 
   EventLogic ();
   EnsureAnimation ();
@@ -1510,13 +1549,7 @@
 {
   _mouse_position = nux::Point2 (x, y);
 
-  if (!_last_shelf_area.IsInside (nux::Point (x, y)))
-  {
-      SetHover ();
-      EnsureAnimation ();
-  }
   // Every time the mouse moves, we check if it is inside an icon...
-
   EventLogic ();
 }
 
@@ -1595,22 +1628,6 @@
   nux::Point2 mouse_position(x, y);
   int inside = 0;
 
-  for (it = _model->shelf_begin(); it != _model->shelf_end (); it++)
-  {
-    if (!(*it)->GetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE))
-      continue;
-
-    nux::Point2 screen_coord [4];
-    for (int i = 0; i < 4; i++)
-    {
-      screen_coord [i].x = (*it)->_xform_coords["HitArea"] [i].x;
-      screen_coord [i].y = (*it)->_xform_coords["HitArea"] [i].y;
-    }
-    inside = PointInside2DPolygon (screen_coord, 4, mouse_position, 1);
-    if (inside)
-      return (*it);
-  }
-
   // Because of the way icons fold and stack on one another, we must proceed in 2 steps.
   for (rev_it = _model->rbegin (); rev_it != _model->rend (); rev_it++)
   {

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2010-12-02 15:56:08 +0000
+++ src/Launcher.h	2010-12-04 21:47:02 +0000
@@ -103,7 +103,9 @@
     float         glow_intensity;
     float         shimmer_progress;
     bool          running_arrow;
+    bool          running_colored;
     bool          active_arrow;
+    bool          active_colored;
     bool          skip;
     int           window_indicators;
   } RenderArg;
@@ -115,34 +117,33 @@
   void OnTriggerMouseEnter (int x, int y, unsigned long button_flags, unsigned long key_flags);
   void OnTriggerMouseLeave (int x, int y, unsigned long button_flags, unsigned long key_flags);
   
-  bool IconNeedsAnimation  (LauncherIcon *icon, struct timespec current);
+  bool IconNeedsAnimation  (LauncherIcon *icon, struct timespec const &current);
   bool AnimationInProgress ();
   void SetTimeStruct       (struct timespec *timer, struct timespec *sister = 0, int sister_relation = 0);
   
   void EnsureAnimation    ();
   void SetupAutohideTimer ();
   
-  float DnDExitProgress  ();
-  float GetHoverProgress ();
-  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);
+  float DnDExitProgress  (struct timespec const &current);
+  float GetHoverProgress (struct timespec const &current);
+  float AutohideProgress (struct timespec const &current);
+  float IconPresentProgress     (LauncherIcon *icon, struct timespec const &current);
+  float IconUrgentProgress      (LauncherIcon *icon, struct timespec const &current);
+  float IconShimmerProgress     (LauncherIcon *icon, struct timespec const &current);
+  float IconUrgentPulseValue    (LauncherIcon *icon, struct timespec const &current);
+  float IconStartingPulseValue  (LauncherIcon *icon, struct timespec const &current);
+  float IconBackgroundIntensity (LauncherIcon *icon, struct timespec const &current);
 
   void SetHover   ();
   void UnsetHover ();
   void SetHidden  (bool hidden);
   
-  void SetDndDelta (float x, float y, nux::Geometry geo, struct timespec current);
+  void SetDndDelta (float x, float y, nux::Geometry geo, struct timespec const &current);
   int  DragLimiter (int x);
   
-  void SetupRenderArg (LauncherIcon *icon, struct timespec current, RenderArg &arg);
+  void SetupRenderArg (LauncherIcon *icon, struct timespec const &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);
+                   nux::Geometry &box_geo);
 
   void DrawRenderArg (nux::GraphicsEngine& GfxContext, RenderArg arg, nux::Geometry geo);
 
@@ -152,14 +153,19 @@
 
   void OnIconNeedsRedraw (void *icon);
 
+  void RenderIndicators (nux::GraphicsEngine& GfxContext,
+                         RenderArg arg, 
+                         int running, 
+                         int active, 
+                         nux::Geometry geo);
+                         
   void RenderIcon (nux::GraphicsEngine& GfxContext, 
                    RenderArg arg, 
                    nux::BaseTexture *icon, 
                    nux::Color bkg_color, 
                    float alpha, 
                    nux::Vector4 xform_coords[], 
-                   nux::Geometry geo,
-                   bool render_indicators);
+                   nux::Geometry geo);
                 
   void SetIconXForm (LauncherIcon *icon, nux::Matrix4 ViewProjectionMatrix, nux::Geometry geo, 
                      float x, float y, float w, float h, float z, std::string name);   
@@ -231,7 +237,6 @@
   nux::AbstractPaintLayer* m_BackgroundLayer;
   nux::BaseWindow* _parent;
   nux::View* _autohide_trigger;
-  nux::Geometry _last_shelf_area;
   LauncherModel* _model;
   
   /* event times */

=== modified file 'src/LauncherModel.cpp'
--- src/LauncherModel.cpp	2010-11-24 18:59:55 +0000
+++ src/LauncherModel.cpp	2010-12-04 21:47:02 +0000
@@ -39,6 +39,20 @@
   return icon->Type () == LAUNCHER_ICON_TYPE_TRASH; 
 }
 
+void
+LauncherModel::Populate ()
+{
+  _inner.clear ();
+  
+  iterator it;
+  
+  for (it = main_begin (); it != main_end (); it++)
+    _inner.push_back (*it);
+  
+  for (it = shelf_begin (); it != shelf_end (); it++)
+    _inner.push_back (*it);
+}
+
 void 
 LauncherModel::AddIcon (LauncherIcon *icon)
 {
@@ -47,8 +61,10 @@
   if (IconShouldShelf (icon))
     _inner_shelf.push_front (icon);
   else
-    _inner_launcher.push_front (icon);
-    
+    _inner_main.push_front (icon);
+  
+  Populate ();
+  
   icon_added.emit (icon);
   icon->remove.connect (sigc::mem_fun (this, &LauncherModel::OnIconRemove));
 }
@@ -58,16 +74,13 @@
 {
   size_t size;
   
-  size = _inner_shelf.size ();
   _inner_shelf.remove (icon);
-
-  if (size != _inner_shelf.size ())
-    icon_removed.emit (icon);
+  _inner_main.remove (icon);
   
-  size = _inner_launcher.size ();
-  _inner_launcher.remove (icon);
+  size = _inner.size ();
+  _inner.remove (icon);
 
-  if (size != _inner_launcher.size ())
+  if (size != _inner.size ())
     icon_removed.emit (icon);
   
   icon->UnReference ();
@@ -97,38 +110,64 @@
 void 
 LauncherModel::Sort (SortFunc func)
 {
-  _inner_launcher.sort (func);
-  _inner_shelf.sort (func);
+  _inner.sort (func);
+  _inner_main.sort (func);
+  
+  Populate ();
 }
 
 int
 LauncherModel::Size ()
 {
-  return _inner_shelf.size () + _inner_launcher.size ();
+  return _inner.size ();
 }
     
 LauncherModel::iterator 
 LauncherModel::begin ()
 {
-  return _inner_launcher.begin ();
+  return _inner.begin ();
 }
 
 LauncherModel::iterator 
 LauncherModel::end ()
 {
-  return _inner_launcher.end ();
+  return _inner.end ();
 }
 
 LauncherModel::reverse_iterator 
 LauncherModel::rbegin ()
 {
-  return _inner_launcher.rbegin ();
+  return _inner.rbegin ();
 }
 
 LauncherModel::reverse_iterator 
 LauncherModel::rend ()
 {
-  return _inner_launcher.rend ();
+  return _inner.rend ();
+}
+
+LauncherModel::iterator 
+LauncherModel::main_begin ()
+{
+  return _inner_main.begin ();
+}
+
+LauncherModel::iterator 
+LauncherModel::main_end ()
+{
+  return _inner_main.end ();
+}
+
+LauncherModel::reverse_iterator 
+LauncherModel::main_rbegin ()
+{
+  return _inner_main.rbegin ();
+}
+
+LauncherModel::reverse_iterator 
+LauncherModel::main_rend ()
+{
+  return _inner_main.rend ();
 }
 
 LauncherModel::iterator 

=== modified file 'src/LauncherModel.h'
--- src/LauncherModel.h	2010-11-16 00:25:17 +0000
+++ src/LauncherModel.h	2010-12-04 21:47:02 +0000
@@ -47,6 +47,11 @@
     reverse_iterator rbegin ();
     reverse_iterator rend ();
     
+    iterator main_begin ();
+    iterator main_end ();
+    reverse_iterator main_rbegin ();
+    reverse_iterator main_rend ();
+    
     iterator shelf_begin ();
     iterator shelf_end ();
     reverse_iterator shelf_rbegin ();
@@ -57,8 +62,11 @@
     sigc::signal<void> order_changed;
     
 private:
-    Base _inner_launcher;
+    Base _inner;
     Base _inner_shelf;
+    Base _inner_main;
+    
+    void Populate ();
     
     bool IconShouldShelf (LauncherIcon *icon);
     

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-11-26 09:11:52 +0000
+++ src/unity.cpp	2010-12-04 21:47:02 +0000
@@ -47,52 +47,52 @@
 void
 UnityScreen::nuxPrologue ()
 {
-    /* reset matrices */
-    glPushAttrib (GL_VIEWPORT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT);
-    
-    glMatrixMode (GL_PROJECTION);
-    glPushMatrix ();
-    
-    glMatrixMode (GL_MODELVIEW);
-    glPushMatrix ();
-
-    glGetError();
+  /* reset matrices */
+  glPushAttrib (GL_VIEWPORT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT);
+
+  glMatrixMode (GL_PROJECTION);
+  glPushMatrix ();
+
+  glMatrixMode (GL_MODELVIEW);
+  glPushMatrix ();
+
+  glGetError();
 }
 
 void
 UnityScreen::nuxEpilogue ()
 {
-    (*GL::bindFramebuffer) (GL_FRAMEBUFFER_EXT, 0);
-
-    glMatrixMode (GL_PROJECTION);
-    glLoadIdentity ();
-    glMatrixMode (GL_MODELVIEW);
-    glLoadIdentity ();
-    glDepthRange (0, 1);
-    glViewport (-1, -1, 2, 2);
-    glRasterPos2f (0, 0);
-
-    gScreen->resetRasterPos ();
-
-    glMatrixMode (GL_PROJECTION);
-    glPopMatrix ();
-    glMatrixMode (GL_MODELVIEW);
-    glPopMatrix ();
-
-    glDrawBuffer (GL_BACK);
-    glReadBuffer (GL_BACK);
-
-    glPopAttrib ();
+  (*GL::bindFramebuffer) (GL_FRAMEBUFFER_EXT, 0);
+
+  glMatrixMode (GL_PROJECTION);
+  glLoadIdentity ();
+  glMatrixMode (GL_MODELVIEW);
+  glLoadIdentity ();
+  glDepthRange (0, 1);
+  glViewport (-1, -1, 2, 2);
+  glRasterPos2f (0, 0);
+
+  gScreen->resetRasterPos ();
+
+  glMatrixMode (GL_PROJECTION);
+  glPopMatrix ();
+  glMatrixMode (GL_MODELVIEW);
+  glPopMatrix ();
+
+  glDrawBuffer (GL_BACK);
+  glReadBuffer (GL_BACK);
+
+  glPopAttrib ();
 }
 
 void
 UnityScreen::paintDisplay (const CompRegion &region)
 {
-    nuxPrologue ();
-    wt->RenderInterfaceFromForeignCmd ();
-    nuxEpilogue ();
+  nuxPrologue ();
+  wt->RenderInterfaceFromForeignCmd ();
+  nuxEpilogue ();
 
-    doShellRepaint = false;
+  doShellRepaint = false;
 }
 
 /* called whenever we need to repaint parts of the screen */
@@ -103,18 +103,18 @@
 			    CompOutput 			*output,
 			    unsigned int		mask)
 {
-    bool ret;
-
-    doShellRepaint = true;
-    allowWindowPaint = true;
-
-    /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
-    ret = gScreen->glPaintOutput (attrib, transform, region, output, mask);
-
-    if (doShellRepaint)
-	paintDisplay (region);
-
-    return ret;
+  bool ret;
+
+  doShellRepaint = true;
+  allowWindowPaint = true;
+  
+  /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
+  ret = gScreen->glPaintOutput (attrib, transform, region, output, mask);
+
+  if (doShellRepaint)
+    paintDisplay (region);
+
+  return ret;
 }
 
 /* called whenever a plugin needs to paint the entire scene
@@ -127,96 +127,96 @@
 			      	       CompOutput 		 *output,
 			      	       unsigned int		 mask)
 {
-    allowWindowPaint = false;
-    gScreen->glPaintOutput (attrib, transform, region, output, mask);
+  allowWindowPaint = false;
+  gScreen->glPaintOutput (attrib, transform, region, output, mask);
 }
 
 /* Grab changed nux regions and add damage rects for them */
 void
 UnityScreen::damageNuxRegions ()
 {
-    CompRegion region;
-    std::vector<nux::Geometry>::iterator it;
-    std::vector<nux::Geometry> dirty = wt->GetDrawList ();
-    nux::Geometry geo;
-	    
-    for (it = dirty.begin (); it != dirty.end (); it++)
-    {
-       	geo = *it;
-      	cScreen->damageRegion (CompRegion (geo.x, geo.y, geo.width, geo.height));
-    }
-	    
-    geo = wt->GetWindowCompositor ().GetTooltipMainWindowGeometry();
+  CompRegion region;
+  std::vector<nux::Geometry>::iterator it;
+  std::vector<nux::Geometry> dirty = wt->GetDrawList ();
+  nux::Geometry geo;
+  
+  for (it = dirty.begin (); it != dirty.end (); it++)
+  {
+    geo = *it;
     cScreen->damageRegion (CompRegion (geo.x, geo.y, geo.width, geo.height));
-    cScreen->damageRegion (CompRegion (lastTooltipArea.x, lastTooltipArea.y, lastTooltipArea.width, lastTooltipArea.height));
-	    
-    lastTooltipArea = geo;
-    
-    wt->ClearDrawList ();
+  }
+    
+  geo = wt->GetWindowCompositor ().GetTooltipMainWindowGeometry();
+  cScreen->damageRegion (CompRegion (geo.x, geo.y, geo.width, geo.height));
+  cScreen->damageRegion (CompRegion (lastTooltipArea.x, lastTooltipArea.y, lastTooltipArea.width, lastTooltipArea.height));
+    
+  lastTooltipArea = geo;
+
+  wt->ClearDrawList ();
 }
 
 /* handle X Events */
 void
 UnityScreen::handleEvent (XEvent *event)
 {
-    screen->handleEvent (event);
+  screen->handleEvent (event);
 
-    if (screen->otherGrabExist ("deco", "move", NULL))
-    {
-	wt->ProcessForeignEvent (event, NULL);
-    }
+  if (screen->otherGrabExist ("deco", "move", NULL))
+  {
+    wt->ProcessForeignEvent (event, NULL);
+  }
 }			
 
 
 gboolean
 UnityScreen::initPluginActions (gpointer data)
 {
-    CompPlugin *p;
-
-    p = CompPlugin::find ("expo");
-
-    if (p)
-    {
-	foreach (CompOption &option, p->vTable->getOptions ())
-	{
-	    if (option.name () == "expo_key")
-	    {
-		CompAction *action = &option.value ().action ();
-		PluginAdapter::Default ()->SetExpoAction (action);
-		break;
-	    }
-	}
-    }
-
-    p = CompPlugin::find ("scale");
-
-    if (p)
-    {
-	foreach (CompOption &option, p->vTable->getOptions ())
-	{
-	    if (option.name () == "initiate_all_key")
-	    {
-		CompAction *action = &option.value ().action ();
-		PluginAdapter::Default ()->SetScaleAction (action);
-		break;
-	    }
-	}
-    }
-
-    return FALSE;
+  CompPlugin *p;
+
+  p = CompPlugin::find ("expo");
+
+  if (p)
+  {
+    foreach (CompOption &option, p->vTable->getOptions ())
+    {
+      if (option.name () == "expo_key")
+      {
+        CompAction *action = &option.value ().action ();
+        PluginAdapter::Default ()->SetExpoAction (action);
+        break;
+      }
+    }
+  }
+
+  p = CompPlugin::find ("scale");
+
+  if (p)
+  {
+    foreach (CompOption &option, p->vTable->getOptions ())
+    {
+      if (option.name () == "initiate_all_key")
+      {
+        CompAction *action = &option.value ().action ();
+        PluginAdapter::Default ()->SetScaleAction (action);
+        break;
+      }
+    }
+  }
+
+  return FALSE;
 }
 
 /* Set up expo and scale actions on the launcher */
 bool
 UnityScreen::initPluginForScreen (CompPlugin *p)
 {
-    if (p->vTable->name () == "expo" ||
-	p->vTable->name () == "scale")
-    {
-        initPluginActions ((void *) this);
-    }
+  if (p->vTable->name () == "expo" ||
+      p->vTable->name () == "scale")
+  {
+    initPluginActions ((void *) this);
+  }
 
-    return screen->initPluginForScreen (p);
+  return screen->initPluginForScreen (p);
 }
 
 void
@@ -227,7 +227,7 @@
 const gchar*
 UnityScreen::GetName ()
 {
-    return "Unity";
+  return "Unity";
 }
 
 const CompWindowList &
@@ -264,57 +264,57 @@
 		     const CompRegion 	&region,
 		     unsigned int	mask)
 {
-    if (uScreen->doShellRepaint && uScreen->allowWindowPaint)
+  if (uScreen->doShellRepaint && uScreen->allowWindowPaint)
+  {
+    const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
+
+    for (CompWindow *w = window; w && uScreen->doShellRepaint; w = w->prev)
     {
-	const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
-
-	for (CompWindow *w = window; w && uScreen->doShellRepaint; w = w->prev)
-	{
-	    if (std::find (xwns.begin (), xwns.end (), w->id ()) != xwns.end ())
-	    {
-		uScreen->paintDisplay (region);
-	    }
-	}
+      if (std::find (xwns.begin (), xwns.end (), w->id ()) != xwns.end ())
+      {
+        uScreen->paintDisplay (region);
+      }
     }
-
-    bool ret = gWindow->glDraw (matrix, attrib, region, mask);
-    
-    return ret;
+  }
+
+  bool ret = gWindow->glDraw (matrix, attrib, region, mask);
+
+  return ret;
 }
 
 /* Called whenever a window is mapped, unmapped, minimized etc */
 void
 UnityWindow::windowNotify (CompWindowNotify n)
 {
-    if (n == CompWindowNotifyMinimize)
-        uScreen->controller->PresentIconOwningWindow (window->id ());
+  if (n == CompWindowNotifyMinimize)
+    uScreen->controller->PresentIconOwningWindow (window->id ());
 
-    window->windowNotify (n);
+  window->windowNotify (n);
 }
 
 /* Configure callback for the launcher window */
 void 
 UnityScreen::launcherWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void *user_data)
 {
-    int OurWindowHeight = WindowHeight - 24;
-    geo = nux::Geometry(0, 24, geo.width, OurWindowHeight);
+  int OurWindowHeight = WindowHeight - 24;
+  geo = nux::Geometry(0, 24, geo.width, OurWindowHeight);
 }
 
 /* Configure callback for the panel window */
 void 
 UnityScreen::panelWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void *user_data)
 {
-    geo = nux::Geometry(0, 0, WindowWidth, 24);
+  geo = nux::Geometry(0, 0, WindowWidth, 24);
 }
 
 /* Start up nux after OpenGL is initialized */
 void 
 UnityScreen::initUnity(nux::NThread* thread, void* InitData)
 {
-    initLauncher(thread, InitData);
-      
-    nux::ColorLayer background(nux::Color(0x00000000));
-    static_cast<nux::WindowThread*>(thread)->SetWindowBackgroundPaintLayer(&background);
+  initLauncher(thread, InitData);
+    
+  nux::ColorLayer background(nux::Color(0x00000000));
+  static_cast<nux::WindowThread*>(thread)->SetWindowBackgroundPaintLayer(&background);
 }
 
 void 
@@ -328,18 +328,18 @@
 UnityScreen::optionChanged (CompOption            *opt,
 			    UnityshellOptions::Options num)
 {
-    switch (num)
-    {
-        case UnityshellOptions::LauncherAutohide:
-	          launcher->SetAutohide (optionGetLauncherAutohide (),
-                                   (nux::View *) panelView->HomeButton ());
-            break;
-        case UnityshellOptions::LauncherFloat:
-            launcher->SetFloating (optionGetLauncherFloat ());
-	          break;
-        default:
-            break;
-    }
+  switch (num)
+  {
+    case UnityshellOptions::LauncherAutohide:
+      launcher->SetAutohide (optionGetLauncherAutohide (),
+                             (nux::View *) panelView->HomeButton ());
+      break;
+    case UnityshellOptions::LauncherFloat:
+      launcher->SetFloating (optionGetLauncherFloat ());
+      break;
+    default:
+      break;
+  }
 }
 
 UnityScreen::UnityScreen (CompScreen *screen) :
@@ -349,41 +349,41 @@
     gScreen (GLScreen::get (screen)),
     doShellRepaint (false)
 {
-    int (*old_handler) (Display *, XErrorEvent *);
-    old_handler = XSetErrorHandler (NULL);
-    
-    g_thread_init (NULL);
-    dbus_g_thread_init ();
-    gtk_init (NULL, NULL);
-    
-    XSetErrorHandler (old_handler);
-
-    /* Wrap compiz interfaces */
-    ScreenInterface::setHandler (screen);
-    CompositeScreenInterface::setHandler (cScreen);
-    GLScreenInterface::setHandler (gScreen);
-    
-    StartupNotifyService::Default ()->SetSnDisplay (screen->snDisplay (), screen->screenNum ());
-
-    nux::NuxInitialize (0);
-    wt = nux::CreateFromForeignWindow (cScreen->output (), 
-                                       glXGetCurrentContext (),	
-                                       &UnityScreen::initUnity,
-                                       this);
-    
-    wt->RedrawRequested.connect (sigc::mem_fun (this, &UnityScreen::onRedrawRequested));
-    
-    wt->Run (NULL);
-    uScreen = this;
-
-    debugger = new IntrospectionDBusInterface (this);
-	
-    PluginAdapter::Initialize (screen);
-
-    optionSetLauncherAutohideNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
-    optionSetLauncherFloatNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
-
-    g_timeout_add (0, &UnityScreen::initPluginActions, this);
+  int (*old_handler) (Display *, XErrorEvent *);
+  old_handler = XSetErrorHandler (NULL);
+  
+  g_thread_init (NULL);
+  dbus_g_thread_init ();
+  gtk_init (NULL, NULL);
+  
+  XSetErrorHandler (old_handler);
+
+  /* Wrap compiz interfaces */
+  ScreenInterface::setHandler (screen);
+  CompositeScreenInterface::setHandler (cScreen);
+  GLScreenInterface::setHandler (gScreen);
+  
+  StartupNotifyService::Default ()->SetSnDisplay (screen->snDisplay (), screen->screenNum ());
+
+  nux::NuxInitialize (0);
+  wt = nux::CreateFromForeignWindow (cScreen->output (), 
+                                     glXGetCurrentContext (),	
+                                     &UnityScreen::initUnity,
+                                     this);
+  
+  wt->RedrawRequested.connect (sigc::mem_fun (this, &UnityScreen::onRedrawRequested));
+  
+  wt->Run (NULL);
+  uScreen = this;
+
+  debugger = new IntrospectionDBusInterface (this);
+
+  PluginAdapter::Initialize (screen);
+
+  optionSetLauncherAutohideNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
+  optionSetLauncherFloatNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
+
+  g_timeout_add (0, &UnityScreen::initPluginActions, this);
 }
 
 UnityScreen::~UnityScreen ()
@@ -393,18 +393,18 @@
 /* Can't create windows until after we have initialized everything */
 gboolean UnityScreen::strutHackTimeout (gpointer data)
 {
-    UnityScreen *self = (UnityScreen*) data;  
-    
-    if (!self->launcher->AutohideEnabled ())
-    {
-        self->launcherWindow->InputWindowEnableStruts(false);
-        self->launcherWindow->InputWindowEnableStruts(true);
-    }
-    
-    self->panelWindow->InputWindowEnableStruts(false);
-    self->panelWindow->InputWindowEnableStruts(true);
-    
-    return FALSE;
+  UnityScreen *self = (UnityScreen*) data;  
+  
+  if (!self->launcher->AutohideEnabled ())
+  {
+    self->launcherWindow->InputWindowEnableStruts(false);
+    self->launcherWindow->InputWindowEnableStruts(true);
+  }
+  
+  self->panelWindow->InputWindowEnableStruts(false);
+  self->panelWindow->InputWindowEnableStruts(true);
+  
+  return FALSE;
 }
 
 /* Start up the launcher */
@@ -466,8 +466,8 @@
     window (window),
     gWindow (GLWindow::get (window))
 {
-    WindowInterface::setHandler (window);
-    GLWindowInterface::setHandler (gWindow);
+  WindowInterface::setHandler (window);
+  GLWindowInterface::setHandler (gWindow);
 }
 
 UnityWindow::~UnityWindow ()
@@ -478,13 +478,13 @@
 bool
 UnityPluginVTable::init ()
 {
-    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
-	 return false;
-    if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
-	 return false;
-    if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
-	 return false;
+  if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
+    return false;
+  if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI))
+    return false;
+  if (!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
+    return false;
 
-    return true;
+  return true;
 }
 

=== modified file 'src/unity.h'
--- src/unity.h	2010-11-26 09:11:52 +0000
+++ src/unity.h	2010-12-04 21:47:02 +0000
@@ -140,7 +140,8 @@
 
 	/* handle paint order */
 	bool	  doShellRepaint;
-	bool      allowWindowPaint;
+	bool    allowWindowPaint;
+	bool    damaged;
 	CompWindowList _withRemovedNuxWindows;
 
 	friend class UnityWindow;