#include "taskbar.h"
#include "systraybar.h"
#include "clock.h"
+#include "battery.h"
#include "panel.h"
#include "config.h"
#include "window.h"
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;
list_back = g_slist_append(0, calloc(1, sizeof(Area)));
panel_config = calloc(1, sizeof(Panel));
+ // window manager's menu default value == true
+ wm_menu = 1;
}
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);
+
+ /* 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);
- if (strlen(value) > 0) time1_format = strdup (value);
- else time1_format = 0;
- panel_config->clock.area.visible = 1;
+ 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);
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);
/* Systray */
else if (strcmp (key, "systray_padding") == 0) {
extract_values(value, &value1, &value2, &value3);
- panel_config->systray.area.paddingxlr = panel_config->systray.area.paddingx = atoi (value1);
- if (value2) panel_config->systray.area.paddingy = atoi (value2);
- if (value3) panel_config->systray.area.paddingx = atoi (value3);
- panel_config->systray.area.visible = 1;
+ 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->systray.area.pix.back, &a->pix.back, sizeof(Color));
- memcpy(&panel_config->systray.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 */
/* 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));
}
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);
// 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));
}
// TODO: user can configure layout => ordered objects in panel.area.list
- // clock and systray before taskbar because resize(clock) can resize others object
+ // clock and systray before taskbar because resize(clock) can resize others object ??
init_panel();
init_clock();
- // force the resize
- for (i=0 ; i < nb_panel ; i++) {
- panel1[i].area.resize = 1;
- if (panel1[i].clock.area.visible)
- resize_clock(&panel1[i].clock);
- }
-
+ init_battery();
init_systray();
- init_taskbar();
- visible_object();
+ init_taskbar();
+ visible_object();
cleanup_config();
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);
+
+ if (g_file_test(path2, G_FILE_TEST_EXISTS)) break;
+ g_free (path2);
+ path2 = 0;
+ }
- i = config_read_file (path1);
- g_free(path1);
+ 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);
- return i;
+ path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
+ copy_file(path2, path1);
+ g_free(path2);
+
+ i = config_read_file (path1);
+ g_free(path1);
+ return i;
+ }
+ return 0;
}
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;
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_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);
+ 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("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);
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);
projects / chaz / tint2 / blobdiff