add missing battery config CPP guard

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index bebab0332127844c467e89e215d003213ab0ade9..f08bcaefb60d70aca49cb24425a6c434843e91cc 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -77,45 +77,6 @@ void cleanup_config()
 }
 
 
-void extract_values (const char *value, char **value1, char **value2, char **value3)
-{
-       char *b=0, *c=0;
-
-       if (*value1) free (*value1);
-       if (*value2) free (*value2);
-       if (*value3) free (*value3);
-
-       if ((b = strchr (value, ' '))) {
-               b[0] = '\0';
-               b++;
-       }
-       else {
-               *value2 = 0;
-               *value3 = 0;
-       }
-       *value1 = strdup (value);
-       g_strstrip(*value1);
-
-       if (b) {
-               if ((c = strchr (b, ' '))) {
-                       c[0] = '\0';
-                       c++;
-               }
-               else {
-                       c = 0;
-                       *value3 = 0;
-               }
-               *value2 = strdup (b);
-               g_strstrip(*value2);
-       }
-
-       if (c) {
-               *value3 = strdup (c);
-               g_strstrip(*value3);
-       }
-}
-
-
 void get_action (char *event, int *action)
 {
        if (strcmp (event, "none") == 0)
@@ -257,7 +218,7 @@ void add_entry (char *key, char *value)
                                if (snapshot_path == 0)
                                        systray_enabled = 1;
                        }
-                       if (panel_items_order[j] == 'C')                        
+                       if (panel_items_order[j] == 'C')
                                clock_enabled = 1;
                }
        }
@@ -523,6 +484,14 @@ void add_entry (char *key, char *value)
                if (value2) panel_config.g_task.area.paddingy = atoi (value2);
                if (value3) panel_config.g_task.area.paddingx = atoi (value3);
        }
+       else if (strcmp (key, "task_align") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               printf("task_align: %s\n", value1);
+               if (strcmp (value1, "left") == 0) panel_config.g_task.align = ALIGN_LEFT;
+               else if (strcmp (value1, "center") == 0) panel_config.g_task.align = ALIGN_CENTER;
+               else if (strcmp (value1, "right") == 0) panel_config.g_task.align = ALIGN_RIGHT;
+               else fprintf(stderr, "Unknown value for task_align: %s\n", value1);
+       }
        else if (strcmp (key, "task_font") == 0) {
                panel_config.g_task.font_desc = pango_font_description_from_string (value);
        }
@@ -557,9 +526,22 @@ void add_entry (char *key, char *value)
                panel_config.g_task.config_background_mask |= (1<<status);
                if (status == TASK_NORMAL) panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
        }
+       // "tooltip" is deprecated but here for backwards compatibility
+       else if (strcmp (key, "task_tooltip") == 0 || strcmp(key, "tooltip") == 0)
+               panel_config.g_task.tooltip_enabled = atoi(value);
 
        /* Systray */
        else if (strcmp (key, "systray_padding") == 0) {
+               if (new_config_file == 0 && systray_enabled == 0) {
+                       systray_enabled = 1;
+                       if (panel_items_order) {
+                               char* tmp = g_strconcat(panel_items_order, "S", NULL);
+                               g_free( panel_items_order );
+                               panel_items_order = tmp;
+                       }
+                       else
+                               panel_items_order = g_strdup("S");
+               }
                extract_values(value, &value1, &value2, &value3);
                systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
                if (value2) systray.area.paddingy = atoi (value2);
@@ -609,15 +591,34 @@ void add_entry (char *key, char *value)
                char *app = strdup(value);
                panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
        }
+       else if (strcmp(key, "launcher_apps_dir") == 0) {
+
+               GList *list = dir_scan_alpha(value, "*.desktop");
+
+               for (list = g_list_first(list); list; list = g_list_next(list)) {
+                       fprintf(stderr, "Add launcher app: %s\n", (const char *)list->data);
+                       panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, (char *)strdup((const char *)list->data));
+               }
+
+               // Cleanup
+               g_list_free_full(list, g_free);
+       }
        else if (strcmp(key, "launcher_icon_theme") == 0) {
                // if XSETTINGS manager running, tint2 use it.
                if (!icon_theme_name)
                        icon_theme_name = strdup(value);
        }
+       else if (strcmp(key, "launcher_icon_asb") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               launcher_alpha = atoi(value1);
+               launcher_saturation = atoi(value2);
+               launcher_brightness = atoi(value3);
+       }
+       else if (strcmp(key, "launcher_tooltip") == 0) {
+               launcher_tooltip_enabled = atoi(value);
+       }
 
        /* Tooltip */
-       else if (strcmp (key, "tooltip") == 0)
-               g_tooltip.enabled = atoi(value);
        else if (strcmp (key, "tooltip_show_timeout") == 0) {
                int timeout_msec = 1000*atof(value);
                g_tooltip.show_timeout_msec = timeout_msec;
@@ -694,6 +695,7 @@ void add_entry (char *key, char *value)
                        }
                }
        }
+#ifdef ENABLE_BATTERY
        else if (strcmp(key, "battery") == 0) {
                if (new_config_file == 0) {
                        battery_enabled = atoi(value);
@@ -708,6 +710,7 @@ void add_entry (char *key, char *value)
                        }
                }
        }
+#endif
        else
                fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);