X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=9977574b93b12e91119d4946c7e6f08ac60e191f;hb=14bb7c359cd5d07fb27cd36f6dae19991bb6836f;hp=db0f1f81042ceae2a342839b023f745f99b75fed;hpb=4cd6c50e7ba964a921db9e9f8c29b734e2e3c729;p=chaz%2Ftint2 diff --git a/src/config.c b/src/config.c index db0f1f8..9977574 100644 --- a/src/config.c +++ b/src/config.c @@ -58,8 +58,6 @@ char *snapshot_path = 0; // -------------------------------------------------- // backward compatibility static int old_task_icon_size; -static int bg_task; -static int bg_task_active; // detect if it's an old config file // ==1 static int old_config_file; @@ -600,86 +598,6 @@ void add_entry (char *key, char *value) else if (strcmp(key, "autohide_height") == 0) panel_autohide_height = atoi(value); - - // QUESTION: Do we still need backwards compatibility??? - /* Read tint-0.6 config for backward compatibility */ - else if (strcmp (key, "panel_mode") == 0) { - if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP; - else panel_mode = MULTI_DESKTOP; - } - else if (strcmp (key, "panel_rounded") == 0) { - Background bg; - bg.border.rounded = atoi(value); - g_array_append_val(backgrounds, bg); - } - else if (strcmp (key, "panel_border_width") == 0) { - g_array_index(backgrounds, Background, backgrounds->len-1).border.width = atoi(value); - } - else if (strcmp (key, "panel_background_color") == 0) { - Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1); - extract_values(value, &value1, &value2, &value3); - get_color (value1, bg->back.color); - if (value2) bg->back.alpha = (atoi (value2) / 100.0); - else bg->back.alpha = 0.5; - } - else if (strcmp (key, "panel_border_color") == 0) { - Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1); - extract_values(value, &value1, &value2, &value3); - get_color (value1, bg->border.color); - if (value2) bg->border.alpha = (atoi (value2) / 100.0); - else bg->border.alpha = 0.5; - } - else if (strcmp (key, "task_text_centered") == 0) - panel_config.g_task.centered = atoi (value); - else if (strcmp (key, "task_margin") == 0) { - panel_config.g_taskbar.area.paddingxlr = 0; - panel_config.g_taskbar.area.paddingx = atoi (value); - } - else if (strcmp (key, "task_icon_size") == 0) - old_task_icon_size = atoi (value); - else if (strcmp (key, "task_rounded") == 0) { - Background bg; - bg.border.rounded = atoi(value); - g_array_append_val(backgrounds, bg); - g_array_append_val(backgrounds, bg); - bg_task = backgrounds->len-2; - bg_task_active = backgrounds->len-1; - } - else if (strcmp (key, "task_background_color") == 0) { - Background* bg = &g_array_index(backgrounds, Background, bg_task); - extract_values(value, &value1, &value2, &value3); - get_color (value1, bg->back.color); - if (value2) bg->back.alpha = (atoi (value2) / 100.0); - else bg->back.alpha = 0.5; - } - else if (strcmp (key, "task_active_background_color") == 0) { - Background* bg = &g_array_index(backgrounds, Background, bg_task_active); - extract_values(value, &value1, &value2, &value3); - get_color (value1, bg->back.color); - if (value2) bg->back.alpha = (atoi (value2) / 100.0); - else bg->back.alpha = 0.5; - } - else if (strcmp (key, "task_border_width") == 0) { - Background* bg = &g_array_index(backgrounds, Background, bg_task); - bg->border.width = atoi (value); - bg = &g_array_index(backgrounds, Background, bg_task_active); - bg->border.width = atoi (value); - } - else if (strcmp (key, "task_border_color") == 0) { - Background* bg = &g_array_index(backgrounds, Background, bg_task); - extract_values(value, &value1, &value2, &value3); - get_color (value1, bg->border.color); - if (value2) bg->border.alpha = (atoi (value2) / 100.0); - else bg->border.alpha = 0.5; - } - else if (strcmp (key, "task_active_border_color") == 0) { - Background* bg = &g_array_index(backgrounds, Background, bg_task_active); - extract_values(value, &value1, &value2, &value3); - get_color (value1, bg->border.color); - if (value2) bg->border.alpha = (atoi (value2) / 100.0); - else bg->border.alpha = 0.5; - } - else fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key);