Small cleanup to code, add comments to explain variables.i783

1 files changed, 107 insertions, 95 deletions

diff --git a/source/widgets/widget.c b/source/widgets/widget.c
index 276d6e6e..1562d3d0 100644
--- a/source/widgets/widget.c
+++ b/source/widgets/widget.c
@@ -218,28 +218,46 @@ void widget_draw ( widget *widget, cairo_t *d )
 
         cairo_restore ( d );
 
-#if 1
         if ( left || top || right || bottom ) {
             cairo_save ( d );
             cairo_translate ( d, widget->x, widget->y );
             cairo_new_path ( d );
             rofi_theme_get_color ( widget, "border-color", d );
-            double minof_tr  =  ( MIN ( right / 2.0, top / 2.0 ) );
-            double minof_tl  =  ( MIN ( left / 2.0, top / 2.0 ) );
-            double minof_br  =  ( MIN ( right / 2.0, bottom / 2.0 ) );
-            double minof_bl  =  ( MIN ( left / 2.0, bottom / 2.0 ) );
-            double radius_im_tl = radius_tl - minof_tl;
-            double radius_im_tr = radius_tr - minof_tr;
-            double radius_im_bl = radius_bl - minof_bl;
-            double radius_im_br = radius_br - minof_br;
-            double offset_tl  = ( radius_im_tl > 0 ) ? ( left  ) +radius_im_tl : left;
-            double offset_tr  = ( radius_im_tr > 0 ) ? ( right ) +radius_im_tr : right;
-            double offset_bl  = ( radius_im_bl > 0 ) ? ( left  ) +radius_im_bl : left;
-            double offset_br  = ( radius_im_br > 0 ) ? ( right ) +radius_im_br : right;
-            double offset_ttl  = ( radius_im_tl > 0 ) ? ( top  ) +radius_im_tl : (radius_tl>0)?top:0;
-            double offset_ttr  = ( radius_im_tr > 0 ) ? ( top  ) +radius_im_tr : (radius_tr>0)?top:0;
-            double offset_bbl  = ( radius_im_bl > 0 ) ? ( bottom) +radius_im_bl : (radius_bl>0)?bottom:0;
-            double offset_bbr  = ( radius_im_br > 0 ) ? ( bottom ) +radius_im_br : (radius_br>0)?bottom:0;
+            // Calculate the different offsets for the corners.
+            double minof_tr  =  MIN ( right / 2.0, top    / 2.0 );
+            double minof_tl  =  MIN ( left  / 2.0, top    / 2.0 );
+            double minof_br  =  MIN ( right / 2.0, bottom / 2.0 );
+            double minof_bl  =  MIN ( left  / 2.0, bottom / 2.0 );
+            // Inner radius
+            double radius_inner_tl = radius_tl - minof_tl;
+            double radius_inner_tr = radius_tr - minof_tr;
+            double radius_inner_bl = radius_bl - minof_bl;
+            double radius_inner_br = radius_br - minof_br;
+
+            // Offsets of the different lines in each corner.
+            //
+            //      |             |
+            //     ttl           ttr
+            //      |             |
+            // -ltl-###############-rtr-
+            //      $             $
+            //      $             $
+            // -lbl-###############-rbr-
+            //      |             |
+            //     bbl           bbr
+            //      |             |
+            //
+            // The left and right part ($) start at thinkness top bottom when no radius
+            double offset_ltl = ( radius_inner_tl > 0 ) ? ( left   ) +radius_inner_tl : left;
+            double offset_rtr = ( radius_inner_tr > 0 ) ? ( right  ) +radius_inner_tr : right;
+            double offset_lbl = ( radius_inner_bl > 0 ) ? ( left   ) +radius_inner_bl : left;
+            double offset_rbr = ( radius_inner_br > 0 ) ? ( right  ) +radius_inner_br : right;
+            // The top and bottom part (#) go into the corner when no radius
+            double offset_ttl = ( radius_inner_tl > 0 ) ? ( top    ) +radius_inner_tl : (radius_tl>0)?top:0;
+            double offset_ttr = ( radius_inner_tr > 0 ) ? ( top    ) +radius_inner_tr : (radius_tr>0)?top:0;
+            double offset_bbl = ( radius_inner_bl > 0 ) ? ( bottom ) +radius_inner_bl : (radius_bl>0)?bottom:0;
+            double offset_bbr = ( radius_inner_br > 0 ) ? ( bottom ) +radius_inner_br : (radius_br>0)?bottom:0;
+
             if ( left > 0 ) {
                 cairo_set_line_width ( d, left );
                 distance_get_linestyle ( widget->border.left, d );
@@ -247,104 +265,98 @@ void widget_draw ( widget *widget, cairo_t *d )
                 cairo_line_to ( d, margin_left + left / 2.0, widget->h - margin_bottom - offset_bbl );
                 cairo_stroke ( d );
             }
-            if ( radius_tl > 0  ) {
-                distance_get_linestyle ( widget->border.left, d );
-                {
-                    cairo_set_line_width ( d, 0 );
-                    double radius_outer = radius_tl + minof_tl;
-                    double radius_inner = radius_tl - minof_tl;
-                    cairo_arc ( d, margin_left + radius_outer, margin_top + radius_outer, radius_outer, -G_PI, -G_PI_2 );
-                    cairo_line_to   ( d, margin_left + offset_tl, margin_top );
-                    cairo_line_to   ( d, margin_left + offset_tl, margin_top + top );
-                    if ( radius_inner > 0 ) {
-                        cairo_arc_negative ( d, margin_left + left + radius_inner, margin_top + top + radius_inner, radius_inner, -G_PI_2, G_PI );
-                        cairo_line_to   ( d, margin_left + left, margin_top + offset_ttl );
-                    }
-                    cairo_line_to   ( d, margin_left, margin_top + offset_ttl );
-                    cairo_close_path ( d );
-                    cairo_fill ( d );
-                }
+            if ( right > 0 ) {
+                cairo_set_line_width ( d, right );
+                distance_get_linestyle ( widget->border.right, d );
+                cairo_move_to ( d, widget->w - margin_right - right / 2.0, margin_top + offset_ttr );
+                cairo_line_to ( d, widget->w - margin_right - right / 2.0, widget->h - margin_bottom - offset_bbr );
+                cairo_stroke ( d );
             }
             if ( top > 0 ) {
                 cairo_set_line_width ( d, top );
                 distance_get_linestyle ( widget->border.top, d );
-                cairo_move_to ( d, margin_left + offset_tl, margin_top + top / 2.0 );
-                cairo_line_to ( d, widget->w - margin_right - offset_tr, margin_top + top / 2.0 );
+                cairo_move_to ( d, margin_left + offset_ltl, margin_top + top / 2.0 );
+                cairo_line_to ( d, widget->w - margin_right - offset_rtr, margin_top + top / 2.0 );
                 cairo_stroke ( d );
             }
-            if ( radius_tr > 0  ) {
-                distance_get_linestyle ( widget->border.right, d );
-                {
-                    cairo_set_line_width ( d, 0 );
-                    double radius_outer = radius_tr + minof_tr;
-                    double radius_inner = radius_tr - minof_tr;
-                    cairo_arc ( d, widget->w - margin_right - radius_outer, margin_top + radius_outer, radius_outer, -G_PI_2, 0 );
-                    cairo_line_to   ( d, widget->w - margin_right,         margin_top + offset_ttr);
-                    cairo_line_to   ( d, widget->w - margin_right - right, margin_top + offset_ttr);
-                    if ( radius_inner > 0 ) {
-                        cairo_arc_negative ( d, widget->w - margin_right - right - radius_inner, margin_top + top + radius_inner, radius_inner, 0, -G_PI_2 );
-                        cairo_line_to   ( d, widget->w - margin_right - offset_tr, margin_top + top );
-                    }
-                    cairo_line_to   ( d, widget->w - margin_right - offset_tr, margin_top );
-                    cairo_close_path ( d );
-                    cairo_fill ( d );
+            if ( bottom > 0 ) {
+                cairo_set_line_width ( d, bottom );
+                distance_get_linestyle ( widget->border.bottom, d );
+                cairo_move_to ( d, margin_left + offset_lbl, widget->h - (bottom / 2.0) - margin_bottom );
+                cairo_line_to ( d, widget->w - margin_right - offset_rbr, widget->h - bottom / 2.0 - margin_bottom );
+                cairo_stroke ( d );
+            }
+            if ( radius_tl > 0  ) {
+                distance_get_linestyle ( widget->border.left, d );
+                cairo_set_line_width ( d, 0 );
+                double radius_outer = radius_tl + minof_tl;
+                cairo_arc ( d, margin_left + radius_outer, margin_top + radius_outer, radius_outer, -G_PI, -G_PI_2 );
+                cairo_line_to   ( d, margin_left + offset_ltl, margin_top );
+                cairo_line_to   ( d, margin_left + offset_ltl, margin_top + top );
+                if ( radius_inner_tl > 0 ) {
+                    cairo_arc_negative ( d,
+                            margin_left + left + radius_inner_tl,
+                            margin_top + top + radius_inner_tl,
+                            radius_inner_tl, -G_PI_2, G_PI );
+                    cairo_line_to   ( d, margin_left + left, margin_top + offset_ttl );
                 }
+                cairo_line_to   ( d, margin_left, margin_top + offset_ttl );
+                cairo_close_path ( d );
+                cairo_fill ( d );
             }
-            if ( right > 0 ) {
-                cairo_set_line_width ( d, right );
+            if ( radius_tr > 0  ) {
                 distance_get_linestyle ( widget->border.right, d );
-                cairo_move_to ( d, widget->w - margin_right - right / 2.0, margin_top + offset_ttr );
-                cairo_line_to ( d, widget->w - margin_right - right / 2.0, widget->h - margin_bottom - offset_bbr );
-                cairo_stroke ( d );
+                cairo_set_line_width ( d, 0 );
+                double radius_outer = radius_tr + minof_tr;
+                cairo_arc ( d, widget->w - margin_right - radius_outer, margin_top + radius_outer, radius_outer, -G_PI_2, 0 );
+                cairo_line_to   ( d, widget->w - margin_right,         margin_top + offset_ttr);
+                cairo_line_to   ( d, widget->w - margin_right - right, margin_top + offset_ttr);
+                if ( radius_inner_tr > 0 ) {
+                    cairo_arc_negative ( d, widget->w - margin_right - right - radius_inner_tr,
+                            margin_top + top + radius_inner_tr,
+                            radius_inner_tr, 0, -G_PI_2 );
+                    cairo_line_to   ( d, widget->w - margin_right - offset_rtr, margin_top + top );
+                }
+                cairo_line_to   ( d, widget->w - margin_right - offset_rtr, margin_top );
+                cairo_close_path ( d );
+                cairo_fill ( d );
             }
             if ( radius_br > 0  ) {
                 distance_get_linestyle ( widget->border.right, d );
-                {
-                    cairo_set_line_width ( d, 1 );
-                    double radius_outer = radius_br + minof_br;
-                    double radius_inner = radius_br - minof_br;
-                    cairo_arc ( d, widget->w - margin_right - radius_outer, widget->h - margin_bottom - radius_outer, radius_outer, 0.0, G_PI_2 );
-                    cairo_line_to   ( d, widget->w - margin_right - offset_br, widget->h - margin_bottom );
-                    cairo_line_to   ( d, widget->w - margin_right - offset_br, widget->h - margin_bottom - bottom );
-                    if ( radius_inner > 0 ){
-                        cairo_arc_negative ( d,
-                                widget->w - margin_right - right - radius_inner,
-                                widget->h - margin_bottom - bottom - radius_inner, radius_inner, G_PI_2, 0.0 );
-                       cairo_line_to   ( d, widget->w - margin_right -right, widget->h - margin_bottom - offset_bbr );
-                    }
-                    cairo_line_to   ( d, widget->w - margin_right, widget->h - margin_bottom - offset_bbr);
-                    cairo_close_path ( d );
-                    cairo_fill ( d );
+                cairo_set_line_width ( d, 1 );
+                double radius_outer = radius_br + minof_br;
+                cairo_arc ( d, widget->w - margin_right - radius_outer, widget->h - margin_bottom - radius_outer, radius_outer, 0.0, G_PI_2 );
+                cairo_line_to   ( d, widget->w - margin_right - offset_rbr, widget->h - margin_bottom );
+                cairo_line_to   ( d, widget->w - margin_right - offset_rbr, widget->h - margin_bottom - bottom );
+                if ( radius_inner_br > 0 ){
+                    cairo_arc_negative ( d, widget->w - margin_right - right - radius_inner_br,
+                            widget->h - margin_bottom - bottom - radius_inner_br,
+                            radius_inner_br, G_PI_2, 0.0 );
+                    cairo_line_to   ( d, widget->w - margin_right -right, widget->h - margin_bottom - offset_bbr );
                 }
-            }
-            if ( bottom > 0 ) {
-                cairo_set_line_width ( d, bottom );
-                distance_get_linestyle ( widget->border.bottom, d );
-                cairo_move_to ( d, margin_left + offset_bl, widget->h - (bottom / 2.0) - margin_bottom );
-                cairo_line_to ( d, widget->w - margin_right - offset_br, widget->h - bottom / 2.0 - margin_bottom );
-                cairo_stroke ( d );
+                cairo_line_to   ( d, widget->w - margin_right, widget->h - margin_bottom - offset_bbr);
+                cairo_close_path ( d );
+                cairo_fill ( d );
             }
             if ( radius_bl > 0  ) {
                 distance_get_linestyle ( widget->border.left, d );
-                {
-                    cairo_set_line_width ( d, 1.0 );
-                    double radius_outer = radius_bl + minof_bl;
-                    double radius_inner = radius_bl - minof_bl;
-                    cairo_arc ( d, margin_left + radius_outer, widget->h - margin_bottom - radius_outer, radius_outer, G_PI_2, G_PI );
-                    cairo_line_to   ( d, margin_left       , widget->h - margin_bottom - offset_bbl );
-                    cairo_line_to   ( d, margin_left + left, widget->h - margin_bottom - offset_bbl );
-                    if ( radius_inner > 0 ) {
-                        cairo_arc_negative ( d, margin_left + left + radius_inner, widget->h - margin_bottom - bottom - radius_inner, radius_inner, G_PI, G_PI_2 );
-                        cairo_line_to   ( d, margin_left + offset_bl, widget->h - margin_bottom - bottom );
-                    }
-                    cairo_line_to   ( d, margin_left + offset_bl, widget->h - margin_bottom );
-                    cairo_close_path ( d );
-                    cairo_fill( d );
+                cairo_set_line_width ( d, 1.0 );
+                double radius_outer = radius_bl + minof_bl;
+                cairo_arc ( d, margin_left + radius_outer, widget->h - margin_bottom - radius_outer, radius_outer, G_PI_2, G_PI );
+                cairo_line_to   ( d, margin_left       , widget->h - margin_bottom - offset_bbl );
+                cairo_line_to   ( d, margin_left + left, widget->h - margin_bottom - offset_bbl );
+                if ( radius_inner_bl > 0 ) {
+                    cairo_arc_negative ( d, margin_left + left + radius_inner_bl,
+                            widget->h - margin_bottom - bottom - radius_inner_bl,
+                            radius_inner_bl, G_PI, G_PI_2 );
+                    cairo_line_to   ( d, margin_left + offset_lbl, widget->h - margin_bottom - bottom );
                 }
+                cairo_line_to   ( d, margin_left + offset_lbl, widget->h - margin_bottom );
+                cairo_close_path ( d );
+                cairo_fill( d );
             }
             cairo_restore ( d );
         }
-#endif
     }
 }
 void widget_free ( widget *wid )