#include "common.h"
#include "server.h"
+#include "panel.h"
#include "task.h"
#include "taskbar.h"
#include "systraybar.h"
#include "clock.h"
-#include "panel.h"
#include "config.h"
#include "window.h"
#include "tooltip.h"
void init_config()
{
- // get monitor and desktop config
- get_monitors();
- get_desktops();
-
// append full transparency background
list_back = g_slist_append(0, calloc(1, sizeof(Area)));
+ // tint2 could reload config, so we cleanup objects
+ cleanup_systray();
+ cleanup_battery();
+ cleanup_clock();
+ cleanup_tooltip();
+
+ // panel's default value
memset(&panel_config, 0, sizeof(Panel));
panel_config.g_task.alpha = 100;
panel_config.g_task.alpha_active = 100;
}
-void copy_file(const char *pathSrc, const char *pathDest)
-{
- FILE *fileSrc, *fileDest;
- char line[100];
- int nb;
-
- fileSrc = fopen(pathSrc, "rb");
- if (fileSrc == NULL) return;
-
- fileDest = fopen(pathDest, "wb");
- if (fileDest == NULL) return;
-
- while ((nb = fread(line, 1, 100, fileSrc)) > 0) fwrite(line, 1, nb, fileDest);
-
- fclose (fileDest);
- fclose (fileSrc);
-}
-
-
void extract_values (const char *value, char **value1, char **value2, char **value3)
{
char *b=0, *c=0;
}
-int hex_char_to_int (char c)
-{
- int r;
-
- if (c >= '0' && c <= '9') r = c - '0';
- else if (c >= 'a' && c <= 'f') r = c - 'a' + 10;
- else if (c >= 'A' && c <= 'F') r = c - 'A' + 10;
- else r = 0;
-
- return r;
-}
-
-
-int hex_to_rgb (char *hex, int *r, int *g, int *b)
-{
- int len;
-
- if (hex == NULL || hex[0] != '#') return (0);
-
- len = strlen (hex);
- if (len == 3 + 1) {
- *r = hex_char_to_int (hex[1]);
- *g = hex_char_to_int (hex[2]);
- *b = hex_char_to_int (hex[3]);
- }
- else if (len == 6 + 1) {
- *r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
- *g = hex_char_to_int (hex[3]) * 16 + hex_char_to_int (hex[4]);
- *b = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
- }
- else if (len == 12 + 1) {
- *r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
- *g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
- *b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]);
- }
- else return 0;
-
- return 1;
-}
-
-
-void get_color (char *hex, double *rgb)
-{
- int r, g, b;
- hex_to_rgb (hex, &r, &g, &b);
-
- rgb[0] = (r / 255.0);
- rgb[1] = (g / 255.0);
- rgb[2] = (b / 255.0);
-}
-
-
void get_action (char *event, int *action)
{
if (strcmp (event, "none") == 0)
panel_config.monitor = atoi (value);
if (panel_config.monitor > 0) panel_config.monitor -= 1;
}
+ if (panel_config.monitor > (server.nb_monitor-1)) {
+ // server.nb_monitor minimum value is 1 (see get_monitors())
+ fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
+ panel_config.monitor = 0;
+ }
}
else if (strcmp (key, "panel_size") == 0) {
extract_values(value, &value1, &value2, &value3);
b[0] = '\0';
panel_config.pourcentx = 1;
}
- panel_config.initial_width = atof(value1);
+ panel_config.area.width = atoi(value1);
+ if (panel_config.area.width == 0) {
+ // full width mode
+ panel_config.area.width = 100;
+ panel_config.pourcentx = 1;
+ }
if (value2) {
if ((b = strchr (value2, '%'))) {
b[0] = '\0';
panel_config.pourcenty = 1;
}
- panel_config.initial_height = atof(value2);
+ panel_config.area.height = atoi(value2);
}
}
else if (strcmp (key, "panel_margin") == 0) {
else if (strcmp (key, "battery") == 0) {
#ifdef ENABLE_BATTERY
if(atoi(value) == 1)
- panel_config.battery.area.on_screen = 1;
+ battery_enabled = 1;
#else
if(atoi(value) == 1)
fprintf(stderr, "tint2 is build without battery support\n");
}
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;
+ if (strlen(value) > 0)
+ battery_low_cmd = strdup (value);
#endif
}
else if (strcmp (key, "bat1_font") == 0) {
/* Clock */
else if (strcmp (key, "time1_format") == 0) {
- if (time1_format) g_free(time1_format);
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;
+ clock_enabled = 1;
}
}
else if (strcmp (key, "time2_format") == 0) {
- if (time2_format) g_free(time2_format);
- if (strlen(value) > 0) time2_format = strdup (value);
- else time2_format = 0;
+ if (strlen(value) > 0)
+ time2_format = strdup (value);
}
else if (strcmp (key, "time1_font") == 0) {
if (save_file_config) old_time1_font = strdup (value);
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;
+ if (strlen(value) > 0)
+ clock_lclick_command = strdup(value);
}
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;
+ if (strlen(value) > 0)
+ clock_rclick_command = strdup(value);
}
/* Taskbar */
}
/* Systray */
+ else if (strcmp (key, "systray") == 0) {
+ if(atoi(value) == 1)
+ systray_enabled = 1;
+ }
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);
}
-int parse_line (const char *line)
-{
- char *a, *b, *key, *value;
-
- /* Skip useless lines */
- if ((line[0] == '#') || (line[0] == '\n')) return 0;
- if (!(a = strchr (line, '='))) return 0;
-
- /* overwrite '=' with '\0' */
- a[0] = '\0';
- key = strdup (line);
- a++;
-
- /* overwrite '\n' with '\0' if '\n' present */
- if ((b = strchr (a, '\n'))) b[0] = '\0';
-
- value = strdup (a);
-
- g_strstrip(key);
- g_strstrip(value);
-
- add_entry (key, value);
-
- free (key);
- free (value);
- return 1;
-}
-
-
-void config_finish ()
-{
- if (panel_config.monitor > (server.nb_monitor-1)) {
- // server.nb_monitor minimum value is 1 (see get_monitors())
- // and panel_config->monitor is higher
- fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
- panel_config.monitor = 0;
- }
-
- // 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();
- init_clock();
-#ifdef ENABLE_BATTERY
- init_battery();
-#endif
- init_systray();
- init_taskbar();
- init_tooltip();
- visible_object();
-
- cleanup_config();
-
- task_refresh_tasklist();
-}
-
-
int config_read ()
{
const gchar * const * system_dirs;
{
FILE *fp;
char line[80];
+ char *key, *value;
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);
-
+ while (fgets(line, sizeof(line), fp) != NULL) {
+ if (parse_line(line, &key, &value)) {
+ add_entry (key, value);
+ free (key);
+ free (value);
+ }
+ }
fclose (fp);
if (save_file_config)
FILE *fp;
if (old_task_icon_size) {
- panel_config.g_task.area.paddingy = ((int)panel_config.initial_height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
+ panel_config.g_task.area.paddingy = ((int)panel_config.area.height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
}
dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
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_size = %d %d\n", panel_config.area.width, panel_config.area.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);
projects / chaz / tint2 / blobdiff