#include <ctype.h>
#include <glib/gstdio.h>
#include <pango/pangocairo.h>
+#include <pango/pangoxft.h>
#include <Imlib2.h>
#include "common.h"
// global path
char *config_path = 0;
-char *thumbnail_path = 0;
+char *snapshot_path = 0;
// --------------------------------------------------
// backward compatibility
static int old_task_icon_size;
static Area *area_task;
static Area *area_task_active;
-
+// detect if it's an old config file
+// ==1
+static int old_config_file;
// temporary list of background
static GSList *list_back;
// tint2 could reload config, so we cleanup objects
cleanup_systray();
+#ifdef ENABLE_BATTERY
cleanup_battery();
+#endif
cleanup_clock();
cleanup_tooltip();
panel_config.g_task.alpha = 100;
panel_config.g_task.alpha_active = 100;
systray.sort = 3;
+ old_config_file = 1;
// window manager's menu default value == false
wm_menu = 0;
max_tick_urgent = 7;
+
+ // flush pango cache if possible
+ //pango_xft_shutdown_display(server.dsp, server.screen);
+ //PangoFontMap *font_map = pango_xft_get_font_map(server.dsp, server.screen);
+ //pango_fc_font_map_shutdown(font_map);
}
/* Systray */
else if (strcmp (key, "systray") == 0) {
- if(atoi(value) == 1)
- systray_enabled = 1;
+ systray_enabled = atoi(value);
+ // systray is latest option added. files without 'systray' are old.
+ old_config_file = 0;
}
else if (strcmp (key, "systray_padding") == 0) {
+ if (old_config_file)
+ systray_enabled = 1;
extract_values(value, &value1, &value2, &value3);
systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
if (value2) systray.area.paddingy = atoi (value2);