Indent magic, rework makefile so lexer and yacc file are not passed.

1 files changed, 307 insertions, 292 deletions

diff --git a/source/theme.c b/source/theme.c
index ed8b7bd1..0defa28b 100644
--- a/source/theme.c
+++ b/source/theme.c
@@ -10,27 +10,27 @@
 #include "view.h"
 
 /** Logging domain for theme */
-#define LOG_DOMAIN "Theme"
+#define LOG_DOMAIN    "Theme"
 
-void yyerror ( YYLTYPE *ylloc, const char *);
+void yyerror ( YYLTYPE *ylloc, const char * );
 static gboolean distance_compare ( Distance d, Distance e )
 {
-    return ( d.type == e.type && d.distance == e.distance && d.style == e.style );
+    return d.type == e.type && d.distance == e.distance && d.style == e.style;
 }
 
 ThemeWidget *rofi_theme_find_or_create_name ( ThemeWidget *base, const char *name )
 {
-    for ( unsigned int i = 0; i < base->num_widgets;i++){
-        if ( g_strcmp0(base->widgets[i]->name, name) == 0 ){
+    for ( unsigned int i = 0; i < base->num_widgets; i++ ) {
+        if ( g_strcmp0 ( base->widgets[i]->name, name ) == 0 ) {
             return base->widgets[i];
         }
     }
 
-    base->widgets = g_realloc ( base->widgets, sizeof(ThemeWidget*)*(base->num_widgets+1));
-    base->widgets[base->num_widgets] = g_malloc0(sizeof(ThemeWidget));
+    base->widgets                    = g_realloc ( base->widgets, sizeof ( ThemeWidget* ) * ( base->num_widgets + 1 ) );
+    base->widgets[base->num_widgets] = g_malloc0 ( sizeof ( ThemeWidget ) );
     ThemeWidget *retv = base->widgets[base->num_widgets];
     retv->parent = base;
-    retv->name = g_strdup(name);
+    retv->name   = g_strdup ( name );
     base->num_widgets++;
     return retv;
 }
@@ -39,7 +39,7 @@ ThemeWidget *rofi_theme_find_or_create_name ( ThemeWidget *base, const char *nam
  */
 Property *rofi_theme_property_create ( PropertyType type )
 {
-    Property *retv = g_malloc0 ( sizeof(Property) );
+    Property *retv = g_malloc0 ( sizeof ( Property ) );
     retv->type = type;
     return retv;
 }
@@ -51,21 +51,22 @@ void rofi_theme_property_free ( Property *p )
     g_free ( p->name );
     if ( p->type == P_STRING ) {
         g_free ( p->value.s );
-    } else if ( p->type == P_LINK ) {
+    }
+    else if ( p->type == P_LINK ) {
         g_free ( p->value.link.name );
     }
-    g_free(p);
+    g_free ( p );
 }
 
 void rofi_theme_free ( ThemeWidget *widget )
 {
-    if ( widget == NULL ){
+    if ( widget == NULL ) {
         return;
     }
     if ( widget->properties ) {
         g_hash_table_destroy ( widget->properties );
     }
-    for ( unsigned int i = 0; i < widget->num_widgets; i++ ){
+    for ( unsigned int i = 0; i < widget->num_widgets; i++ ) {
         rofi_theme_free ( widget->widgets[i] );
     }
     g_free ( widget->widgets );
@@ -79,14 +80,16 @@ void rofi_theme_free ( ThemeWidget *widget )
 static void rofi_theme_print_distance ( Distance d )
 {
     if ( d.type == PW_PX ) {
-        printf("%upx ", (int)d.distance );
-    } else if ( d.type == PW_PERCENT ) {
-        printf("%f%% ", d.distance );
-    } else {
-        printf("%fem ", d.distance );
+        printf ( "%upx ", (int) d.distance );
+    }
+    else if ( d.type == PW_PERCENT ) {
+        printf ( "%f%% ", d.distance );
+    }
+    else {
+        printf ( "%fem ", d.distance );
     }
     if ( d.style == DASH ) {
-        printf("dash ");
+        printf ( "dash " );
     }
 }
 /** Textual representation of Window Location */
@@ -105,56 +108,59 @@ const char const * WindowLocationStr[9] = {
 static void rofi_theme_print_property_index ( size_t pnl, int depth, Property *p )
 {
     int pl = strlen ( p->name );
-    printf("%*s%s:%*s ", depth, "", p->name, (int)pnl-pl,"" );
+    printf ( "%*s%s:%*s ", depth, "", p->name, (int) pnl - pl, "" );
     switch ( p->type )
     {
-        case P_POSITION:
-            printf("%s;", WindowLocationStr[p->value.i]);
-            break;
-        case P_STRING:
-            printf("\"%s\";", p->value.s);
-            break;
-        case P_INTEGER:
-            printf("%d;", p->value.i);
-            break;
-        case P_DOUBLE:
-            printf("%.2f;", p->value.f);
-            break;
-        case P_BOOLEAN:
-            printf("%s;", p->value.b?"true":"false");
-            break;
-        case P_COLOR:
-            printf("#%02X%02X%02X%02X;",
-                    (unsigned char)(p->value.color.alpha*255.0),
-                    (unsigned char)(p->value.color.red*255.0),
-                    (unsigned char)(p->value.color.green*255.0),
-                    (unsigned char)(p->value.color.blue*255.0));
-            break;
-        case P_PADDING:
-            if ( distance_compare ( p->value.padding.top, p->value.padding.bottom) &&
-                    distance_compare ( p->value.padding.left, p->value.padding.right) &&
-                    distance_compare ( p->value.padding.left, p->value.padding.top) ) {
-                rofi_theme_print_distance ( p->value.padding.left );
-            } else if ( distance_compare ( p->value.padding.top, p->value.padding.bottom) &&
-                    distance_compare ( p->value.padding.left, p->value.padding.right)){
-                rofi_theme_print_distance ( p->value.padding.top );
-                rofi_theme_print_distance ( p->value.padding.left );
-            } else if ( !distance_compare ( p->value.padding.top, p->value.padding.bottom) &&
-                    distance_compare ( p->value.padding.left, p->value.padding.right)){
-                rofi_theme_print_distance ( p->value.padding.top );
-                rofi_theme_print_distance ( p->value.padding.left );
-                rofi_theme_print_distance ( p->value.padding.bottom);
-            } else {
-                rofi_theme_print_distance ( p->value.padding.top );
-                rofi_theme_print_distance ( p->value.padding.right );
-                rofi_theme_print_distance ( p->value.padding.bottom);
-                rofi_theme_print_distance ( p->value.padding.left );
-            }
-            printf(";");
-            break;
-        case P_LINK:
-            printf("%s;", p->value.link.name);
-            break;
+    case P_POSITION:
+        printf ( "%s;", WindowLocationStr[p->value.i] );
+        break;
+    case P_STRING:
+        printf ( "\"%s\";", p->value.s );
+        break;
+    case P_INTEGER:
+        printf ( "%d;", p->value.i );
+        break;
+    case P_DOUBLE:
+        printf ( "%.2f;", p->value.f );
+        break;
+    case P_BOOLEAN:
+        printf ( "%s;", p->value.b ? "true" : "false" );
+        break;
+    case P_COLOR:
+        printf ( "#%02X%02X%02X%02X;",
+                 (unsigned char) ( p->value.color.alpha * 255.0 ),
+                 (unsigned char) ( p->value.color.red * 255.0 ),
+                 (unsigned char) ( p->value.color.green * 255.0 ),
+                 (unsigned char) ( p->value.color.blue * 255.0 ) );
+        break;
+    case P_PADDING:
+        if ( distance_compare ( p->value.padding.top, p->value.padding.bottom ) &&
+             distance_compare ( p->value.padding.left, p->value.padding.right ) &&
+             distance_compare ( p->value.padding.left, p->value.padding.top ) ) {
+            rofi_theme_print_distance ( p->value.padding.left );
+        }
+        else if ( distance_compare ( p->value.padding.top, p->value.padding.bottom ) &&
+                  distance_compare ( p->value.padding.left, p->value.padding.right ) ) {
+            rofi_theme_print_distance ( p->value.padding.top );
+            rofi_theme_print_distance ( p->value.padding.left );
+        }
+        else if ( !distance_compare ( p->value.padding.top, p->value.padding.bottom ) &&
+                  distance_compare ( p->value.padding.left, p->value.padding.right ) ) {
+            rofi_theme_print_distance ( p->value.padding.top );
+            rofi_theme_print_distance ( p->value.padding.left );
+            rofi_theme_print_distance ( p->value.padding.bottom );
+        }
+        else {
+            rofi_theme_print_distance ( p->value.padding.top );
+            rofi_theme_print_distance ( p->value.padding.right );
+            rofi_theme_print_distance ( p->value.padding.bottom );
+            rofi_theme_print_distance ( p->value.padding.left );
+        }
+        printf ( ";" );
+        break;
+    case P_LINK:
+        printf ( "%s;", p->value.link.name );
+        break;
     }
     putchar ( '\n' );
 }
@@ -162,52 +168,51 @@ static void rofi_theme_print_property_index ( size_t pnl, int depth, Property *p
 static void rofi_theme_print_index ( ThemeWidget *widget )
 {
     GHashTableIter iter;
-    gpointer key, value;
-    if ( widget->properties ){
-        int index = 0;
-        GList *list = NULL;
-        ThemeWidget *w = widget;
-        while ( w){
-            if ( g_strcmp0(w->name,"Root") == 0 ) {
+    gpointer       key, value;
+    if ( widget->properties ) {
+        int         index = 0;
+        GList       *list = NULL;
+        ThemeWidget *w    = widget;
+        while ( w ) {
+            if ( g_strcmp0 ( w->name, "Root" ) == 0 ) {
                 break;
             }
             list = g_list_prepend ( list, w->name );
-            w = w->parent;
+            w    = w->parent;
         }
         if ( g_list_length ( list ) > 0 ) {
             index = 4;
             for ( GList *iter = g_list_first ( list ); iter != NULL; iter = g_list_next ( iter ) ) {
-                char *name = (char *)iter->data;
-                if ( iter->prev == NULL ){
+                char *name = (char *) iter->data;
+                if ( iter->prev == NULL ) {
                     putchar ( '#' );
                 }
-                fputs(name, stdout);
+                fputs ( name, stdout );
                 if ( iter->next ) {
-                    putchar('.');
+                    putchar ( '.' );
                 }
             }
-            printf(" {\n");
-        } else {
+            printf ( " {\n" );
+        }
+        else {
             index = 4;
-            printf("* {\n");
+            printf ( "* {\n" );
         }
         size_t property_name_length = 0;
-        g_hash_table_iter_init (&iter, widget->properties);
-        while (g_hash_table_iter_next (&iter, &key, &value))
-        {
-            Property *p = (Property*)value;
-            property_name_length = MAX ( strlen (p->name), property_name_length );
+        g_hash_table_iter_init ( &iter, widget->properties );
+        while ( g_hash_table_iter_next ( &iter, &key, &value ) ) {
+            Property *p = (Property *) value;
+            property_name_length = MAX ( strlen ( p->name ), property_name_length );
         }
-        g_hash_table_iter_init (&iter, widget->properties);
-        while (g_hash_table_iter_next (&iter, &key, &value))
-        {
-            Property *p = (Property*)value;
+        g_hash_table_iter_init ( &iter, widget->properties );
+        while ( g_hash_table_iter_next ( &iter, &key, &value ) ) {
+            Property *p = (Property *) value;
             rofi_theme_print_property_index ( property_name_length, index, p );
         }
-        printf("}\n");
+        printf ( "}\n" );
         g_list_free ( list );
     }
-    for ( unsigned int i = 0; i < widget->num_widgets;i++){
+    for ( unsigned int i = 0; i < widget->num_widgets; i++ ) {
         rofi_theme_print_index ( widget->widgets[i] );
     }
 }
@@ -219,12 +224,12 @@ void rofi_theme_print ( ThemeWidget *widget )
 /**
  * Main lex parser.
  */
-int yyparse();
+int yyparse ();
 
 /**
  * Destroy the internal of lex parser.
  */
-void yylex_destroy( void );
+void yylex_destroy ( void );
 
 /**
  * Global handle input file to flex parser.
@@ -237,16 +242,17 @@ extern FILE* yyin;
  *
  * Error handler for the lex parser.
  */
-void yyerror(YYLTYPE *yylloc, const char* s) {
-	fprintf(stderr, "Parse error: %s\n", s);
-    fprintf(stderr, "From line %d column %d to line %d column %d\n", yylloc->first_line, yylloc->first_column, yylloc->last_line, yylloc->last_column);
-	exit(EXIT_FAILURE);
+void yyerror ( YYLTYPE *yylloc, const char* s )
+{
+    fprintf ( stderr, "Parse error: %s\n", s );
+    fprintf ( stderr, "From line %d column %d to line %d column %d\n", yylloc->first_line, yylloc->first_column, yylloc->last_line, yylloc->last_column );
+    exit ( EXIT_FAILURE );
 }
 
-static gboolean rofi_theme_steal_property_int ( gpointer key, gpointer value, gpointer user_data)
+static gboolean rofi_theme_steal_property_int ( gpointer key, gpointer value, gpointer user_data )
 {
-    GHashTable *table = (GHashTable*)user_data;
-    g_hash_table_replace ( table, key, value);
+    GHashTable *table = (GHashTable *) user_data;
+    g_hash_table_replace ( table, key, value );
     return TRUE;
 }
 void rofi_theme_widget_add_properties ( ThemeWidget *widget, GHashTable *table )
@@ -254,7 +260,7 @@ void rofi_theme_widget_add_properties ( ThemeWidget *widget, GHashTable *table )
     if ( table == NULL ) {
         return;
     }
-    if ( widget->properties == NULL ){
+    if ( widget->properties == NULL ) {
         widget->properties = table;
         return;
     }
@@ -262,40 +268,40 @@ void rofi_theme_widget_add_properties ( ThemeWidget *widget, GHashTable *table )
     g_hash_table_destroy ( table );
 }
 
-
 /**
  * Public API
  */
 
-static ThemeWidget *rofi_theme_find_single ( ThemeWidget *widget, const char *name)
+static ThemeWidget *rofi_theme_find_single ( ThemeWidget *widget, const char *name )
 {
-    for ( unsigned int j = 0; j < widget->num_widgets;j++){
-        if ( g_strcmp0(widget->widgets[j]->name, name ) == 0 ){
+    for ( unsigned int j = 0; j < widget->num_widgets; j++ ) {
+        if ( g_strcmp0 ( widget->widgets[j]->name, name ) == 0 ) {
             return widget->widgets[j];
         }
     }
     return widget;
 }
 
-static ThemeWidget *rofi_theme_find ( ThemeWidget *widget , const char *name, const gboolean exact )
+static ThemeWidget *rofi_theme_find ( ThemeWidget *widget, const char *name, const gboolean exact )
 {
-    if ( widget  == NULL  || name == NULL ) {
+    if ( widget == NULL || name == NULL ) {
         return widget;
     }
-    char **names = g_strsplit ( name, "." , 0 );
-    int found = TRUE;
-    for ( unsigned int i = 0; found && names && names[i]; i++ ){
+    char **names = g_strsplit ( name, ".", 0 );
+    int  found   = TRUE;
+    for ( unsigned int i = 0; found && names && names[i]; i++ ) {
         found = FALSE;
-        ThemeWidget *f = rofi_theme_find_single ( widget, names[i]);
-        if ( f != widget ){
+        ThemeWidget *f = rofi_theme_find_single ( widget, names[i] );
+        if ( f != widget ) {
             widget = f;
-            found = TRUE;
+            found  = TRUE;
         }
     }
-    g_strfreev(names);
-    if ( !exact || found ){
+    g_strfreev ( names );
+    if ( !exact || found ) {
         return widget;
-    } else {
+    }
+    else {
         return NULL;
     }
 }
@@ -303,24 +309,25 @@ static ThemeWidget *rofi_theme_find ( ThemeWidget *widget , const char *name, co
 static void rofi_theme_resolve_link_property ( Property *p, int depth )
 {
     // Set name, remove '@' prefix.
-    const char *name = p->value.link.name +1;
-    if ( depth > 20 ){
-        g_log ( LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Found more then 20 redirects for property. Stopping.");
+    const char *name = p->value.link.name + 1;
+    if ( depth > 20 ) {
+        g_log ( LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Found more then 20 redirects for property. Stopping." );
         p->value.link.ref = p;
         return;
     }
 
-    if( g_hash_table_contains ( rofi_theme->properties, name ) ) {
+    if ( g_hash_table_contains ( rofi_theme->properties, name ) ) {
         Property *pr = g_hash_table_lookup ( rofi_theme->properties, name );
         if ( pr->type == P_LINK ) {
             if ( pr->value.link.ref == NULL ) {
-                rofi_theme_resolve_link_property ( pr, depth+1);
+                rofi_theme_resolve_link_property ( pr, depth + 1 );
             }
-            if ( pr->value.link.ref != pr ){
+            if ( pr->value.link.ref != pr ) {
                 p->value.link.ref = pr->value.link.ref;
                 return;
             }
-        } else {
+        }
+        else {
             p->value.link.ref = pr;
             return;
         }
@@ -333,22 +340,22 @@ static void rofi_theme_resolve_link_property ( Property *p, int depth )
 static Property *rofi_theme_find_property ( ThemeWidget *widget, PropertyType type, const char *property, gboolean exact )
 {
     while ( widget ) {
-        if ( widget->properties && g_hash_table_contains ( widget->properties, property) ) {
-            Property *p = g_hash_table_lookup ( widget->properties, property);
+        if ( widget->properties && g_hash_table_contains ( widget->properties, property ) ) {
+            Property *p = g_hash_table_lookup ( widget->properties, property );
             if ( p->type == P_LINK ) {
                 if ( p->value.link.ref == NULL ) {
                     // Resolve link.
                     rofi_theme_resolve_link_property ( p, 0 );
                 }
-                if ( p->value.link.ref->type == type ){
+                if ( p->value.link.ref->type == type ) {
                     return p->value.link.ref;
                 }
             }
-            if ( p->type == type ){
+            if ( p->type == type ) {
                 return p;
             }
             // Padding and integer can be converted.
-            if ( p->type == P_INTEGER && type == P_PADDING ){
+            if ( p->type == P_INTEGER && type == P_PADDING ) {
                 return p;
             }
         }
@@ -371,125 +378,129 @@ static ThemeWidget *rofi_theme_find_widget ( const char *name, const char *state
 int rofi_theme_get_position ( const widget *widget, const char *property, int def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_POSITION, property, FALSE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_POSITION, property, FALSE );
+    if ( p ) {
         return p->value.i;
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return def;
 }
 
 int rofi_theme_get_integer ( const widget *widget, const char *property, int def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_INTEGER, property, FALSE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_INTEGER, property, FALSE );
+    if ( p ) {
         return p->value.i;
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return def;
 }
 int rofi_theme_get_integer_exact ( const widget *widget, const char *property, int def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, TRUE );
-    Property *p = rofi_theme_find_property ( wid, P_INTEGER, property, TRUE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_INTEGER, property, TRUE );
+    if ( p ) {
         return p->value.i;
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return def;
 }
 
 Distance rofi_theme_get_distance ( const widget *widget, const char *property, int def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_PADDING, property, FALSE );
-    if ( p ){
-        if ( p->type == P_INTEGER ){
-            return (Distance){p->value.i,PW_PX, SOLID};
-        } else {
+    Property    *p   = rofi_theme_find_property ( wid, P_PADDING, property, FALSE );
+    if ( p ) {
+        if ( p->type == P_INTEGER ) {
+            return (Distance){ p->value.i, PW_PX, SOLID };
+        }
+        else {
             return p->value.padding.left;
         }
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
-    return (Distance){def, PW_PX, SOLID};
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
+    return (Distance){ def, PW_PX, SOLID };
 }
 
 int rofi_theme_get_boolean ( const widget *widget, const char *property, int def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_BOOLEAN, property, FALSE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_BOOLEAN, property, FALSE );
+    if ( p ) {
         return p->value.b;
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return def;
 }
 
 char *rofi_theme_get_string ( const widget *widget, const char *property, char *def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_STRING, property, FALSE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_STRING, property, FALSE );
+    if ( p ) {
         return p->value.s;
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return def;
 }
 double rofi_theme_get_double ( const widget *widget, const char *property, double def )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_DOUBLE, property, FALSE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_DOUBLE, property, FALSE );
+    if ( p ) {
         return p->value.b;
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return def;
 }
-void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t *d)
+void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t *d )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_COLOR, property, FALSE );
-    if ( p ){
+    Property    *p   = rofi_theme_find_property ( wid, P_COLOR, property, FALSE );
+    if ( p ) {
         cairo_set_source_rgba ( d,
-                p->value.color.red,
-                p->value.color.green,
-                p->value.color.blue,
-                p->value.color.alpha
-                );
-    } else {
-        g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+                                p->value.color.red,
+                                p->value.color.green,
+                                p->value.color.blue,
+                                p->value.color.alpha
+                                );
+    }
+    else {
+        g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     }
 }
 Padding rofi_theme_get_padding ( const widget *widget, const char *property, Padding pad )
 {
     ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE );
-    Property *p = rofi_theme_find_property ( wid, P_PADDING, property, FALSE );
-    if ( p ){
-        if ( p->type == P_PADDING ){
+    Property    *p   = rofi_theme_find_property ( wid, P_PADDING, property, FALSE );
+    if ( p ) {
+        if ( p->type == P_PADDING ) {
             pad = p->value.padding;
-        } else {
-            Distance d = (Distance){p->value.i, PW_PX, SOLID};
-            return (Padding){d,d,d,d};
+        }
+        else {
+            Distance d = (Distance){ p->value.i, PW_PX, SOLID };
+            return (Padding){ d, d, d, d };
         }
     }
-    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state?widget->state:"", property );
+    g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );
     return pad;
 }
 int distance_get_pixel ( Distance d, Orientation ori )
 {
-    if ( d.type == PW_EM ){
-        return d.distance*textbox_get_estimated_char_height();
-    } else if ( d.type == PW_PERCENT ) {
-        if ( ori == ORIENTATION_VERTICAL ){
+    if ( d.type == PW_EM ) {
+        return d.distance * textbox_get_estimated_char_height ();
+    }
+    else if ( d.type == PW_PERCENT ) {
+        if ( ori == ORIENTATION_VERTICAL ) {
             int height = 0;
             rofi_view_get_current_monitor ( NULL, &height );
-            return (d.distance*height)/(100.0);
-        } else {
+            return ( d.distance * height ) / ( 100.0 );
+        }
+        else {
             int width = 0;
             rofi_view_get_current_monitor ( &width, NULL );
-            return (d.distance*width)/(100.0);
-
+            return ( d.distance * width ) / ( 100.0 );
         }
     }
     return d.distance;
@@ -497,11 +508,12 @@ int distance_get_pixel ( Distance d, Orientation ori )
 
 void distance_get_linestyle ( Distance d, cairo_t *draw )
 {
-    if ( d.style == DASH ){
+    if ( d.style == DASH ) {
         const double dashes[1] = { 4 };
         cairo_set_dash ( draw, dashes, 1, 0.0 );
-    } else {
-        cairo_set_dash ( draw, NULL, 0, 0.0);
+    }
+    else {
+        cairo_set_dash ( draw, NULL, 0, 0.0 );
     }
 }
 
@@ -509,9 +521,9 @@ void distance_get_linestyle ( Distance d, cairo_t *draw )
 
 static Property* rofi_theme_convert_get_color ( const char *color, const char *name )
 {
-    Color c = color_get ( color );
+    Color    c  = color_get ( color );
     Property *p = rofi_theme_property_create ( P_COLOR );
-    p->name = g_strdup(name);
+    p->name              = g_strdup ( name );
     p->value.color.alpha = c.alpha;
     p->value.color.red   = c.red;
     p->value.color.green = c.green;
@@ -522,130 +534,131 @@ static Property* rofi_theme_convert_get_color ( const char *color, const char *n
 static void rofi_theme_convert_create_property_ht ( ThemeWidget *widget )
 {
     if ( widget->properties == NULL ) {
-        widget->properties = g_hash_table_new_full ( g_str_hash, g_str_equal, NULL, (GDestroyNotify)rofi_theme_property_free );
+        widget->properties = g_hash_table_new_full ( g_str_hash, g_str_equal, NULL, (GDestroyNotify) rofi_theme_property_free );
     }
 }
 
 void rofi_theme_convert_old_theme ( void )
 {
-    if ( rofi_theme != NULL ){
+    if ( rofi_theme != NULL ) {
         return;
     }
-    rofi_theme = (ThemeWidget*)g_malloc0 ( sizeof ( ThemeWidget ) );
+    rofi_theme       = (ThemeWidget *) g_malloc0 ( sizeof ( ThemeWidget ) );
     rofi_theme->name = g_strdup ( "Root" );
     rofi_theme_convert_create_property_ht ( rofi_theme );
-    ThemeWidget *window_widget = rofi_theme_find_or_create_name ( rofi_theme , "window" );
+    ThemeWidget *window_widget = rofi_theme_find_or_create_name ( rofi_theme, "window" );
     rofi_theme_convert_create_property_ht ( window_widget );
     ThemeWidget *mainbox_widget = rofi_theme_find_or_create_name ( window_widget, "mainbox" );
     rofi_theme_convert_create_property_ht ( mainbox_widget );
-    ThemeWidget *message = rofi_theme_find_or_create_name ( mainbox_widget, "message" );
+    ThemeWidget *message     = rofi_theme_find_or_create_name ( mainbox_widget, "message" );
     ThemeWidget *message_box = rofi_theme_find_or_create_name ( message, "box" );
     rofi_theme_convert_create_property_ht ( message_box );
     ThemeWidget *listview_widget = rofi_theme_find_or_create_name ( mainbox_widget, "listview" );
     rofi_theme_convert_create_property_ht ( listview_widget );
-    ThemeWidget *sidebar_widget = rofi_theme_find_or_create_name ( mainbox_widget, "sidebar" );
+    ThemeWidget *sidebar_widget    = rofi_theme_find_or_create_name ( mainbox_widget, "sidebar" );
     ThemeWidget *sidebarbox_widget = rofi_theme_find_or_create_name ( sidebar_widget, "box" );
     rofi_theme_convert_create_property_ht ( sidebarbox_widget );
     {
         Property *p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup ("border");
+        p->name    = g_strdup ( "border" );
         p->value.i = 0;
-        g_hash_table_replace ( mainbox_widget->properties, p->name, p);
+        g_hash_table_replace ( mainbox_widget->properties, p->name, p );
 
-        p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup ("padding");
+        p          = rofi_theme_property_create ( P_INTEGER );
+        p->name    = g_strdup ( "padding" );
         p->value.i = config.padding;
-        g_hash_table_replace ( window_widget->properties, p->name, p);
+        g_hash_table_replace ( window_widget->properties, p->name, p );
 
-        p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup ("padding");
+        p          = rofi_theme_property_create ( P_INTEGER );
+        p->name    = g_strdup ( "padding" );
         p->value.i = 0;
-        g_hash_table_replace ( mainbox_widget->properties, p->name, p);
+        g_hash_table_replace ( mainbox_widget->properties, p->name, p );
         // Spacing
-        p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup("spacing");
+        p          = rofi_theme_property_create ( P_INTEGER );
+        p->name    = g_strdup ( "spacing" );
         p->value.i = config.line_margin;
         g_hash_table_replace ( rofi_theme->properties, p->name, p );
     }
     {
         // Background
         Property *p = rofi_theme_property_create ( P_COLOR );
-        p->name = g_strdup("background");
+        p->name              = g_strdup ( "background" );
         p->value.color.alpha = 0;
-        p->value.color.red = 0;
-        p->value.color.green= 0;
-        p->value.color.blue= 0;
+        p->value.color.red   = 0;
+        p->value.color.green = 0;
+        p->value.color.blue  = 0;
         g_hash_table_replace ( rofi_theme->properties, p->name, p );
 
         ThemeWidget *inputbar_widget = rofi_theme_find_or_create_name ( mainbox_widget, "inputbar" );
         rofi_theme_convert_create_property_ht ( inputbar_widget );
-        p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup("spacing");
+        p          = rofi_theme_property_create ( P_INTEGER );
+        p->name    = g_strdup ( "spacing" );
         p->value.i = 0;
         g_hash_table_replace ( inputbar_widget->properties, p->name, p );
 
-
-        LineStyle style = (g_strcmp0(config.separator_style,"dash") == 0)?DASH:SOLID;
-        int place_end = ( config.location == WL_SOUTH_EAST || config.location == WL_SOUTH || config.location == WL_SOUTH_WEST );
-        p = rofi_theme_property_create ( P_PADDING );
-        p->name = g_strdup("border");
-        Distance d = (Distance){config.menu_bw, PW_PX, style};
-        if ( place_end ){
-            p->value.padding.bottom= d;
-        } else {
-            p->value.padding.top= d;
+        LineStyle style     = ( g_strcmp0 ( config.separator_style, "dash" ) == 0 ) ? DASH : SOLID;
+        int       place_end = ( config.location == WL_SOUTH_EAST || config.location == WL_SOUTH || config.location == WL_SOUTH_WEST );
+        p       = rofi_theme_property_create ( P_PADDING );
+        p->name = g_strdup ( "border" );
+        Distance d = (Distance){ config.menu_bw, PW_PX, style };
+        if ( place_end ) {
+            p->value.padding.bottom = d;
+        }
+        else {
+            p->value.padding.top = d;
         }
         g_hash_table_replace ( listview_widget->properties, p->name, p );
 
-
-        p = rofi_theme_property_create ( P_PADDING );
-        p->name = g_strdup("border");
-        d = (Distance){config.menu_bw, PW_PX, style};
-        if ( place_end ){
-            p->value.padding.bottom= d;
-        } else {
-            p->value.padding.top= d;
+        p       = rofi_theme_property_create ( P_PADDING );
+        p->name = g_strdup ( "border" );
+        d       = (Distance){ config.menu_bw, PW_PX, style };
+        if ( place_end ) {
+            p->value.padding.bottom = d;
+        }
+        else {
+            p->value.padding.top = d;
         }
         g_hash_table_replace ( message_box->properties, p->name, p );
 
         /**
          * Sidebar top
          */
-        p = rofi_theme_property_create ( P_PADDING );
-        p->name = g_strdup("border");
-        d = (Distance){config.menu_bw, PW_PX, style};
-        p->value.padding.top= d;
+        p                    = rofi_theme_property_create ( P_PADDING );
+        p->name              = g_strdup ( "border" );
+        d                    = (Distance){ config.menu_bw, PW_PX, style };
+        p->value.padding.top = d;
         g_hash_table_replace ( sidebarbox_widget->properties, p->name, p );
 
-        p = rofi_theme_property_create ( P_PADDING );
-        p->name = g_strdup("padding");
-        d = (Distance){config.line_margin, PW_PX, SOLID};
-        if ( place_end ){
-            p->value.padding.bottom= d;
-        } else {
-            p->value.padding.top= d;
+        p       = rofi_theme_property_create ( P_PADDING );
+        p->name = g_strdup ( "padding" );
+        d       = (Distance){ config.line_margin, PW_PX, SOLID };
+        if ( place_end ) {
+            p->value.padding.bottom = d;
+        }
+        else {
+            p->value.padding.top = d;
         }
         g_hash_table_replace ( listview_widget->properties, p->name, p );
 
-        p = rofi_theme_property_create ( P_PADDING );
-        p->name = g_strdup("padding");
-        d = (Distance){config.line_margin, PW_PX, SOLID};
-        if ( place_end ){
-            p->value.padding.bottom= d;
-        } else {
-            p->value.padding.top= d;
+        p       = rofi_theme_property_create ( P_PADDING );
+        p->name = g_strdup ( "padding" );
+        d       = (Distance){ config.line_margin, PW_PX, SOLID };
+        if ( place_end ) {
+            p->value.padding.bottom = d;
+        }
+        else {
+            p->value.padding.top = d;
         }
         g_hash_table_replace ( message_box->properties, p->name, p );
-
     }
     {
         Property *p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup("columns");
+        p->name    = g_strdup ( "columns" );
         p->value.i = config.menu_columns;
         g_hash_table_replace ( listview_widget->properties, p->name, p );
-        p = rofi_theme_property_create ( P_INTEGER );
-        p->name = g_strdup("fixed-height");
-        p->value.i = !(config.fixed_num_lines);
+        p          = rofi_theme_property_create ( P_INTEGER );
+        p->name    = g_strdup ( "fixed-height" );
+        p->value.i = !( config.fixed_num_lines );
         g_hash_table_replace ( listview_widget->properties, p->name, p );
     }