Merge lp:~albyrock87/awn/awn-lucido into lp:awn/0.4

[Alberto Aldegheri]

This is a rewrite of awn-style-lucido.

Implemented a new style, features:
- Stripe-style
- The number of stripes changes dynamically depends on "expanders"
- If you set stripe-width>0, you can manually set the stripe position and width
- Fixed all-orientation cairo "translate"
- custom curved style if panel is not expanded
- speedup code for draw background only when need (otherwise repaint last surface)

:)

[Alberto Aldegheri (albyrock87)]

WTF!!!

Why BZR removes 'po/avant-window-navigator.pot' if i've never touched that file?????

[Michal Hruby (mhr3)]

> WTF!!!
>
> Why BZR removes 'po/avant-window-navigator.pot' if i've never touched that
> file?????

There's a bug in the build system, make clean removes it, please revert the change.
Also there are a lot of lines which break our coding conventions, I know it might sound trivial, but for the review process it makes it easier to read the code. Fix please.

review: Needs Fixing (coding-conventions)

[Alberto Aldegheri (albyrock87)]

> > WTF!!!
> >
> > Why BZR removes 'po/avant-window-navigator.pot' if i've never touched that
> > file?????
>
> There's a bug in the build system, make clean removes it, please revert the
> change.
> Also there are a lot of lines which break our coding conventions, I know it
> might sound trivial, but for the review process it makes it easier to read the
> code. Fix please.

'po/avant-window-navigator.pot' -> restored from rev 699
Conding style fixes :)
Default Stripe-Width = 0 (enables auto-stripe)

review: Needs Resubmitting

[moonbeam (rcryderman)]

Seems to be leaking:

revision: 707.

After leaving it running 12-24 hours.

mapped: 1539380K writeable/private: 1297488K shared: 816K

[Alberto Aldegheri (albyrock87)]

> Seems to be leaking:
>
> revision: 707.
>
> After leaving it running 12-24 hours.
>
> mapped: 1539380K writeable/private: 1297488K shared: 816K

I'm very sorry for that :'(

Now it's fixed (rev 710) :)

[Michal Hruby (mhr3)]

Thanks for the style fixes. Here are my comments:

1) When using cairo methods, please use doubles directly, don't have the compiler do it ( cairo_scale (cr, 1, -1) => cairo_scale (cr, 1., -1.) )
2) You're using the expander detection quite often, move it to a function (at least the g_object_get() + gtk_container_get_children() )
3) Get rid of "g_list_free (i)", it could cause problems.
4) Since you introduced the helper surface, it'd be nice to integrate it properly into the background base class and have a "cached-drawing" property that will control whether the surface is used (default TRUE). (you'll get an extra point if you provide some statistics on how often is helps)
5) The stripe-width spin is put on a strange place in awn-settings, please try to rearrange it, so that it fits nicely.

review: Needs Fixing (code review)

[Alberto Aldegheri (albyrock87)]

> Thanks for the style fixes. Here are my comments:
>
> 1) When using cairo methods, please use doubles directly, don't have the
> compiler do it ( cairo_scale (cr, 1, -1) => cairo_scale (cr, 1., -1.) )
> 2) You're using the expander detection quite often, move it to a function (at
> least the g_object_get() + gtk_container_get_children() )
> 3) Get rid of "g_list_free (i)", it could cause problems.
> 4) Since you introduced the helper surface, it'd be nice to integrate it
> properly into the background base class and have a "cached-drawing" property
> that will control whether the surface is used (default TRUE). (you'll get an
> extra point if you provide some statistics on how often is helps)
> 5) The stripe-width spin is put on a strange place in awn-settings, please try
> to rearrange it, so that it fits nicely.

I'm working on this.

For now I can tell you that (in lucido style), times are:
- use helper surface: ~0ms
- redraw surface: ~10ms

If you hover an icon and then run away with your mouse with bounce effect, you get about 20 redraw (during animation):
- using helper surface: ~1ms
- not using helper surface: 20*10 = 200ms

Time calculated with:
#include <time.h>

clock_t start, end;
double elapsed;

start = clock();
... /* Do the work. */
end = clock();
elapsed = ((double) (end - start)) / (((double)CLOCKS_PER_SEC) / 1000.0 );

[Alberto Aldegheri (albyrock87)]

> Thanks for the style fixes. Here are my comments:
>
> 1) When using cairo methods, please use doubles directly, don't have the
> compiler do it ( cairo_scale (cr, 1, -1) => cairo_scale (cr, 1., -1.) )
> 2) You're using the expander detection quite often, move it to a function (at
> least the g_object_get() + gtk_container_get_children() )
> 3) Get rid of "g_list_free (i)", it could cause problems.
> 4) Since you introduced the helper surface, it'd be nice to integrate it
> properly into the background base class and have a "cached-drawing" property
> that will control whether the surface is used (default TRUE). (you'll get an
> extra point if you provide some statistics on how often is helps)
> 5) The stripe-width spin is put on a strange place in awn-settings, please try
> to rearrange it, so that it fits nicely.

Ok, What do you think about?

Some statistic? mh..
On any animation's step on every icon, you get background refreshed. (with cache in O(1) time)
The same for any expose event.

However, if you want to see how often is the redraw, you can put a:
fprintf (stderr, "I'm redrawing the bg \n");
on awn-background.c row 701

You will see that the redraw is rare, then the performance gain is very often :)

[Alberto Aldegheri (albyrock87)]

Resubmitting :)

PS: i've checked for mem-leaks this time, and I have not found any mem-leak.

review: Needs Resubmitting

[Michal Hruby (mhr3)]

As a side note, the "Resubmit" is for reviewers when they want you to resubmit the proposal, when you want to resubmit it, there's the "Resubmit proposal" link on top of this page.

1) Please revert the 1210-1220, this should go into background's finalize method.
2) It seems that awn_background_get_needs_redraw (and also the lucido variant) is not necessary to be exposed in the .h files. Please make it a static method and use the virtual klass->get_needs_redraw to call it.
3) Also why is 1190-1192 necessary?

review: Needs Fixing

[Alberto Aldegheri (albyrock87)]

> As a side note, the "Resubmit" is for reviewers when they want you to resubmit
> the proposal, when you want to resubmit it, there's the "Resubmit proposal"
> link on top of this page.
I'm sorry, but I'm new in Lauchpad&Bzr :P

> 1) Please revert the 1210-1220, this should go into background's finalize
> method.
Done :)

> 2) It seems that awn_background_get_needs_redraw (and also the lucido variant)
> is not necessary to be exposed in the .h files. Please make it a static method
> and use the virtual klass->get_needs_redraw to call it.
awn_background_get_needs_redraw needs to be in awn-background.h because it is used in awn-background-lucido.c @ awn_background_lucido_get_needs_redraw.

Moved awn_background_lucido_get_needs_redraw into .c

> 3) Also why is 1190-1192 necessary?
Because when you move panel position from bottom to top, or left to right, width&height doesn't change. So we need to notify background to redraw itself.

[Michal Hruby (mhr3)]

> > 2) It seems that awn_background_get_needs_redraw (and also the lucido
> variant)
> > is not necessary to be exposed in the .h files. Please make it a static
> method
> > and use the virtual klass->get_needs_redraw to call it.
> awn_background_get_needs_redraw needs to be in awn-background.h because it is
> used in awn-background-lucido.c @ awn_background_lucido_get_needs_redraw.

It still doesn't have to be in the .h, you can use >>>
AWN_BACKGROUND_CLASS (awn_background_lucido_parent_class)-> get_needs_redraw ()

> > 3) Also why is 1190-1192 necessary?
> Because when you move panel position from bottom to top, or left to right,
> width&height doesn't change. So we need to notify background to redraw itself.

Ok, but please make a method for it (awn_background_invalidate), the usage of public variables is really unfortunate in the background class.

review: Needs Fixing

[Alberto Aldegheri (albyrock87)]

> > > 2) It seems that awn_background_get_needs_redraw (and also the lucido
> > variant)
> > > is not necessary to be exposed in the .h files. Please make it a static
> > method
> > > and use the virtual klass->get_needs_redraw to call it.
> > awn_background_get_needs_redraw needs to be in awn-background.h because it
> is
> > used in awn-background-lucido.c @ awn_background_lucido_get_needs_redraw.
>
> It still doesn't have to be in the .h, you can use >>>
> AWN_BACKGROUND_CLASS (awn_background_lucido_parent_class)-> get_needs_redraw
> ()

Done, thank you :)

> > > 3) Also why is 1190-1192 necessary?
> > Because when you move panel position from bottom to top, or left to right,
> > width&height doesn't change. So we need to notify background to redraw
> itself.
>
> Ok, but please make a method for it (awn_background_invalidate), the usage of
> public variables is really unfortunate in the background class.

You're right, done

[Michal Hruby (mhr3)]

Sorry for late reply, been bit busy lately...

Lines 450 and 534 will cause a crash if there are no applets setup, fix pls.

review: Needs Fixing (code-review)

[Michal Hruby (mhr3)]

Also it'd be nice to use private structure for the 'expw' variable, don't expose it.

[Michal Hruby (mhr3)]

Few more observations:
1) Backgrounds don't redraw properly when monitor_align is changed.
2) There are some issues with padding (no refresh) when curviness is being changed.
3) Incomplete redraw when second expander is added to the panel.

[Michal Hruby (mhr3)]

And one more: On bottom orientation (expanded panel) the pixels on x == 0 have incorrect color.

[Alberto Aldegheri (albyrock87)]

> 3) Incomplete redraw when second expander is added to the panel.

I need help with this.

The way to fix this problem is call a redraw of all applets when an applet gets added/removed.

But I don't know how to do that.

review: Needs Information

[Alberto Aldegheri (albyrock87)]

Ok, all done.

I've found a way to fix:
> 3) Incomplete redraw when second expander is added to the panel.

Resubmitting :)

[Alberto Aldegheri (albyrock87)]

review: Approve

[Alberto Aldegheri (albyrock87)]

Noes!! There's a bug with a special configuration, i'll fix soon :(

[Alberto Aldegheri (albyrock87)]

> Noes!! There's a bug with a special configuration, i'll fix soon :(
Ok, done :)

[Michal Hruby (mhr3)]

Sorry, but additions in 714 are completely redundant - please take a look for example at Edgy code...

1) There's no need for extra signal in awn-panel, if you need panel to ask you again for padding emit the "padding-changed" signal (using awn_background_emit_padding_changed).
2) There's no need for "property-changed", this is implemented automatically for every property which is registered using g_object_class_install_property. The only thing you need to do is connect to the "notify" signal of the object with detail id set to the property name. (see src/awn-background-edgy.c:146)

review: Needs Fixing (code-review)

[Michal Hruby (mhr3)]

And I also have one question - what is the rationale behind using curviness instead of corner_radius?

[Alberto Aldegheri (albyrock87)]

> And I also have one question - what is the rationale behind using curviness
> instead of corner_radius?

Because Lucido consists in curves:
- curves symmetry
- curviness

Lucido's boundary rect has no rounded corners.

[Alberto Aldegheri (albyrock87)]

How can I remove myself from reviewers? :D

review: Approve

[Michal Hruby (mhr3)]

Good question... Change it to Abstain?!

[Alberto Aldegheri (albyrock87)]

Tanks Michal! ;)

However, Lucido seems to be ready now :)

review: Abstain

[Michal Hruby (mhr3)]

Looking at the latest changes, shouldn't you monitor also changes to "expand" property and emit padding-changed?

[Alberto Aldegheri (albyrock87)]

I think that "expand" already refreshes padding. So there's no need to observ "expand"..

[Michal Hruby (mhr3)]

I see, you derive from FLAT background, and it monitors expand property. Is this really intentional?

[Alberto Aldegheri (albyrock87)]

Haha!

Great! No, that was not intentional :P

It was intentional for some methods, but not for monitor expand :P

[Michal Hruby (mhr3)]

Which methods exactly? It seems to me that Lucido should be derived directly from AwnBackground, not Flat...

[Alberto Aldegheri (albyrock87)]

For the shape mask, and initally for the padding method, but after i must reimplement that for use curviness in not-expanded mode..

[Michal Hruby (mhr3)]

Yep :)

review: Needs Fixing

[Alberto Aldegheri (albyrock87)]

review: Needs Fixing?

In what? I don't understand, do you want that i change the parent to AwnBackground?

[Michal Hruby (mhr3)]

Oh sorry, we didn't understand each other... Yes, please change the base class to AwnBackground and implement correct version of get_shape_mask.

[Alberto Aldegheri (albyrock87)]

I understand that my english is not so good :D

I'll do the job soon then I resubmit :)

[Michal Hruby (mhr3)]

The mask is incorrect when using non-expanded mode, please make sure the corners are clickable exactly as it's painted. (like in BackgroundCurved)

review: Needs Fixing (shape-mask)

[Alberto Aldegheri (albyrock87)]

Shape-mask fixed :)

review: Abstain (shape-mask)

[Michal Hruby (mhr3)]

Yep, looks good. I'm going to merge it in the current state, but there's two more things I'd like to see which can be merged later:

1) stripe_width == 0.0 has the same color as stripe_width == 1.0 and there's a big change when going from 0.0 to 0.01, please fix.
2) Paint the outline on the corners in non-composited mode.

review: Approve (code & behaviour)

[Alberto Aldegheri (albyrock87)]

I don't understand this:
> 1) stripe_width == 0.0 has the same color as stripe_width == 1.0 and there's a
> big change when going from 0.0 to 0.01, please fix.

Can you explain in other words?

[lp:~albyrock87/awn/awn-lucido]

703. By Michal Hruby on 2010-05-31

Merge Lucido style from <lp:~albyrock87/awn/awn-lucido>

[Michal Hruby (mhr3)]

If I have Lucido with black and white colors, it will be fully white for stripe-width 0.0 and also 1.0, but if I use 0.01 it'll be almost fully black (when non-expanded). Therefore IMO it should be fully black when using 0.0.

[Alberto Aldegheri (albyrock87)]

Great idea!!

Coding it now :)

[Alberto Aldegheri (albyrock87)]

> If I have Lucido with black and white colors, it will be fully white for stripe-width 0.0 and also
> 1.0, but if I use 0.01 it'll be almost fully black (when non-expanded). Therefore IMO it should be
> fully black when using 0.0.

I think it's done now, give it a try! ;)

[Michal Hruby (mhr3)]

Yep, better now, but there's still a slight displacement of the gradient... sorry perfectionist here :P
Also, please pull trunk branch, I did some slight changes to your code.

Anyway this thread has gone long enough, feel free to join us on freenode in #awn.

=== modified file 'awn-settings/awn-settings.ui'
--- awn-settings/awn-settings.ui	2010-03-08 12:50:07 +0000
+++ awn-settings/awn-settings.ui	2010-05-31 17:25:42 +0000
@@ -908,6 +908,22 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkSpinButton" id="theme_stripe_width">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="adjustment">adj_stripe_width</property>
+                                <property name="digits">2</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">5</property>
+                                <property name="right_attach">6</property>
+                                <property name="top_attach">8</property>
+                                <property name="bottom_attach">9</property>
+                                <property name="x_options"></property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkSpinButton" id="theme_angle">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -964,6 +980,20 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkLabel" id="label_stripe">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">0</property>
+                                <property name="label" translatable="yes">Stripe Width</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">3</property>
+                                <property name="right_attach">5</property>
+                                <property name="top_attach">8</property>
+                                <property name="bottom_attach">9</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkLabel" id="label49">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
@@ -3406,6 +3436,10 @@
     <property name="upper">1</property>
     <property name="step_increment">0.01</property>
   </object>
+  <object class="GtkAdjustment" id="adj_stripe_width">
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+  </object>
   <object class="GtkAdjustment" id="adj_radius">
     <property name="upper">100</property>
     <property name="step_increment">1</property>

=== modified file 'awn-settings/awnDefs.py.in'
--- awn-settings/awnDefs.py.in	2010-04-29 14:58:51 +0000
+++ awn-settings/awnDefs.py.in	2010-05-31 17:25:42 +0000
@@ -86,6 +86,7 @@
 PANEL_ANGLE             = "panel_angle"         #float
 CURVINESS               = "curviness"           #float
 CURVES_SYMMETRY         = "curves_symmetry"     #float
+STRIPE_WIDTH            = "stripe_width"        #float
 TOOLTIP_FONT_NAME       = "tooltip_font_name"   #string
 TOOLTIP_FONT_COLOR      = "tooltip_font_color"  #string
 TOOLTIP_BG_COLOR        = "tooltip_bg_color"    #string

=== modified file 'awn-settings/awnSettings.py.in'
--- awn-settings/awnSettings.py.in	2010-05-28 08:09:17 +0000
+++ awn-settings/awnSettings.py.in	2010-05-31 17:25:42 +0000
@@ -141,7 +141,8 @@
         #setup style mode
         dropdown = self.wTree.get_object("stylecombo")
         self.create_dropdown(dropdown, [_("None"), _("Flat"), _("3d"),
-                                        _("Curved"), _("Edgy"), _("Floaty")])
+                                        _("Curved"), _("Edgy"), _("Floaty"),
+                                         _("Lucido")])
 
         #setup behaviour combo
         dropdown = self.wTree.get_object("behaviorcombo")
@@ -578,6 +579,7 @@
     
     curviness = gobject.property(type=int, default=10)
     curves_symmetry = gobject.property(type=float, default=0)
+    stripe_width = gobject.property(type=float, default=0)
     angle = gobject.property(type=int, default=45)
     radius = gobject.property(type=int, default=10)
     gtk_theme_mode = gobject.property(type=bool, default=False)
@@ -727,6 +729,7 @@
 			(defs.THEME, defs.PANEL_ANGLE, 'float', sizes),
 			(defs.THEME, defs.CURVINESS, 'float', sizes),
 			(defs.THEME, defs.CURVES_SYMMETRY, 'float', sizes),
+			(defs.THEME, defs.STRIPE_WIDTH, 'float', sizes),
 			(defs.THEME, defs.TOOLTIP_FONT_NAME, 'str', icon),
 			(defs.THEME, defs.TOOLTIP_FONT_COLOR, 'str', icon),
 			(defs.THEME, defs.TOOLTIP_BG_COLOR, 'str', icon),
@@ -823,6 +826,8 @@
                 "curviness", "theme_curviness"),
             (self.client, defs.THEME, defs.CURVES_SYMMETRY,
                 "curves-symmetry", "theme_symmetry"),
+            (self.client, defs.THEME, defs.STRIPE_WIDTH,
+                "stripe-width", "theme_stripe_width"),
             (self.client, defs.THEME, defs.PANEL_ANGLE,
                 "angle", "theme_angle"),
             (self.client, defs.THEME, defs.CORNER_RADIUS,

=== modified file 'data/avant-window-navigator.schema-ini.in.in'
--- data/avant-window-navigator.schema-ini.in.in	2010-03-09 20:20:25 +0000
+++ data/avant-window-navigator.schema-ini.in.in	2010-05-31 17:25:42 +0000
@@ -159,7 +159,7 @@
 [panel/style]
 type = integer
 default = 1
-_description=The style of the bar. (none=0, flat bar=1, 3d bar=2, curved bar=3, edgy=4, floaty=5)
+_description=The style of the bar. (none=0, flat bar=1, 3d bar=2, curved bar=3, edgy=4, floaty=5,lucido=6)
 
 [panels/panel_list]
 type = list-integer
@@ -227,6 +227,12 @@
 _description=The curviness of the panel in Curves mode.
 per_instance = false
 
+[theme/stripe_width]
+type = float
+default = 0.0
+_description=The width of the stripe in Lucido mode.
+per_instance = false
+
 [theme/dialog_gtk_mode]
 type = boolean
 default = true

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-03-24 23:24:19 +0000
+++ src/Makefile.am	2010-05-31 17:25:42 +0000
@@ -41,6 +41,8 @@
 	awn-background-edgy.h \
 	awn-background-floaty.c \
 	awn-background-floaty.h \
+	awn-background-lucido.c \
+	awn-background-lucido.h \
 	awn-defines.h \
 	$(builddir)/awn-marshal.c \
 	$(builddir)/awn-marshal.h \

=== modified file 'src/awn-background-flat.c'
--- src/awn-background-flat.c	2010-03-07 18:38:07 +0000
+++ src/awn-background-flat.c	2010-05-31 17:25:42 +0000
@@ -324,20 +324,24 @@
   switch (position)
   {
     case GTK_POS_RIGHT:
-      cairo_translate (cr, x, y+height);
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
       cairo_rotate (cr, M_PI * 1.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_LEFT:
-      cairo_translate (cr, x+width, y);
+      cairo_translate (cr, x + width, y);
       cairo_rotate (cr, M_PI * 0.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_TOP:
-      cairo_translate (cr, x+width, y+height);
-      cairo_rotate (cr, M_PI);
+      cairo_translate (cr, x, y + height);
+      cairo_scale (cr, 1., -1.);
       break;
     default:
       cairo_translate (cr, x, y);

=== added file 'src/awn-background-lucido.c'
--- src/awn-background-lucido.c	1970-01-01 00:00:00 +0000
+++ src/awn-background-lucido.c	2010-05-31 17:25:42 +0000
@@ -0,0 +1,874 @@
+/*
+ *  Copyright (C) 2009 Michal Hruby <[e-mail]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *  Author : Alberto Aldegheri <[e-mail]>
+ *  Thanks to: Matt <[e-mail]>
+ *             for the code section to analyze expanders
+ *
+ */
+
+#include "config.h"
+
+#include <gdk/gdk.h>
+#include <libawn/awn-cairo-utils.h>
+#include <math.h>
+
+#include "awn-applet-manager.h"
+#include "awn-background-lucido.h"
+#include "awn-separator.h"
+
+G_DEFINE_TYPE (AwnBackgroundLucido, awn_background_lucido, AWN_TYPE_BACKGROUND)
+
+#define AWN_BACKGROUND_LUCIDO_GET_PRIVATE(obj) ( \
+    G_TYPE_INSTANCE_GET_PRIVATE (obj, AWN_TYPE_BACKGROUND_LUCIDO, \
+                                 AwnBackgroundLucidoPrivate))
+
+struct _AwnBackgroundLucidoPrivate
+{
+    gint expw;
+    gint expn;
+};
+
+static void awn_background_lucido_draw (AwnBackground  *bg,
+                                        cairo_t        *cr,
+                                        GtkPositionType  position,
+                                        GdkRectangle   *area);
+
+static void awn_background_lucido_get_shape_mask (AwnBackground  *bg,
+                                                  cairo_t        *cr,
+                                                  GtkPositionType  position,
+                                                  GdkRectangle   *area);
+
+static void awn_background_lucido_padding_request (AwnBackground *bg,
+                                                   GtkPositionType position,
+                                                   guint *padding_top,
+                                                   guint *padding_bottom,
+                                                   guint *padding_left,
+                                                   guint *padding_right);
+                                                   
+static gboolean
+awn_background_lucido_get_needs_redraw (AwnBackground *bg,
+                                        GtkPositionType position,
+                                        GdkRectangle *area);
+                                        
+static void 
+awn_background_lucido_curviness_changed (AwnBackground *bg)
+{
+  gboolean expand = FALSE;
+  g_object_get (bg->panel, "expand", &expand, NULL);
+  
+  if (!expand)
+    awn_background_emit_padding_changed (bg);
+}
+
+static void
+awn_background_lucido_expand_changed (AwnBackground *bg)
+{
+  awn_background_emit_padding_changed (bg);
+}
+
+static void
+awn_background_lucido_align_changed (AwnBackground *bg)
+{
+  awn_background_emit_padding_changed (bg);
+}
+
+static void
+awn_background_lucido_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (awn_background_lucido_parent_class)->constructed (object);
+  
+  AwnBackground *bg = AWN_BACKGROUND (object);
+  gpointer monitor = NULL;
+  
+  g_signal_connect_swapped (bg, "notify::curviness",
+                            G_CALLBACK (awn_background_lucido_curviness_changed),
+                            object);
+
+  g_return_if_fail (bg->panel);
+  
+  g_signal_connect_swapped (bg->panel, "notify::expand",
+                            G_CALLBACK (awn_background_lucido_expand_changed),
+                            object);
+
+  g_object_get (bg->panel, "monitor", &monitor, NULL);
+
+  g_return_if_fail (monitor);
+
+  g_signal_connect_swapped (monitor, "notify::monitor-align",
+                            G_CALLBACK (awn_background_lucido_align_changed),
+                            object);
+}
+
+static void
+awn_background_lucido_dispose (GObject *object)
+{
+  gpointer monitor = NULL;
+  if (AWN_BACKGROUND (object)->panel)
+    g_object_get (AWN_BACKGROUND (object)->panel, "monitor", &monitor, NULL);
+
+  if (monitor)
+    g_signal_handlers_disconnect_by_func (monitor, 
+        G_CALLBACK (awn_background_lucido_align_changed), object);
+
+  g_signal_handlers_disconnect_by_func (AWN_BACKGROUND (object)->panel, 
+        G_CALLBACK (awn_background_lucido_expand_changed), object);
+
+  g_signal_handlers_disconnect_by_func (AWN_BACKGROUND (object), 
+        G_CALLBACK (awn_background_lucido_curviness_changed), object);
+
+  G_OBJECT_CLASS (awn_background_lucido_parent_class)->dispose (object);
+}
+
+static void
+awn_background_lucido_class_init (AwnBackgroundLucidoClass *klass)
+{
+  AwnBackgroundClass *bg_class = AWN_BACKGROUND_CLASS (klass);
+
+  GObjectClass *obj_class = G_OBJECT_CLASS (klass);
+  obj_class->constructed  = awn_background_lucido_constructed;
+  obj_class->dispose = awn_background_lucido_dispose;
+
+  bg_class->draw = awn_background_lucido_draw;
+  bg_class->padding_request = awn_background_lucido_padding_request;
+  bg_class->get_shape_mask = awn_background_lucido_get_shape_mask;
+  bg_class->get_input_shape_mask = awn_background_lucido_get_shape_mask;
+  bg_class->get_needs_redraw = awn_background_lucido_get_needs_redraw;
+  
+  g_type_class_add_private (obj_class, sizeof (AwnBackgroundLucidoPrivate));
+}
+
+static void
+awn_background_lucido_init (AwnBackgroundLucido *bg)
+{
+
+}
+
+AwnBackground *
+awn_background_lucido_new (DesktopAgnosticConfigClient *client,
+                           AwnPanel *panel)
+{
+  AwnBackground *bg;
+
+  bg = g_object_new (AWN_TYPE_BACKGROUND_LUCIDO,
+                     "client", client,
+                     "panel", panel,
+                     NULL);
+  return bg;
+}
+
+/*
+ * Drawing functions
+ */
+static void 
+_line_from_to ( cairo_t *cr,
+                gfloat *xs,
+                gfloat *ys,
+                gfloat xf,
+                gfloat yf)
+{
+  if ( *xs==xf || *ys==yf ) /* Vertical/Horizontal line */
+    cairo_line_to (cr, xf, yf);
+  else
+  { /* Oblique */
+    gfloat xm = ( *xs + xf ) / 2.0;
+    cairo_curve_to (cr, xm, *ys, xm, yf, xf, yf);
+  }
+  *xs = xf;
+  *ys = yf;
+}
+
+static GList*
+_get_applet_widgets (AwnBackground* bg)
+{
+  AwnAppletManager *manager = NULL;
+  g_object_get (bg->panel, "applet-manager", &manager, NULL);
+
+  return gtk_container_get_children (GTK_CONTAINER (manager));
+}
+
+/**
+ * _create_path_lucido:
+ * @bg: The background pointer
+ * @position: The position of the bar
+ * @cairo_t: The cairo context
+ * @y: The top left coordinate of the "bar rect" - default = 0
+ * @w: The width of the bar
+ * @h: The height of the bar
+ * @stripe: The width of the stripe (0.0-1.0). Zero for auto-stripe.
+ * @d: The width of each curve in the path
+ * @dc: The width of the external curves in non-expanded&auto mode
+ * @symmetry: The symmetry of the stripe when @stripe > 0
+ * @internal: If Zero, creates the path for the stripe
+ * @expanded: If Zero, the bar is not expanded
+ *
+ * This function creates paths on which the bar will be drawn.
+ * In atuo-stripe, it searchs for expanders applet, each expander
+ * equals to one curve.
+ * If the first widget is an expander, start from bottom-left,
+ * otherwise start from top-left
+ */
+
+static void
+_create_path_lucido ( AwnBackground*  bg,
+                      GtkPositionType position,
+                      cairo_t*        cr,
+                      gfloat          x,
+                      gfloat          y,
+                      gfloat          w,
+                      gfloat          h,
+                      gfloat          stripe,
+                      gfloat          d,
+                      gfloat          dc,
+                      gfloat          symmetry,
+                      gboolean        internal,
+                      gboolean        expanded,
+                      gfloat          align)
+{
+  cairo_new_path (cr);
+
+  gfloat lx = x;
+  gfloat ly = y;
+  gfloat y3 = y + h;
+  gfloat y2 = y3 - 5;
+  
+  if (stripe > 0)
+  {
+    if (expanded)
+    {
+      stripe = (w * stripe); /* now stripe = non-stripe */
+      if (internal)
+      {
+        /* Manual-Stripe & Expanded & Internal */
+        lx = stripe * symmetry;
+        cairo_move_to (cr, lx, ly);
+        _line_from_to (cr, &lx, &ly, lx+d, y2);
+        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry) - d, y2);
+        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry), y);
+        cairo_close_path (cr);
+      }
+      else
+      {
+        /* Manual-Stripe & Expanded & External */
+        ly = y3;
+        cairo_move_to (cr, lx, ly);
+        _line_from_to (cr, &lx, &ly, lx, y);
+        _line_from_to (cr, &lx, &ly, stripe * symmetry, y);
+        _line_from_to (cr, &lx, &ly, stripe * symmetry + d, y2);
+        _line_from_to (cr, &lx, &ly, w - stripe * (1. - symmetry) - d, y2);
+        _line_from_to (cr, &lx, &ly, w - stripe * (1. - symmetry), y);
+        _line_from_to (cr, &lx, &ly, w, y);
+        _line_from_to (cr, &lx, &ly, w, y3);
+        cairo_close_path (cr);
+      }
+    }    
+    else
+    {
+      if (stripe == 1.)
+      {
+        _create_path_lucido (bg, position, cr, x, y, w, h, 0., 
+                             d, dc, 0., internal, expanded, align);
+        return;
+      }
+      stripe = ((w - dc * 2) * stripe); /* now stripe = non-stripe */
+      if (internal)
+      {
+        /* Manual-Stripe & Not-Expanded & Internal */
+        lx = stripe * symmetry + dc;
+        cairo_move_to (cr, lx, ly);
+        _line_from_to (cr, &lx, &ly, lx + d, y2);
+        _line_from_to (cr, &lx, &ly, w - stripe * (1.- symmetry) - dc - d, y2);
+        _line_from_to (cr, &lx, &ly, w - stripe * (1.- symmetry) - dc, y);
+        cairo_close_path (cr);
+      }
+      else
+      {
+        /* Manual-Stripe & Not-Expanded & External */
+        ly = y3;
+        cairo_move_to (cr, lx, ly);
+        _line_from_to (cr, &lx, &ly, lx+dc, y);
+        _line_from_to (cr, &lx, &ly, stripe * symmetry + dc, y);
+        _line_from_to (cr, &lx, &ly, stripe * symmetry + d + dc, y2);
+        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry) - dc - d, y2);
+        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry) - dc, y);
+        _line_from_to (cr, &lx, &ly, w-dc, y);
+        _line_from_to (cr, &lx, &ly, w, y3);
+        cairo_close_path(cr);
+      }
+    }
+  }
+  else
+  {
+    gint exps_found = 0;
+    gfloat curx = x;
+    
+    if (expanded)
+    {
+      if (internal)
+      {        
+        /* Auto-Stripe & Expanded & Internal */
+        GList *widgets = _get_applet_widgets (bg);
+        GList *i = widgets;
+        GtkWidget *widget = NULL;
+        
+        /* analyze first widget*/
+        if (i)
+        {
+          widget = GTK_WIDGET (i->data);
+          
+          /* if first widget is an expander or align==0 || 1*/
+          if ( (widget && GTK_IS_IMAGE (widget) && !AWN_IS_SEPARATOR (widget) ) ||
+               ( align == 0. || align == 1. ) )
+          {
+            /* start from bottom */
+            lx = curx;
+            ly = y;
+            cairo_move_to (cr, lx, ly);
+            _line_from_to (cr, &lx, &ly, lx, y2);
+            ++exps_found;
+            if (align != 0. && align != 1.)
+              i = i->next;
+          }
+        }
+        /* else start from top */
+
+        for (; i; i = i->next)
+        {
+          widget = GTK_WIDGET (i->data);
+
+          if (!GTK_IS_IMAGE (widget) || AWN_IS_SEPARATOR (widget)) 
+          {
+            /* if not expander continue */
+            continue;
+          }          
+          /* expander found */
+          switch (position)
+          {
+            case GTK_POS_BOTTOM:
+            case GTK_POS_TOP:
+              curx = widget->allocation.x;
+              if (exps_found % 2 != 0)
+                curx += widget->allocation.width;
+              break;
+            default:
+              curx = widget->allocation.y;
+              if ( exps_found % 2 != 0)
+                curx += widget->allocation.height;
+              break;
+          }
+          if (curx < 0)
+            continue;
+
+          if (exps_found == 0)
+          {
+            /* this is the first expander */  
+            lx = curx;
+            cairo_move_to (cr, lx, ly);
+            _line_from_to (cr, &lx, &ly, curx + d, y2);
+          }
+          else
+          {
+            if (exps_found % 2 != 0)
+            {
+              /* odd expander - curve at the end of expander */
+              _line_from_to (cr, &lx, &ly, curx - d, y2);
+              if (i->next == NULL)
+                _line_from_to (cr, &lx, &ly, curx, y2);
+              _line_from_to (cr, &lx, &ly, curx, y);
+            }
+            else
+            {
+              /* even expander - curve at the start of expander */
+              _line_from_to (cr, &lx, &ly, curx, y);
+              _line_from_to (cr, &lx, &ly, curx + d, y2);
+              /* else the last widget is an expander */
+            }
+          }
+
+          ++exps_found;
+        }
+        g_list_free (widgets);
+
+        _line_from_to (cr, &lx, &ly, w, ly);
+
+        if (exps_found % 2 != 0)
+          _line_from_to (cr, &lx, &ly, lx, y);
+
+        cairo_close_path (cr);
+      }
+      else
+      {
+        /* Auto-Stripe & Expanded & External */
+
+        GList *widgets = _get_applet_widgets (bg);
+        GList *i = widgets;
+        GtkWidget *widget = NULL;
+        
+        /* analyze first widget*/
+        if (i)
+        {
+          widget = GTK_WIDGET (i->data);
+
+          ly = y3;
+          cairo_move_to (cr, lx, ly);
+
+          /* if first widget is an expander or align==0 || 1*/
+          if ( (widget && GTK_IS_IMAGE (widget) && !AWN_IS_SEPARATOR (widget) ) ||
+               ( align == 0. || align == 1. ) )
+          {
+            /* start from bottom */
+            _line_from_to (cr, &lx, &ly, lx, y2);
+            ++exps_found;
+            if (align != 0. && align != 1.)
+              i = i->next;
+          }
+          else
+          {
+            /* start from top */
+            _line_from_to (cr, &lx, &ly, lx, y);
+          }
+        }
+
+        for (; i; i = i->next)
+        {
+          widget = GTK_WIDGET (i->data);
+
+          if (!GTK_IS_IMAGE (widget) || AWN_IS_SEPARATOR (widget)) 
+          {
+            /* if not expander continue */
+            continue;
+          }          
+          /* expander found */
+          switch (position)
+          {
+            case GTK_POS_BOTTOM:
+            case GTK_POS_TOP:
+              curx = widget->allocation.x;
+              if (exps_found % 2 != 0)
+                curx += widget->allocation.width;
+              break;
+            default:
+              curx = widget->allocation.y;
+              if (exps_found % 2 != 0)
+                curx += widget->allocation.height;
+              break;
+          }
+          if (curx < 0)
+            continue;
+
+          if (exps_found % 2 != 0)
+          {
+            _line_from_to (cr, &lx, &ly, curx - d, y2);
+            if (i->next != NULL)
+              _line_from_to (cr, &lx, &ly, curx, y);
+          }
+          else
+          {
+            _line_from_to (cr, &lx, &ly, curx, y);
+            _line_from_to (cr, &lx, &ly, curx + d, y2);
+          }
+          ++exps_found;
+        }
+        g_list_free (widgets);
+        
+        _line_from_to (cr, &lx, &ly, w, ly);
+        _line_from_to (cr, &lx, &ly, lx, y3);
+
+        cairo_close_path (cr);
+      }
+    }
+    else
+    {
+      if (internal)
+      {
+        /* Auto-Stripe & Not-Expanded & Internal */
+        /* no-path */
+      }
+      else
+      {
+        /* Auto-Stripe & Not-Expanded & External */
+        ly = y3;
+        cairo_move_to (cr, lx, ly);
+        
+        if (align == 0.)
+          _line_from_to (cr, &lx, &ly, lx , y);
+        else
+          _line_from_to (cr, &lx, &ly, lx + dc, y);
+        
+        if (align == 1.)
+          _line_from_to (cr, &lx, &ly, w, y);
+        else
+          _line_from_to (cr, &lx, &ly, w - dc, y);
+        
+        _line_from_to (cr, &lx, &ly, w, y3);
+        cairo_close_path (cr);
+      }
+    }
+  }
+}
+
+static void
+draw_top_bottom_background (AwnBackground*   bg,
+                            GtkPositionType  position,
+                            cairo_t*         cr,
+                            gint             width,
+                            gint             height)
+{
+  cairo_pattern_t *pat = NULL;
+  cairo_pattern_t *pat_hi = NULL;
+  
+  /* Basic set-up */
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+  gboolean expand = FALSE;
+  g_object_get (bg->panel, "expand", &expand, NULL);
+  
+  gfloat align = awn_background_get_panel_alignment (AWN_BACKGROUND (bg));
+  
+  /* Make sure the bar gets drawn on the 0.5 pixels (for sharp edges) */
+  switch (position)
+  {
+    case GTK_POS_TOP:
+    case GTK_POS_BOTTOM:
+      cairo_translate (cr, 0., 0.5);
+      break;
+    default:
+      cairo_translate (cr, 0.5, 0.);
+      break;
+  }
+  
+  if(gtk_widget_is_composited (GTK_WIDGET (bg->panel) ) == FALSE)
+  {
+    goto paint_lines;
+  }
+
+  /* create internal path */
+  _create_path_lucido (bg, position, cr, -1.0, 0., width, height,
+                       bg->stripe_width, bg->curviness,
+                       bg->curviness, bg->curves_symmetry,
+                       1, expand, align);
+
+  /* Draw internal pattern if needed */
+  if (bg->enable_pattern && bg->pattern)
+  {
+    /* Prepare pattern */
+    pat = cairo_pattern_create_for_surface (bg->pattern);
+    cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT);
+    /* Draw */
+    cairo_save (cr);
+    cairo_clip_preserve (cr);
+    cairo_set_source (cr, pat);
+    cairo_paint (cr);
+    cairo_restore (cr);
+    cairo_pattern_destroy (pat);
+  }
+
+  /* Prepare the internal background */
+  pat = cairo_pattern_create_linear (0, 0, 0, height);
+  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->border_color);
+  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->hilight_color);
+
+  /* Draw the internal background gradient */
+  cairo_save (cr);
+  cairo_clip_preserve (cr);
+  cairo_set_source (cr, pat);
+  cairo_paint (cr);
+  cairo_restore (cr);
+  cairo_pattern_destroy (pat);
+
+  /* Prepare external background gradient*/
+  pat = cairo_pattern_create_linear (0, 0, 0, height);
+  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_step_1);
+  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
+  
+  /* create external path */
+  _create_path_lucido (bg, position, cr, -1.0, 0., width, height,
+                       bg->stripe_width, bg->curviness,
+                       bg->curviness, bg->curves_symmetry,
+                       0, expand, align);
+                       
+  /* Draw the external background  */
+  cairo_save (cr);
+  cairo_clip_preserve (cr);
+  cairo_set_source (cr, pat);
+  cairo_paint (cr);
+  cairo_restore (cr);
+  cairo_pattern_destroy (pat);
+  
+  /* Draw the hi-light */
+  pat_hi = cairo_pattern_create_linear (0, 0, 0, (height / 3.0));
+  awn_cairo_pattern_add_color_stop_color (pat_hi, 0.0, bg->g_histep_1);
+  awn_cairo_pattern_add_color_stop_color (pat_hi, 1.0, bg->g_histep_2);
+  
+  if (expand)
+  {
+    cairo_new_path (cr);
+    cairo_rectangle (cr, 0, 0, width, (height / 3.0));
+  }
+  
+  cairo_set_source (cr, pat_hi);
+  cairo_fill (cr);
+  cairo_pattern_destroy (pat_hi);
+
+  return;
+  /* if not composited */
+paint_lines:
+
+  if (expand)
+  {
+    /* Internal border */
+    awn_cairo_set_source_color (cr, bg->hilight_color);
+    cairo_rectangle (cr, 1, 1, width - 3, height + 3);
+    cairo_stroke (cr);
+
+    /* External border */    
+    awn_cairo_set_source_color (cr, bg->border_color);
+    cairo_rectangle (cr, 1, 1, width - 1, height + 3);
+  }
+  else
+  {
+    awn_cairo_set_source_color (cr, bg->border_color);
+    _create_path_lucido (bg, position, cr, 0., 0., width, height,
+                         bg->stripe_width, bg->curviness,
+                         bg->curviness, bg->curves_symmetry,
+                         0, expand, align);
+    cairo_stroke (cr);
+    awn_cairo_set_source_color (cr, bg->hilight_color);
+    _create_path_lucido (bg, position, cr, 1., 1., width-1., height-1.,
+                         bg->stripe_width, bg->curviness,
+                         bg->curviness, bg->curves_symmetry,
+                         0, expand, align);
+  }
+  cairo_stroke (cr);
+}
+
+
+static
+void awn_background_lucido_padding_request (AwnBackground *bg,
+    GtkPositionType position,
+    guint *padding_top,
+    guint *padding_bottom,
+    guint *padding_left,
+    guint *padding_right)
+{
+  #define TOP_PADDING 2
+  gboolean expand = FALSE;
+  g_object_get (bg->panel, "expand", &expand, NULL);
+  gint side_padding = expand ? 0 : bg->curviness;
+  gint zero_padding = 0;
+
+  gfloat align = awn_background_get_panel_alignment (bg);
+  if (awn_background_do_rtl_swap (bg))
+  {
+    if (align <= 0.0 || align >= 1.0)
+    {
+      zero_padding = side_padding;
+      side_padding = 0;
+    }
+  }
+
+  switch (position)
+  {
+    case GTK_POS_TOP:
+      *padding_top  = 0;
+      *padding_bottom = TOP_PADDING;
+      *padding_left = align == 0.0 ? zero_padding : side_padding;
+      *padding_right = align == 1.0 ? zero_padding : side_padding;
+      break;
+    case GTK_POS_BOTTOM:
+      *padding_top  = TOP_PADDING;
+      *padding_bottom = 0;
+      *padding_left = align == 0.0 ? zero_padding : side_padding;
+      *padding_right = align == 1.0 ? zero_padding : side_padding;
+      break;
+    case GTK_POS_LEFT:
+      *padding_top  = align == 0.0 ? zero_padding : side_padding;
+      *padding_bottom = align == 1.0 ? zero_padding : side_padding;
+      *padding_left = 0;
+      *padding_right = TOP_PADDING;
+      break;
+    case GTK_POS_RIGHT:
+      *padding_top  = align == 0.0 ? zero_padding : side_padding;
+      *padding_bottom = align == 1.0 ? zero_padding : side_padding;
+      *padding_left = TOP_PADDING;
+      *padding_right = 0;
+      break;
+    default:
+      break;
+  }
+}
+
+
+
+static void
+awn_background_lucido_draw (AwnBackground  *bg,
+                            cairo_t        *cr,
+                            GtkPositionType  position,
+                            GdkRectangle   *area)
+{
+  gint temp;
+  gint x = area->x, y = area->y;
+  gint width = area->width, height = area->height;
+  cairo_save (cr);
+
+  switch (position)
+  {
+    case GTK_POS_RIGHT:
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
+      cairo_rotate (cr, M_PI * 1.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_LEFT:
+      cairo_translate (cr, x + width, y);
+      cairo_rotate (cr, M_PI * 0.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_TOP:
+      cairo_translate (cr, x, y + height);
+      cairo_scale (cr, 1., -1.);
+      break;
+    default:
+      cairo_translate (cr, x, y);
+      break;
+  }
+  
+  draw_top_bottom_background (bg, position, cr, width, height);
+  
+  cairo_restore (cr);
+}
+
+static gboolean
+awn_background_lucido_get_needs_redraw (AwnBackground *bg,
+                                        GtkPositionType position,
+                                        GdkRectangle *area)
+{
+  /* Check default needs redraw */
+  gboolean nr = AWN_BACKGROUND_CLASS (awn_background_lucido_parent_class)->
+                                      get_needs_redraw (bg, position, area);
+  if (nr)
+    return TRUE;
+  
+  /* Check expanders positions & sizes changed */
+  GList *widgets = _get_applet_widgets (bg);
+  GList *i = widgets;
+  GtkWidget *widget = NULL;
+  gint wcheck = 0;
+  gint ncheck = 0;
+  
+  for (; i; i = i->next)
+  {
+    widget = GTK_WIDGET (i->data);
+
+    if (!GTK_IS_IMAGE (widget) || AWN_IS_SEPARATOR (widget)) 
+    {
+      /* if not expander continue */
+      continue;
+    }
+    switch (position)
+    {
+      case GTK_POS_BOTTOM:
+      case GTK_POS_TOP:
+        wcheck += (widget->allocation.x * 3) / 2 + widget->allocation.width;
+        break;
+      default:
+        wcheck += (widget->allocation.y * 3 ) / 2 + widget->allocation.height;
+        break;
+    }
+    ++ncheck;
+  }
+  g_list_free (widgets);
+  
+  AwnBackgroundLucido *lbg = NULL;
+  lbg = AWN_BACKGROUND_LUCIDO (bg);
+  AwnBackgroundLucidoPrivate *priv;
+  priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (lbg);
+  if (priv->expn != ncheck)
+  {
+    priv->expn = ncheck;
+    /* used to refresh bar */
+    awn_background_emit_padding_changed (bg);
+  }
+  if (priv->expw != wcheck)
+  {
+    priv->expw = wcheck;
+    return TRUE;
+  }
+  return FALSE;
+}
+
+static void
+awn_background_lucido_get_shape_mask (AwnBackground   *bg,
+                                      cairo_t         *cr,
+                                      GtkPositionType position,
+                                      GdkRectangle    *area)
+{
+  gint temp;
+  gint x = area->x, y = area->y;
+  gint width = area->width, height = area->height;
+  gfloat   align = 0.5;
+  gboolean expand = FALSE;
+
+  cairo_save (cr);
+
+  align = awn_background_get_panel_alignment (bg);
+  g_object_get (bg->panel, "expand", &expand, NULL);
+
+  switch (position)
+  {
+    case GTK_POS_RIGHT:
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
+      cairo_rotate (cr, M_PI * 1.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_LEFT:
+      cairo_translate (cr, x + width, y);
+      cairo_rotate (cr, M_PI * 0.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_TOP:
+      cairo_translate (cr, x, y + height);
+      cairo_scale (cr, 1., -1.);
+      break;
+    default:
+      cairo_translate (cr, x, y);
+      break;
+  }
+  if (expand)
+    cairo_rectangle (cr, 0, 0, width, height + 2);
+  else
+    _create_path_lucido (bg, position, cr, 0, 0., width, height,
+                         bg->stripe_width, bg->curviness,
+                         bg->curviness, bg->curves_symmetry,
+                         0, expand, align);
+  cairo_fill (cr);
+
+  cairo_restore (cr);
+}
+/* vim: set et ts=2 sts=2 sw=2 : */

=== added file 'src/awn-background-lucido.h'
--- src/awn-background-lucido.h	1970-01-01 00:00:00 +0000
+++ src/awn-background-lucido.h	2010-05-31 17:25:42 +0000
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (C) 2009 Michal Hruby <[e-mail]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *  Author : Alberto Aldegheri <[e-mail]>
+*/
+
+#ifndef _AWN_BACKGROUND_LUCIDO_H
+#define _AWN_BACKGROUND_LUCIDO_H
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "awn-background.h"
+
+G_BEGIN_DECLS
+
+#define AWN_TYPE_BACKGROUND_LUCIDO (awn_background_lucido_get_type())
+
+#define AWN_BACKGROUND_LUCIDO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AWN_TYPE_BACKGROUND_LUCIDO, \
+                                    AwnBackgroundLucido))
+
+#define AWN_BACKGROUND_LUCIDO_CLASS(obj)  (G_TYPE_CHECK_CLASS_CAST ((obj), AWN_BACKGROUND_LUCIDO, \
+    AwnBackgroundLucidoClass))
+
+#define AWN_IS_BACKGROUND_LUCIDO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AWN_TYPE_BACKGROUND_LUCIDO))
+
+#define AWN_IS_BACKGROUND_LUCIDO_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), \
+    AWN_TYPE_BACKGROUND_LUCIDO))
+
+#define AWN_BACKGROUND_LUCIDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+    AWN_TYPE_BACKGROUND_LUCIDO, AwnBackgroundLucidoClass))
+
+typedef struct _AwnBackgroundLucido AwnBackgroundLucido;
+typedef struct _AwnBackgroundLucidoClass AwnBackgroundLucidoClass;
+typedef struct _AwnBackgroundLucidoPrivate AwnBackgroundLucidoPrivate;
+
+struct _AwnBackgroundLucido
+{
+  AwnBackground parent;
+  AwnBackgroundLucidoPrivate *priv;
+};
+
+struct _AwnBackgroundLucidoClass
+{
+  AwnBackgroundClass parent_class;
+};
+
+GType           awn_background_lucido_get_type (void) G_GNUC_CONST;
+
+AwnBackground * awn_background_lucido_new (DesktopAgnosticConfigClient *client,
+    AwnPanel        *panel);
+
+G_END_DECLS
+
+#endif /* _AWN_BACKGROUND_LUCIDO_H */
+

=== modified file 'src/awn-background.c'
--- src/awn-background.c	2010-04-08 15:38:05 +0000
+++ src/awn-background.c	2010-05-31 17:25:42 +0000
@@ -58,7 +58,8 @@
   PROP_CORNER_RADIUS,
   PROP_PANEL_ANGLE,
   PROP_CURVINESS,
-  PROP_CURVES_SYMEMETRY
+  PROP_CURVES_SYMEMETRY,
+  PROP_STRIPE_WIDTH
 };
 
 enum 
@@ -90,6 +91,10 @@
                                       GtkPositionType  position,
                                       GdkRectangle   *area);
 
+static gboolean awn_background_get_needs_redraw (AwnBackground *bg,
+                                                 GtkPositionType position,
+                                                 GdkRectangle *area);
+
 static AwnPathType awn_background_path_default (AwnBackground *bg,
                                                 gfloat *offset_mod);
 
@@ -186,6 +191,11 @@
                                        object, "curves-symmetry", TRUE,
                                        DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
                                        NULL);
+  desktop_agnostic_config_client_bind (bg->client,
+                                       AWN_GROUP_THEME, AWN_THEME_STRIPE_WIDTH,
+                                       object, "stripe-width", TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
 }
 
 static void
@@ -342,12 +352,15 @@
     case PROP_CURVES_SYMEMETRY:
       bg->curves_symmetry = g_value_get_float (value);
       break;
+    case PROP_STRIPE_WIDTH:
+      bg->stripe_width = g_value_get_float (value);
+      break;
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       return;
   }
-
+  awn_background_invalidate (bg);
   g_signal_emit (object, _bg_signals[CHANGED], 0);
 }
 
@@ -380,6 +393,12 @@
   if (bg->hilight_color) g_object_unref (bg->hilight_color);
   if (bg->sep_color) g_object_unref (bg->sep_color);
 
+  if (bg->helper_surface != NULL)
+  {
+    cairo_surface_finish (bg->helper_surface);
+    cairo_surface_destroy (bg->helper_surface);
+  }
+
   G_OBJECT_CLASS (awn_background_parent_class)->finalize (object);
 }
 
@@ -398,6 +417,7 @@
   klass->get_input_shape_mask = awn_background_mask_none;
   klass->get_path_type        = awn_background_path_default;
   klass->get_strut_offsets    = NULL;
+  klass->get_needs_redraw     = awn_background_get_needs_redraw;
 
   /* Object properties */
   g_object_class_install_property (obj_class,
@@ -575,6 +595,15 @@
                         0.0, 1.0, 0.5,
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
                         G_PARAM_STATIC_STRINGS));
+                        
+  g_object_class_install_property (obj_class,
+    PROP_STRIPE_WIDTH,
+    g_param_spec_float ("stripe-width",
+                        "Stripe Width",
+                        "The width of the stripe",
+                        0.0, 1.0, 0.0,
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+                        G_PARAM_STATIC_STRINGS));
 
   /* Add signals to the class */
   _bg_signals[CHANGED] = 
@@ -650,6 +679,11 @@
   bg->border_color = NULL;
   bg->hilight_color = NULL;
   bg->sep_color = NULL;
+  bg->needs_redraw = TRUE;
+  bg->helper_surface = NULL;
+  bg->cache_enabled = TRUE;
+  bg->last_height = 0;
+  bg->last_width = 0;
 }
 
 void 
@@ -664,8 +698,40 @@
   
   klass = AWN_BACKGROUND_GET_CLASS (bg);
   g_return_if_fail (klass->draw != NULL);
-
-  klass->draw (bg, cr, position, area);
+  
+  /* Check if background caching is enabled - TRUE by default */
+  if (bg->cache_enabled)
+  {
+    g_return_if_fail (klass->get_needs_redraw != NULL);
+    cairo_save (cr);
+    
+    /* Check if background needs to be redrawn */
+    if (klass->get_needs_redraw (bg, position, area))
+    {
+      /* Free last surface */
+      if (bg->helper_surface != NULL)
+      {
+        cairo_surface_finish (bg->helper_surface);
+        cairo_surface_destroy (bg->helper_surface);
+      }
+      /* Create new surface */
+      bg->helper_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                                       area->x + area->width,
+                                                       area->y + area->height);
+      cairo_t* temp_cr = cairo_create (bg->helper_surface);
+      /* Draw background on temp cairo_t */
+      klass->draw (bg, temp_cr, position, area);
+      cairo_destroy (temp_cr);
+    }
+    /* Paint saved surface */
+    cairo_set_source_surface (cr, bg->helper_surface, 0., 0.);
+    cairo_paint(cr);
+    cairo_restore (cr);
+  }
+  else
+  {
+    klass->draw (bg, cr, position, area);
+  }
 }
 
 void 
@@ -1009,4 +1075,25 @@
   return AWN_PATH_LINEAR;
 }
 
+static gboolean awn_background_get_needs_redraw (AwnBackground *bg,
+                                                 GtkPositionType position,
+                                                 GdkRectangle *area)
+{
+  if (bg->needs_redraw == 1 ||
+      bg->last_height != area->height ||
+      bg->last_width != area->width)
+  {
+    bg->needs_redraw = 0;
+    bg->last_height = area->height;
+    bg->last_width = area->width;
+    return TRUE;
+  }
+  return FALSE;
+}
+
+void awn_background_invalidate (AwnBackground  *bg)
+{
+  bg->needs_redraw = 1;
+}
+
 /* vim: set et ts=2 sts=2 sw=2 : */

=== modified file 'src/awn-background.h'
--- src/awn-background.h	2010-03-07 18:38:07 +0000
+++ src/awn-background.h	2010-05-31 17:25:42 +0000
@@ -76,6 +76,15 @@
   gfloat     pattern_alpha;
   GdkPixbuf *pattern_original;
   cairo_surface_t *pattern;
+  
+  /*  Speedup code.
+   *  We can save the bg and redraw only when properties changes
+   */
+  gboolean          cache_enabled;
+  gboolean          needs_redraw;
+  cairo_surface_t*  helper_surface;
+  gint              last_height;
+  gint              last_width;
 
   /* FIXME:
    * These two should ultimately go somewhere else (once we do multiple panels)
@@ -89,6 +98,7 @@
   gint     panel_angle;
   gfloat   curviness;
   gfloat   curves_symmetry;
+  gfloat   stripe_width;
 
   /* private */
   guint    changed;
@@ -129,6 +139,10 @@
                              GdkRectangle *area,
                              gint *strut,
                              gint *strut_start, gint *strut_end);
+                             
+  gboolean (*get_needs_redraw) (AwnBackground *bg,
+                                GtkPositionType position,
+                                GdkRectangle *area);
 
   /*< signals >*/
   void (*changed) (AwnBackground *bg);
@@ -142,6 +156,8 @@
                                GtkPositionType  position,
                                GdkRectangle   *area);
 
+void awn_background_invalidate      (AwnBackground  *bg);
+
 void awn_background_padding_request (AwnBackground *bg,
                                      GtkPositionType position,
                                      guint *padding_top,

=== modified file 'src/awn-defines.h'
--- src/awn-defines.h	2010-02-06 13:34:02 +0000
+++ src/awn-defines.h	2010-05-31 17:25:42 +0000
@@ -87,6 +87,7 @@
 #define AWN_THEME_PANEL_ANGLE      "panel_angle"
 #define AWN_THEME_CURVINESS        "curviness"
 #define AWN_THEME_CURVES_SYMMETRY  "curves_symmetry"
+#define AWN_THEME_STRIPE_WIDTH     "stripe_width"
 
 #endif /*_HAVE_AWN_DEFINES_H */
 

=== modified file 'src/awn-panel.c'
--- src/awn-panel.c	2010-05-29 17:17:22 +0000
+++ src/awn-panel.c	2010-05-31 17:25:42 +0000
@@ -43,6 +43,7 @@
 #include "awn-background-3d.h"
 #include "awn-background-curves.h"
 #include "awn-background-edgy.h"
+#include "awn-background-lucido.h"
 #include "awn-background-floaty.h"
 #include "awn-defines.h"
 #include "awn-marshal.h"
@@ -222,6 +223,7 @@
   STYLE_EDGY,
   STYLE_FLOATY,
 
+  STYLE_LUCIDO,
   STYLE_LAST
 };
 
@@ -1075,6 +1077,9 @@
   }
 
   awn_panel_queue_masks_update (panel);
+
+  if (priv->bg)
+    awn_background_invalidate (priv->bg);
 }
 
 static
@@ -1760,7 +1765,7 @@
   obj_class->finalize      = awn_panel_finalize;
   obj_class->get_property  = awn_panel_get_property;
   obj_class->set_property  = awn_panel_set_property;
-    
+
   cont_class->add          = awn_panel_add;
   
   wid_class->expose_event  = awn_panel_expose;
@@ -3179,6 +3184,9 @@
     case STYLE_EDGY:
       priv->bg = awn_background_edgy_new (priv->client, panel);
       break;
+    case STYLE_LUCIDO:
+      priv->bg = awn_background_lucido_new (priv->client, panel);
+      break;
     case STYLE_FLOATY:
       priv->bg = awn_background_floaty_new (priv->client, panel);
       break;