X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=0a1d13a18bf66c8e0eeee5e42c7d6d3136f2ba19;hb=3dda49f22f1c317f3eb7e738e8f14c394f6d9d37;hp=f93faf572a124de89d77c86b04985f3eba1e6a5f;hpb=da65866b2388391052e3ce95818c1d5ebd2b26b5;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index f93faf5..0a1d13a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -44,6 +44,11 @@
 #include "config.h"
 #include "window.h"
 
+#ifdef ENABLE_BATTERY
+#include "battery.h"
+#endif
+
+
 // --------------------------------------------------
 // backward compatibility
 static int save_file_config;
@@ -53,6 +58,10 @@ static char *old_time1_font;
 static char *old_time2_font;
 static Area *area_task, *area_task_active;
 
+#ifdef ENABLE_BATTERY
+static char *old_bat1_font;
+static char *old_bat2_font;
+#endif
 
 // temporary panel
 static Panel *panel_config = 0;
@@ -72,6 +81,9 @@ void init_config()
    list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
 	panel_config = calloc(1, sizeof(Panel));
+	// window manager's menu default value == false
+	wm_menu = 0;
+	max_tick_urgent = 7;
 }
 
 
@@ -286,9 +298,12 @@ void add_entry (char *key, char *value)
    else if (strcmp (key, "panel_position") == 0) {
       extract_values(value, &value1, &value2, &value3);
       if (strcmp (value1, "top") == 0) panel_position = TOP;
-      else panel_position = BOTTOM;
+      else {
+			if (strcmp (value1, "bottom") == 0) panel_position = BOTTOM;
+			else panel_position = CENTER;
+		}
 
-      if (!value2) panel_position = CENTER;
+      if (!value2) panel_position |= CENTER;
       else {
          if (strcmp (value2, "left") == 0) panel_position |= LEFT;
          else {
@@ -296,6 +311,11 @@ void add_entry (char *key, char *value)
             else panel_position |= CENTER;
          }
       }
+      if (!value3) panel_horizontal = 1;
+      else {
+         if (strcmp (value3, "vertical") == 0) panel_horizontal = 0;
+         else panel_horizontal = 1;
+		}
    }
    else if (strcmp (key, "font_shadow") == 0)
       panel_config->g_task.font_shadow = atoi (value);
@@ -305,12 +325,85 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->area.pix.back, &a->pix.back, sizeof(Color));
       memcpy(&panel_config->area.pix.border, &a->pix.border, sizeof(Border));
    }
+   else if (strcmp (key, "wm_menu") == 0)
+      wm_menu = atoi (value);
+   else if (strcmp (key, "urgent_nb_of_blink") == 0)
+      max_tick_urgent = (atoi (value) * 2) + 1;
+
+   /* Battery */
+   else if (strcmp (key, "battery") == 0) {
+#ifdef ENABLE_BATTERY
+		if(atoi(value) == 1)
+			panel_config->battery.area.on_screen = 1;
+#else
+		if(atoi(value) == 1)
+			printf("tint2 is build without battery support\n");
+#endif
+   }
+   else if (strcmp (key, "battery_low_status") == 0) {
+#ifdef ENABLE_BATTERY
+		battery_low_status = atoi(value);
+		if(battery_low_status < 0 || battery_low_status > 100)
+			battery_low_status = 0;
+#endif
+   }
+   else if (strcmp (key, "battery_low_cmd") == 0) {
+#ifdef ENABLE_BATTERY
+      if (battery_low_cmd) g_free(battery_low_cmd);
+      if (strlen(value) > 0) battery_low_cmd = strdup (value);
+      else battery_low_cmd = 0;
+#endif
+   }
+   else if (strcmp (key, "bat1_font") == 0) {
+#ifdef ENABLE_BATTERY
+   	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);
+#endif
+   }
+   else if (strcmp (key, "bat2_font") == 0) {
+#ifdef ENABLE_BATTERY
+   	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);
+#endif
+   }
+   else if (strcmp (key, "battery_font_color") == 0) {
+#ifdef ENABLE_BATTERY
+      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;
+#endif
+   }
+   else if (strcmp (key, "battery_padding") == 0) {
+#ifdef ENABLE_BATTERY
+      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);
+#endif
+   }
+   else if (strcmp (key, "battery_background_id") == 0) {
+#ifdef ENABLE_BATTERY
+      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));
+#endif
+   }
 
    /* Clock */
    else if (strcmp (key, "time1_format") == 0) {
       if (time1_format) g_free(time1_format);
-      if (strlen(value) > 0) time1_format = strdup (value);
-      else time1_format = 0;
+      if (strlen(value) > 0) {
+      	time1_format = strdup (value);
+	      panel_config->clock.area.on_screen = 1;
+		}
+      else {
+      	time1_format = 0;
+	      panel_config->clock.area.on_screen = 0;
+		}
    }
    else if (strcmp (key, "time2_format") == 0) {
       if (time2_format) g_free(time2_format);
@@ -345,12 +438,21 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->clock.area.pix.back, &a->pix.back, sizeof(Color));
       memcpy(&panel_config->clock.area.pix.border, &a->pix.border, sizeof(Border));
    }
+	else if (strcmp(key, "clock_lclick_command") == 0) {
+		if (clock_lclick_command) g_free(clock_lclick_command);
+		if (strlen(value) > 0) clock_lclick_command = strdup(value);
+		else clock_lclick_command = 0;
+	}
+	else if (strcmp(key, "clock_rclick_command") == 0) {
+		if (clock_rclick_command) g_free(clock_rclick_command);
+		if (strlen(value) > 0) clock_rclick_command = strdup(value);
+		else clock_rclick_command = 0;
+	}
 
    /* Taskbar */
    else if (strcmp (key, "taskbar_mode") == 0) {
       if (strcmp (value, "multi_desktop") == 0) panel_mode = MULTI_DESKTOP;
-      else if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
-      else panel_mode = SINGLE_MONITOR;
+      else panel_mode = SINGLE_DESKTOP;
    }
    else if (strcmp (key, "taskbar_padding") == 0) {
       extract_values(value, &value1, &value2, &value3);
@@ -372,8 +474,18 @@ void add_entry (char *key, char *value)
       panel_config->g_task.icon = atoi (value);
    else if (strcmp (key, "task_centered") == 0)
       panel_config->g_task.centered = atoi (value);
-   else if (strcmp (key, "task_width") == 0)
+   else if (strcmp (key, "task_width") == 0) {
+		// old parameter : just for backward compatibility
       panel_config->g_task.maximum_width = atoi (value);
+      panel_config->g_task.maximum_height = 30;
+	}
+   else if (strcmp (key, "task_maximum_size") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+      panel_config->g_task.maximum_width = atoi (value1);
+		panel_config->g_task.maximum_height = 30;
+		if (value2)
+      	panel_config->g_task.maximum_height = atoi (value2);
+	}
    else if (strcmp (key, "task_padding") == 0) {
       extract_values(value, &value1, &value2, &value3);
       panel_config->g_task.area.paddingxlr = panel_config->g_task.area.paddingx = atoi (value1);
@@ -410,12 +522,19 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->g_task.area.pix_active.border, &a->pix.border, sizeof(Border));
    }
 
-   /* Trayer */
-   else if (strcmp (key, "trayer_background_id") == 0) {
+   /* Systray */
+   else if (strcmp (key, "systray_padding") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+      systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
+      if (value2) systray.area.paddingy = atoi (value2);
+      if (value3) systray.area.paddingx = atoi (value3);
+      systray.area.on_screen = 1;
+   }
+   else if (strcmp (key, "systray_background_id") == 0) {
       int id = atoi (value);
       Area *a = g_slist_nth_data(list_back, id);
-      memcpy(&panel_config->trayer.area.pix.back, &a->pix.back, sizeof(Color));
-      memcpy(&panel_config->trayer.area.pix.border, &a->pix.border, sizeof(Border));
+      memcpy(&systray.area.pix.back, &a->pix.back, sizeof(Color));
+      memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border));
    }
 
    /* Mouse actions */
@@ -431,9 +550,9 @@ void add_entry (char *key, char *value)
 
    /* Read tint-0.6 config for backward compatibility */
    else if (strcmp (key, "panel_mode") == 0) {
-      if (strcmp (value, "multi_desktop") == 0) panel_mode = MULTI_DESKTOP;
-      else if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
-      else panel_mode = SINGLE_MONITOR;
+		save_file_config = 1;
+      if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
+      else panel_mode = MULTI_DESKTOP;
    }
    else if (strcmp (key, "panel_rounded") == 0) {
       Area *a = calloc(1, sizeof(Area));
@@ -505,7 +624,7 @@ void add_entry (char *key, char *value)
    }
 
    else
-      fprintf(stderr, "Invalid option: \"%s\", correct your config file\n", key);
+      fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key);
 
    if (value1) free (value1);
    if (value2) free (value2);
@@ -552,7 +671,7 @@ void config_finish ()
 	// alloc panels
    int i;
    if (panel_config->monitor >= 0) {
-   	// just one monitor
+   	// one monitor
 	   nb_panel = 1;
 	   panel1 = calloc(nb_panel, sizeof(Panel));
 	   memcpy(panel1, panel_config, sizeof(Panel));
@@ -569,15 +688,16 @@ void config_finish ()
 		}
 	}
 
+	// TODO: user can configure layout => ordered objects in panel.area.list
+	// clock and systray before taskbar because resize(clock) can resize others object ??
    init_panel();
-   // force the resize
-	for (i=0 ; i < nb_panel ; i++) {
-	   panel1[i].area.resize = 1;
-	   resize_clock(&panel1[i].clock);
-	}
-
-   init_taskbar();
-   visible_object();
+	init_clock();
+#ifdef ENABLE_BATTERY
+	init_battery();
+#endif
+	init_systray();
+	init_taskbar();
+	visible_object();
 
 	cleanup_config();
 
@@ -588,61 +708,63 @@ void config_finish ()
 int config_read ()
 {
    const gchar * const * system_dirs;
-   char *path1, *path2, *dir;
+   char *path1;
    gint i;
 
 	save_file_config = 0;
 
+   // follow XDG specification
 deb:
-   // check tint2rc file according to XDG specification
+   // check tint2rc in user directory
    path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-   if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
+   if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
+		i = config_read_file (path1);
+		g_free(path1);
+	   return i;
+	}
 
-		if (save_file_config) {
-		   fprintf(stderr, "tint2 error : enable to write $HOME/.config/tint2/tint2rc\n");
-			exit(0);
-		}
-		// check old tintrc config file
-		path1 = g_build_filename (g_get_user_config_dir(), "tint", "tintrc", NULL);
-		if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
-	   	save_file_config = 1;
-			old_task_font = 0;
-			old_time1_font = 0;
-			old_time2_font = 0;
-		   config_read_file (path1);
-   		save_config();
-			if (old_task_font) g_free(old_task_font);
-			if (old_time1_font) g_free(old_time1_font);
-			if (old_time2_font) g_free(old_time2_font);
-   		goto deb;
-		}
-		else {
-			path2 = 0;
-			system_dirs = g_get_system_config_dirs();
-			for (i = 0; system_dirs[i]; i++) {
-				path2 = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL);
-
-				if (g_file_test(path2, G_FILE_TEST_EXISTS)) break;
-				g_free (path2);
-				path2 = 0;
-			}
+	g_free(path1);
+	if (save_file_config) {
+		fprintf(stderr, "tint2 exit : enable to write $HOME/.config/tint2/tint2rc\n");
+		exit(0);
+	}
 
-			if (path2) {
-				// copy file in user directory (path1)
-				dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
-				if (!g_file_test (dir, G_FILE_TEST_IS_DIR)) g_mkdir(dir, 0777);
-				g_free(dir);
+	// check old tintrc config file
+	path1 = g_build_filename (g_get_user_config_dir(), "tint", "tintrc", NULL);
+	if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
+		save_file_config = 1;
+		config_read_file (path1);
+		g_free(path1);
+		goto deb;
+	}
 
-				copy_file(path2, path1);
-				g_free(path2);
-			}
-		}
-   }
+	// copy tint2rc from system directory to user directory
+	g_free(path1);
+	char *path2 = 0;
+	system_dirs = g_get_system_config_dirs();
+	for (i = 0; system_dirs[i]; i++) {
+		path2 = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL);
 
-   i = config_read_file (path1);
-   g_free(path1);
+		if (g_file_test(path2, G_FILE_TEST_EXISTS)) break;
+		g_free (path2);
+		path2 = 0;
+	}
+
+	if (path2) {
+		// copy file in user directory (path1)
+		char *dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
+		if (!g_file_test (dir, G_FILE_TEST_IS_DIR)) g_mkdir(dir, 0777);
+		g_free(dir);
+
+		path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
+		copy_file(path2, path1);
+		g_free(path2);
 
-   return i;
+		i = config_read_file (path1);
+		g_free(path1);
+		return i;
+	}
+	return 0;
 }
 
 
@@ -652,18 +774,37 @@ int config_read_file (const char *path)
    char line[80];
 
    if ((fp = fopen(path, "r")) == NULL) return 0;
+	old_task_font = 0;
+	old_time1_font = 0;
+	old_time2_font = 0;
 
    while (fgets(line, sizeof(line), fp) != NULL)
       parse_line (line);
 
    fclose (fp);
+
+	if (save_file_config)
+		save_config();
+
+	if (old_task_font) {
+		g_free(old_task_font);
+		old_task_font = 0;
+	}
+	if (old_time1_font) {
+		g_free(old_time1_font);
+		old_time1_font = 0;
+	}
+	if (old_time2_font) {
+		g_free(old_time2_font);
+		old_time2_font = 0;
+	}
    return 1;
 }
 
 
 void save_config ()
 {
-   fprintf(stderr, "tint2 warning : convert user's config file tintrc to tint2rc\n");
+   fprintf(stderr, "tint2 : convert user's config file\n");
 
    char *path, *dir;
    FILE *fp;
@@ -706,14 +847,15 @@ void save_config ()
    fputs("panel_monitor = all\n", fp);
    if (panel_position & BOTTOM) fputs("panel_position = bottom", fp);
    else fputs("panel_position = top", fp);
-   if (panel_position & LEFT) fputs(" left\n", fp);
-   else if (panel_position & RIGHT) fputs(" right\n", fp);
-   else fputs(" center\n", fp);
-   fprintf(fp, "panel_size = %d %d\n", (int)panel_config->initial_width, (int)panel_config->initial_height);
-   fprintf(fp, "panel_margin = %d %d\n", panel_config->marginx, panel_config->marginy);
-   fprintf(fp, "panel_padding = %d %d\n", panel_config->area.paddingx, panel_config->area.paddingy);
+   if (panel_position & LEFT) fputs(" left horizontal\n", fp);
+   else if (panel_position & RIGHT) fputs(" right horizontal\n", fp);
+   else fputs(" center horizontal\n", fp);
+	fprintf(fp, "panel_size = %d %d\n", (int)panel_config->initial_width, (int)panel_config->initial_height);
+	fprintf(fp, "panel_margin = %d %d\n", panel_config->marginx, panel_config->marginy);
+   fprintf(fp, "panel_padding = %d %d %d\n", panel_config->area.paddingxlr, panel_config->area.paddingy, panel_config->area.paddingx);
    fprintf(fp, "font_shadow = %d\n", panel_config->g_task.font_shadow);
    fputs("panel_background_id = 1\n", fp);
+   fputs("wm_menu = 0\n", fp);
 
    fputs("\n#---------------------------------------------\n", fp);
    fputs("# TASKBAR\n", fp);
@@ -729,7 +871,7 @@ void save_config ()
 	if (old_task_icon_size) fputs("task_icon = 1\n", fp);
 	else fputs("task_icon = 0\n", fp);
 	fputs("task_text = 1\n", fp);
-   fprintf(fp, "task_width = %d\n", panel_config->g_task.maximum_width);
+   fprintf(fp, "task_maximum_size = %d %d\n", panel_config->g_task.maximum_width, panel_config->g_task.maximum_height);
    fprintf(fp, "task_centered = %d\n", panel_config->g_task.centered);
    fprintf(fp, "task_padding = %d %d\n", panel_config->g_task.area.paddingx, panel_config->g_task.area.paddingy);
    fprintf(fp, "task_font = %s\n", old_task_font);
@@ -738,6 +880,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);
@@ -750,6 +898,22 @@ void save_config ()
 	fprintf(fp, "clock_font_color = #%02x%02x%02x %d\n", (int)(panel_config->clock.font.color[0]*255), (int)(panel_config->clock.font.color[1]*255), (int)(panel_config->clock.font.color[2]*255), (int)(panel_config->clock.font.alpha*100));
    fputs("clock_padding = 2 2\n", fp);
    fputs("clock_background_id = 0\n", fp);
+   fputs("#clock_lclick_command = xclock\n", fp);
+   fputs("clock_rclick_command = orage\n", fp);
+
+#ifdef ENABLE_BATTERY
+	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);
+#endif
 
    fputs("\n#---------------------------------------------\n", fp);
    fputs("# MOUSE ACTION ON TASK\n", fp);