#include "panel.h"
#include "task.h"
#include "taskbar.h"
+#include "taskbarname.h"
#include "systraybar.h"
+#include "launcher.h"
#include "clock.h"
#include "config.h"
#include "window.h"
#endif
// global path
-char *config_path = 0;
-char *snapshot_path = 0;
+char *config_path;
+char *snapshot_path;
// --------------------------------------------------
// backward compatibility
-static int old_task_icon_size;
-// detect if it's an old config file
-// ==1
-static int old_config_file;
+// detect if it's an old config file (==1)
+static int new_config_file;
-void init_config()
+void default_config()
{
- if (backgrounds)
- g_array_free(backgrounds, 1);
- backgrounds = g_array_new(0, 0, sizeof(Background));
-
- // append full transparency background
- Background transparent_bg;
- memset(&transparent_bg, 0, sizeof(Background));
- g_array_append_val(backgrounds, transparent_bg);
-
- // tint2 could reload config, so we cleanup objects
- cleanup_systray();
-#ifdef ENABLE_BATTERY
- cleanup_battery();
-#endif
- cleanup_clock();
- cleanup_tooltip();
-
- // panel's default value
- if (panel_config.g_task.font_desc) {
- pango_font_description_free(panel_config.g_task.font_desc);
- }
- memset(&panel_config, 0, sizeof(Panel));
- systray.alpha = 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);
+ config_path = 0;
+ snapshot_path = 0;
+ new_config_file = 0;
}
-
void cleanup_config()
{
+ if (config_path) g_free(config_path);
+ if (snapshot_path) g_free(snapshot_path);
}
}
+int config_get_monitor(char* monitor)
+{
+ if (strcmp(monitor, "all") != 0) {
+ char* endptr;
+ int ret_int = strtol(monitor, &endptr, 10);
+ if (*endptr == 0)
+ return ret_int-1;
+ else {
+ // monitor specified by name, not by index
+ int i, j;
+ for (i=0; i<server.nb_monitor; ++i) {
+ if (server.monitor[i].names == 0)
+ // xrandr can't identify monitors
+ continue;
+ j = 0;
+ while (server.monitor[i].names[j] != 0) {
+ if (strcmp(monitor, server.monitor[i].names[j++]) == 0)
+ return i;
+ }
+ }
+ }
+ }
+ // monitor == "all" or monitor not found or xrandr can't identify monitors
+ return -1;
+}
+
void add_entry (char *key, char *value)
{
char *value1=0, *value2=0, *value3=0;
/* Panel */
else if (strcmp (key, "panel_monitor") == 0) {
- if (strcmp (value, "all") == 0) panel_config.monitor = -1;
- else {
- panel_config.monitor = atoi (value);
- if (panel_config.monitor > 0) panel_config.monitor -= 1;
- }
+ panel_config.monitor = config_get_monitor(value);
}
else if (strcmp (key, "panel_size") == 0) {
extract_values(value, &value1, &value2, &value3);
panel_config.area.height = atoi(value2);
}
}
+ else if (strcmp (key, "panel_items") == 0) {
+ new_config_file = 1;
+ panel_items_order = strdup(value);
+ int j;
+ for (j=0 ; j < strlen(panel_items_order) ; j++) {
+ if (panel_items_order[j] == 'L')
+ launcher_enabled = 1;
+ if (panel_items_order[j] == 'T')
+ taskbar_enabled = 1;
+ if (panel_items_order[j] == 'B') {
+#ifdef ENABLE_BATTERY
+ battery_enabled = 1;
+#else
+ fprintf(stderr, "tint2 is build without battery support\n");
+#endif
+ }
+ if (panel_items_order[j] == 'S') {
+ // systray disabled in snapshot mode
+ if (snapshot_path == 0)
+ systray_enabled = 1;
+ }
+ if (panel_items_order[j] == 'C')
+ clock_enabled = 1;
+ }
+ }
else if (strcmp (key, "panel_margin") == 0) {
extract_values(value, &value1, &value2, &value3);
panel_config.marginx = atoi (value1);
else if (strcmp (key, "panel_dock") == 0)
panel_dock = atoi (value);
else if (strcmp (key, "urgent_nb_of_blink") == 0)
- max_tick_urgent = (atoi (value) * 2) + 1;
+ max_tick_urgent = atoi (value);
else if (strcmp (key, "panel_layer") == 0) {
if (strcmp(value, "bottom") == 0)
panel_layer = BOTTOM_LAYER;
- else if (strcmp(value, "normal") == 0)
- panel_layer = NORMAL_LAYER;
else if (strcmp(value, "top") == 0)
panel_layer = TOP_LAYER;
+ else
+ panel_layer = NORMAL_LAYER;
}
/* Battery */
- else if (strcmp (key, "battery") == 0) {
-#ifdef ENABLE_BATTERY
- if(atoi(value) == 1)
- battery_enabled = 1;
-#else
- if(atoi(value) == 1)
- fprintf(stderr, "tint2 is build without battery support\n");
-#endif
- }
else if (strcmp (key, "battery_low_status") == 0) {
#ifdef ENABLE_BATTERY
battery_low_status = atoi(value);
/* Clock */
else if (strcmp (key, "time1_format") == 0) {
+ if (new_config_file == 0) {
+ clock_enabled = 1;
+ if (panel_items_order) {
+ char* tmp = g_strconcat(panel_items_order, "C", NULL);
+ g_free( panel_items_order );
+ panel_items_order = tmp;
+ }
+ else
+ panel_items_order = g_strdup("C");
+ }
if (strlen(value) > 0) {
time1_format = strdup (value);
clock_enabled = 1;
else if (strcmp (key, "taskbar_background_id") == 0) {
int id = atoi (value);
id = (id < backgrounds->len && id >= 0) ? id : 0;
- panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
- panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
+ panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+ if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
+ panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
+ //panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
}
else if (strcmp (key, "taskbar_active_background_id") == 0) {
int id = atoi (value);
id = (id < backgrounds->len && id >= 0) ? id : 0;
- panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id);
- panel_config.g_taskbar.use_active = 1;
+ panel_config.g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
+ }
+ else if (strcmp (key, "taskbar_name") == 0) {
+ taskbarname_enabled = atoi (value);
+ }
+ else if (strcmp (key, "taskbar_name_background_id") == 0) {
+ }
+ else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
+ }
+ else if (strcmp (key, "taskbar_name_font") == 0) {
+ }
+ else if (strcmp (key, "taskbar_name_font_color") == 0) {
+ }
+ else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
}
/* Task */
}
/* Systray */
- else if (strcmp (key, "systray") == 0) {
- 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);
systray.brightness = atoi(value3);
}
+ /* Launcher */
+ else if (strcmp (key, "launcher_padding") == 0) {
+ extract_values(value, &value1, &value2, &value3);
+ panel_config.launcher.area.paddingxlr = panel_config.launcher.area.paddingx = atoi (value1);
+ if (value2) panel_config.launcher.area.paddingy = atoi (value2);
+ if (value3) panel_config.launcher.area.paddingx = atoi (value3);
+ }
+ else if (strcmp (key, "launcher_background_id") == 0) {
+ int id = atoi (value);
+ id = (id < backgrounds->len && id >= 0) ? id : 0;
+ panel_config.launcher.area.bg = &g_array_index(backgrounds, Background, id);
+ }
+ else if (strcmp(key, "launcher_icon_size") == 0) {
+ launcher_max_icon_size = atoi(value);
+ }
+ else if (strcmp(key, "launcher_item_app") == 0) {
+ char *app = strdup(value);
+ panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
+ }
+ else if (strcmp(key, "launcher_icon_theme") == 0) {
+ char *app = strdup(value);
+ panel_config.launcher.icon_theme_names = g_slist_append(panel_config.launcher.icon_theme_names, app);
+ }
+
/* Tooltip */
else if (strcmp (key, "tooltip") == 0)
g_tooltip.enabled = atoi(value);
else
panel_strut_policy = STRUT_MINIMUM;
}
- else if (strcmp(key, "autohide_height") == 0)
+ else if (strcmp(key, "autohide_height") == 0) {
panel_autohide_height = atoi(value);
+ if (panel_autohide_height == 0) {
+ // autohide need height > 0
+ panel_autohide_height = 1;
+ }
+ }
+ // old config option
+ else if (strcmp(key, "systray") == 0) {
+ if (new_config_file == 0) {
+ systray_enabled = atoi(value);
+ if (systray_enabled) {
+ if (panel_items_order) {
+ char* tmp = g_strconcat(panel_items_order, "S", NULL);
+ g_free( panel_items_order );
+ panel_items_order = tmp;
+ }
+ else
+ panel_items_order = g_strdup("S");
+ }
+ }
+ }
+ else if (strcmp(key, "battery") == 0) {
+ if (new_config_file == 0) {
+ battery_enabled = atoi(value);
+ if (battery_enabled) {
+ if (panel_items_order) {
+ char* tmp = g_strconcat(panel_items_order, "B", NULL);
+ g_free( panel_items_order );
+ panel_items_order = tmp;
+ }
+ else
+ panel_items_order = g_strdup("B");
+ }
+ }
+ }
else
- fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key);
+ fprintf(stderr, "tint2 : invalid option \"%s\",\n upgrade tint2 or correct your config file\n", key);
if (value1) free (value1);
if (value2) free (value2);
}
}
fclose (fp);
-
- if (old_task_icon_size) {
- panel_config.g_task.area.paddingy = ((int)panel_config.area.height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
+
+ // append Taskbar item
+ if (new_config_file == 0) {
+ taskbar_enabled = 1;
+ if (panel_items_order) {
+ char* tmp = g_strconcat( "T", panel_items_order, NULL );
+ g_free(panel_items_order);
+ panel_items_order = tmp;
+ }
+ else
+ panel_items_order = g_strdup("T");
}
+
return 1;
}
projects / chaz / tint2 / blobdiff