X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=d861ba5672d02cd13a27722f7eb76f706dacc5df;hb=1611dbe84b2dbf03cd4dfe857a24d1b564e7fb91;hp=272bdcf9865888676d42828cd19db04a728e17c1;hpb=2e6b12080e5187b0e0db377cd4df22405119e5b8;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 272bdcf..d861ba5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -40,6 +40,7 @@
 #include "taskbar.h"
 #include "systraybar.h"
 #include "clock.h"
+#include "battery.h"
 #include "panel.h"
 #include "config.h"
 #include "window.h"
@@ -53,6 +54,8 @@ static char *old_time1_font;
 static char *old_time2_font;
 static Area *area_task, *area_task_active;
 
+static char *old_bat1_font;
+static char *old_bat2_font;
 
 // temporary panel
 static Panel *panel_config = 0;
@@ -306,6 +309,50 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->area.pix.border, &a->pix.border, sizeof(Border));
    }
 
+   /* Battery */
+   else if (strcmp (key, "battery") == 0) {
+		if(atoi(value) == 1)
+			panel_config->battery.area.on_screen = 1;
+   }
+   else if (strcmp (key, "battery_low_status") == 0) {
+		battery_low_status = atoi(value);
+		if(battery_low_status < 0 || battery_low_status > 100)
+			battery_low_status = 0;
+   }
+   else if (strcmp (key, "battery_low_cmd") == 0) {
+      if (battery_low_cmd) g_free(battery_low_cmd);
+      if (strlen(value) > 0) battery_low_cmd = strdup (value);
+      else battery_low_cmd = 0;
+   }
+   else if (strcmp (key, "bat1_font") == 0) {
+   	if (save_file_config) old_bat1_font = strdup (value);
+      if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
+      bat1_font_desc = pango_font_description_from_string (value);
+   }
+   else if (strcmp (key, "bat2_font") == 0) {
+   	if (save_file_config) old_bat2_font = strdup (value);
+      if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
+      bat2_font_desc = pango_font_description_from_string (value);
+   }
+   else if (strcmp (key, "battery_font_color") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+      get_color (value1, panel_config->battery.font.color);
+      if (value2) panel_config->battery.font.alpha = (atoi (value2) / 100.0);
+      else panel_config->battery.font.alpha = 0.5;
+   }
+   else if (strcmp (key, "battery_padding") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+      panel_config->battery.area.paddingxlr = panel_config->battery.area.paddingx = atoi (value1);
+      if (value2) panel_config->battery.area.paddingy = atoi (value2);
+      if (value3) panel_config->battery.area.paddingx = atoi (value3);
+   }
+   else if (strcmp (key, "battery_background_id") == 0) {
+      int id = atoi (value);
+      Area *a = g_slist_nth_data(list_back, id);
+      memcpy(&panel_config->battery.area.pix.back, &a->pix.back, sizeof(Color));
+      memcpy(&panel_config->battery.area.pix.border, &a->pix.border, sizeof(Border));
+   }
+
    /* Clock */
    else if (strcmp (key, "time1_format") == 0) {
       if (time1_format) g_free(time1_format);
@@ -586,9 +633,10 @@ void config_finish ()
 	// clock and systray before taskbar because resize(clock) can resize others object ??
    init_panel();
 	init_clock();
+	init_battery();
 	init_systray();
-   init_taskbar();
-   visible_object();
+	init_taskbar();
+	visible_object();
 
 	cleanup_config();
 
@@ -758,6 +806,12 @@ void save_config ()
    fputs("task_background_id = 2\n", fp);
    fputs("task_active_background_id = 3\n", fp);
 
+   fputs("\n#---------------------------------------------\n", fp);
+   fputs("# SYSTRAYBAR\n", fp);
+   fputs("#---------------------------------------------\n", fp);
+   fputs("systray_padding = 4 3 4\n", fp);
+   fputs("systray_background_id = 0\n", fp);
+
    fputs("\n#---------------------------------------------\n", fp);
    fputs("# CLOCK\n", fp);
    fputs("#---------------------------------------------\n", fp);
@@ -771,6 +825,18 @@ void save_config ()
    fputs("clock_padding = 2 2\n", fp);
    fputs("clock_background_id = 0\n", fp);
 
+	fputs("\n#---------------------------------------------\n", fp);
+	fputs("# BATTERY\n", fp);
+	fputs("#---------------------------------------------\n", fp);
+	fprintf(fp, "battery = %d\n", panel_config->battery.area.on_screen);
+	fprintf(fp, "battery_low_status = %d\n", battery_low_status);
+	fprintf(fp, "battery_low_cmd = %s\n", battery_low_cmd);
+	fprintf(fp, "bat1_font = %s\n", old_bat1_font);
+	fprintf(fp, "bat2_font = %s\n", old_bat2_font);
+	fprintf(fp, "battery_font_color = #%02x%02x%02x %d\n", (int)(panel_config->battery.font.color[0]*255), (int)(panel_config->battery.font.color[1]*255), (int)(panel_config->battery.font.color[2]*255), (int)(panel_config->battery.font.alpha*100));
+	fputs("battery_padding = 2 2\n", fp);
+	fputs("battery_background_id = 0\n", fp);
+
    fputs("\n#---------------------------------------------\n", fp);
    fputs("# MOUSE ACTION ON TASK\n", fp);
    fputs("#---------------------------------------------\n", fp);