Add behavior to hide an empty taskbar in multi_desktop mode: fix TODO and fix panel resize

CMakeLists.txt

@@ -87,7 +87,6 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/util
                      src/execplugin
                      src/freespace
-                     src/separator
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
                      ${PANGO_INCLUDE_DIRS}
@@ -115,7 +114,6 @@ set( SOURCES src/config.c
              src/tooltip/tooltip.c
              src/execplugin/execplugin.c
              src/freespace/freespace.c
-             src/separator/separator.c
              src/util/area.c
              src/util/common.c
              src/util/strnatcmp.c

src/config.c

@@ -52,7 +52,6 @@
 #include "window.h"
 #include "tooltip.h"
 #include "timer.h"
-#include "separator.h"
 #include "execplugin.h"
 
 #ifdef ENABLE_BATTERY
@@ -72,8 +71,6 @@ char *snapshot_path;
 // detect if it's an old config file (==1)
 static gboolean new_config_file;
 
-static gboolean read_bg_color2;
-static gboolean read_bg_gradient;
 static gboolean read_bg_color_hover;
 static gboolean read_border_color_hover;
 static gboolean read_bg_color_press;
@@ -205,15 +202,6 @@ void load_launcher_app_dir(const char *path)
 	g_list_free(files);
 }
 
-Separator *get_or_create_last_separator()
-{
-	if (!panel_config.separator_list) {
-		fprintf(stderr, "Warning: separator items should shart with 'separator = new'\n");
-		panel_config.separator_list = g_list_append(panel_config.separator_list, create_separator());
-	}
-	return (Separator *)g_list_last(panel_config.separator_list)->data;
-}
-
 Execp *get_or_create_last_execp()
 {
 	if (!panel_config.execp_list) {
@@ -232,10 +220,6 @@ void add_entry(char *key, char *value)
 		// 'rounded' is the first parameter => alloc a new background
 		if (backgrounds->len > 0) {
 			Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
-			if (!read_bg_color2)
-				memcpy(&bg->fill_color2, &bg->fill_color, sizeof(Color));
-			if (!read_bg_gradient)
-				bg->gradient = 0;
 			if (!read_bg_color_hover)
 				memcpy(&bg->fill_color_hover, &bg->fill_color, sizeof(Color));
 			if (!read_border_color_hover)
@@ -249,8 +233,6 @@ void add_entry(char *key, char *value)
 		init_background(&bg);
 		bg.border.radius = atoi(value);
 		g_array_append_val(backgrounds, bg);
-		read_bg_color2 = 0;
-		read_bg_gradient = 0;
 		read_bg_color_hover = 0;
 		read_border_color_hover = 0;
 		read_bg_color_press = 0;
@@ -278,19 +260,6 @@ void add_entry(char *key, char *value)
 			bg->fill_color.alpha = (atoi(value2) / 100.0);
 		else
 			bg->fill_color.alpha = 0.5;
-	} else if (strcmp(key, "background_color2") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->fill_color2.rgb);
-		if (value2)
-			bg->fill_color2.alpha = (atoi (value2) / 100.0);
-		else
-			bg->fill_color2.alpha = 0.5;
-		read_bg_color2 = 1;
-	} else if (strcmp(key, "gradient") == 0) {
-		Background *bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		bg->gradient = atoi(value);
-		read_bg_gradient = 1;
 	} else if (strcmp(key, "border_color") == 0) {
 		Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
 		extract_values(value, &value1, &value2, &value3);
@@ -558,22 +527,6 @@ void add_entry(char *key, char *value)
 #endif
 	}
 
-	/* Separator */
-	else if (strcmp(key, "separator") == 0) {
-		panel_config.separator_list = g_list_append(panel_config.separator_list, create_separator());
-	} else if (strcmp(key, "separator_color") == 0) {
-		Separator *separator = get_or_create_last_separator();
-		extract_values(value, &value1, &value2, &value3);
-		get_color(value1, separator->color.rgb);
-		if (value2)
-			separator->color.alpha = (atoi(value2) / 100.0);
-		else
-			separator->color.alpha = 0.5;
-	} else if (strcmp(key, "separator_style") == 0) {
-		Separator *separator = get_or_create_last_separator();
-		separator->style = atoi(value);
-	}
-
 	/* Execp */
 	else if (strcmp(key, "execp") == 0) {
 		panel_config.execp_list = g_list_append(panel_config.execp_list, create_execp());
@@ -1151,10 +1104,6 @@ gboolean config_read_file(const char *path)
 
 	if (backgrounds->len > 0) {
 		Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
-		if (!read_bg_color2)
-			memcpy(&bg->fill_color2, &bg->fill_color, sizeof(Color));
-		if (!read_bg_gradient)
-			bg->gradient = 0;
 		if (!read_bg_color_hover)
 			memcpy(&bg->fill_color_hover, &bg->fill_color, sizeof(Color));
 		if (!read_border_color_hover)

src/panel.c

@@ -171,7 +171,6 @@ void init_panel()
 	init_battery();
 #endif
 	init_taskbar();
-	init_separator();
 	init_execp();
 
 	// number of panels (one monitor or 'all' monitors)
@@ -205,7 +204,6 @@ void init_panel()
 		p->area.size_mode = LAYOUT_DYNAMIC;
 		p->area._resize = resize_panel;
 		p->area._clear = panel_clear_background;
-		p->separator_list = NULL;
 		init_panel_size_and_position(p);
 		// add children according to panel_items
 		for (int k = 0; k < strlen(panel_items_order); k++) {
@@ -225,8 +223,6 @@ void init_panel()
 				init_clock_panel(p);
 			if (panel_items_order[k] == 'F' && !strstr(panel_items_order, "T"))
 				init_freespace_panel(p);
-			if (panel_items_order[k] == ':')
-				init_separator_panel(p);
 			if (panel_items_order[k] == 'E')
 				init_execp_panel(p);
 		}
@@ -273,12 +269,11 @@ void init_panel()
 
 		if (panel_autohide)
 			autohide_trigger_hide(p);
-
-		update_taskbar_visibility(p);
 	}
 
 	taskbar_refresh_tasklist();
 	reset_active_task();
+	update_all_taskbars_visibility();
 }
 
 void init_panel_size_and_position(Panel *panel)
@@ -399,7 +394,11 @@ gboolean resize_panel(void *obj)
 		int total_size = 0;
 		int total_name_size = 0;
 		int total_items = 0;
+		int visible_taskbars = 0;
 		for (int i = 0; i < panel->num_desktops; i++) {
+			if (!panel->taskbar[i].area.on_screen)
+				continue;
+			visible_taskbars++;
 			if (panel_horizontal) {
 				total_size += panel->taskbar[i].area.width;
 			} else {
@@ -431,14 +430,16 @@ gboolean resize_panel(void *obj)
 		if (total_items) {
 			int actual_name_size;
 			if (total_name_size <= total_size) {
-				actual_name_size = total_name_size / panel->num_desktops;
+				actual_name_size = total_name_size / visible_taskbars;
 			} else {
-				actual_name_size = total_size / panel->num_desktops;
+				actual_name_size = total_size / visible_taskbars;
 			}
 			total_size -= total_name_size;
 
 			for (int i = 0; i < panel->num_desktops; i++) {
 				Taskbar *taskbar = &panel->taskbar[i];
+				if (!taskbar->area.on_screen)
+					continue;
 
 				int requested_size = (panel_horizontal ? left_right_border_width(&taskbar->area)
 				                                       : top_bottom_border_width(&taskbar->area)) +
@@ -551,7 +552,6 @@ void set_panel_items_order(Panel *p)
 	}
 
 	int i_execp = 0;
-	int i_separator = 0;
 	for (int k = 0; k < strlen(panel_items_order); k++) {
 		if (panel_items_order[k] == 'L') {
 			p->area.children = g_list_append(p->area.children, &p->launcher);
@@ -573,12 +573,6 @@ void set_panel_items_order(Panel *p)
 			p->area.children = g_list_append(p->area.children, &p->clock);
 		if (panel_items_order[k] == 'F')
 			p->area.children = g_list_append(p->area.children, &p->freespace);
-		if (panel_items_order[k] == ':') {
-			GList *item = g_list_nth(p->separator_list, i_separator);
-			i_separator++;
-			if (item)
-				p->area.children = g_list_append(p->area.children, (Area *)item->data);
-		}
 		if (panel_items_order[k] == 'E') {
 			GList *item = g_list_nth(p->execp_list, i_execp);
 			i_execp++;

src/panel.h

@@ -22,7 +22,6 @@
 #include "launcher.h"
 #include "freespace.h"
 #include "execplugin.h"
-#include "separator.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -128,7 +127,6 @@ typedef struct Panel {
 
 	Launcher launcher;
 	FreeSpace freespace;
-	GList *separator_list;
 	GList *execp_list;
 
 	// Autohide

src/separator/separator.c

@@ -1,217 +0,0 @@
-// Tint2 : Separator plugin
-// Author: Oskari Rauta
-
-#include <string.h>
-#include <stdio.h>
-#include <cairo.h>
-#include <cairo-xlib.h>
-#include <pango/pangocairo.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "window.h"
-#include "server.h"
-#include "panel.h"
-#include "common.h"
-#include "separator.h"
-
-Separator *create_separator()
-{
-	Separator *separator = calloc(1, sizeof(Separator));
-	return separator;
-}
-
-void destroy_separator(void *obj)
-{
-	Separator *separator = (Separator *)obj;
-	remove_area(&separator->area);
-	free_area(&separator->area);
-	free_and_null(separator);
-}
-
-void init_separator()
-{
-	GList *to_remove = panel_config.separator_list;
-	for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
-		if (panel_items_order[k] == ':') {
-			to_remove = to_remove->next;
-		}
-	}
-
-	if (to_remove) {
-		if (to_remove == panel_config.separator_list) {
-			g_list_free_full(to_remove, destroy_separator);
-			panel_config.separator_list = NULL;
-		} else {
-			// Cut panel_config.separator_list
-			if (to_remove->prev)
-				to_remove->prev->next = NULL;
-			to_remove->prev = NULL;
-			// Remove all elements of to_remove and to_remove itself
-			g_list_free_full(to_remove, destroy_separator);
-		}
-	}
-}
-
-void init_separator_panel(void *p)
-{
-	Panel *panel = (Panel *)p;
-
-	// Make sure this is only done once if there are multiple items
-	if (panel->separator_list)
-		return;
-
-
-	// panel->separator_list is now a copy of the pointer panel_config.separator_list
-	// We make it a deep copy
-	panel->separator_list = g_list_copy_deep(panel_config.separator_list, NULL, NULL);
-
-	for (GList *l = panel->separator_list; l; l = l->next) {
-		Separator *separator = l->data;
-		if (!separator->area.bg)
-			separator->area.bg = &g_array_index(backgrounds, Background, 0);
-		separator->area.parent = p;
-		separator->area.panel = p;
-		snprintf(separator->area.name, sizeof(separator->area.name), "separator");
-		separator->area.size_mode = LAYOUT_FIXED;
-		separator->area.resize_needed = 1;
-		separator->area.on_screen = TRUE;
-		separator->area._resize = resize_separator;
-		separator->area._draw_foreground = draw_separator;
-	}
-}
-
-void cleanup_separator()
-{
-	// Cleanup frontends
-	for (int i = 0; i < num_panels; i++) {
-		g_list_free_full(panels[i].separator_list, destroy_separator);
-		panels[i].separator_list = NULL;
-	}
-
-	// Cleanup backends
-	g_list_free_full(panel_config.separator_list, destroy_separator);
-	panel_config.separator_list = NULL;
-}
-
-gboolean resize_separator(void *obj)
-{
-	Separator *separator = obj;
-	// Panel *panel = separator->area.panel;
-	if (!separator->area.on_screen)
-		return FALSE;
-
-	double d_height = panel_horizontal ? separator->area.height : separator->area.width;
-	double d_thickness = round(d_height / 16) >= 1.0 ? round(d_height / 16) : 1.0;
-
-	if (separator->style == 3)
-		d_thickness = round(d_height / 8) >= 1.0 ? round(d_height / 8) : 1.0;
-
-	double d_len = round(d_height / 16) >= 1.0 ? round(d_height / 16) : 1.0;
-	double d_width = d_thickness * 5;
-
-	if (separator->style == 4) {
-		d_width = d_thickness * 7;
-		d_thickness = d_thickness * 3;
-	}
-
-	if (separator->style == 2) {
-		d_width = d_height;
-		d_thickness = round(d_height / 8) >= 1.0 ? round(d_height / 8) : 1.0;
-		d_len = d_thickness;
-	}
-
-	double d_empty_thickness = d_thickness;
-
-	if (separator->style == 5 || separator->style == 6) {
-		d_width = (d_thickness * 4) + 2.0;
-		d_thickness = 1.0;
-	}
-
-	if (panel_horizontal) {
-		separator->area.width = d_width;
-		separator->area.height = d_height;
-	} else {
-		separator->area.width = d_height;
-		separator->area.height = d_width;
-	}
-
-	separator->empty_thickness = d_empty_thickness;
-	separator->thickness = d_thickness;
-	separator->len = d_len;
-
-	schedule_redraw(&separator->area);
-	panel_refresh = TRUE;
-	return TRUE;
-}
-
-void draw_separator(void *obj, cairo_t *c)
-{
-	Separator *separator = obj;
-
-	if (separator->style == 0 )
-		return;
-
-	double start_point = 0 + ( separator->thickness * 2 );
-	double end_point = separator->area.height - ( separator->thickness * 2 );
-	if (!panel_horizontal)
-		end_point = separator->area.width - ( separator->thickness * 2 );
-	double count = end_point - start_point;
-	double thickness = separator->thickness;
-	double len = separator->len;
-	int alt = 0;
-	double x_fix = 0;
-
-	if (separator->style == 2) {
-		if (!panel_horizontal)
-			start_point=start_point + 2;
-		cairo_set_source_rgba(c, separator->color.rgb[0], separator->color.rgb[1], separator->color.rgb[2], separator->color.alpha);
-		cairo_set_line_width(c, 1);
-		cairo_rectangle(c, start_point - 2, start_point - (panel_horizontal ? 0 : 4), end_point - thickness - 3, end_point - thickness - ( panel_horizontal ? 3 : 3));
-		cairo_stroke_preserve(c);
-		cairo_fill(c);
-		return;
-	}
-
-	if (count < thickness)
-		return;
-
-	while (((int) count) % 2) {
-		if (alt) {
-			start_point++;
-			alt = 0;
-		} else {
-			end_point--;
-			alt = 1;
-		}
-		count = end_point - start_point;
-		if (count < thickness)
-			return;
-	}
-
-	if (separator->style == 3 || separator->style == 4)
-		x_fix = round(thickness / 2) + (separator->style == 4 ? 1.0 : 0.0);
-
-	if (separator->style == 5 || separator->style == 6) {
-		x_fix = -1.0;
-		start_point = start_point + 2;
-		end_point--;
-	}
-
-	double separator_pattern[] = { len, len };
-	double separator_style6_pattern[] = { 1.0 };
-	cairo_set_source_rgba(c, separator->color.rgb[0], separator->color.rgb[1], separator->color.rgb[2], separator->color.alpha);
-	cairo_set_line_width(c, thickness);
-	if (separator->style == 6)
-		cairo_set_dash(c, separator_style6_pattern, 1, 0);
-	else
-		cairo_set_dash(c, separator_pattern, sizeof(separator_pattern) / sizeof(separator_pattern[0]), 0);
-	if (panel_horizontal) {
-		cairo_move_to(c, (separator->area.width / 2) - thickness + x_fix, start_point);
-		cairo_line_to(c, (separator->area.width / 2) - thickness + x_fix, end_point);
-	} else {
-		cairo_move_to(c, start_point, (separator->area.height / 2) - thickness + x_fix);
-		cairo_line_to(c, end_point, (separator->area.height / 2) - thickness + x_fix);
-	}
-	cairo_stroke(c);
-}

src/separator/separator.h

@@ -1,27 +0,0 @@
-// Tint2 : Separator
-// Author: Oskari Rauta <oskari.rauta@gmail.com>
-
-#ifndef SEPARATOR_H
-#define SEPARATOR_H
-
-#include "common.h"
-#include "area.h"
-
-typedef struct Separator {
-	Area area;
-	int style;
-	Color color;
-	double empty_thickness;
-	double thickness;
-	double len;
-} Separator;
-
-Separator *create_separator();
-void destroy_separator(void *obj);
-void init_separator();
-void init_separator_panel(void *p);
-void cleanup_separator();
-gboolean resize_separator(void *obj);
-void draw_separator(void *obj, cairo_t *c);
-
-#endif

src/taskbar/task.c

@@ -268,21 +268,26 @@ void task_update_icon(Task *task)
 
 	Imlib_Image img = NULL;
 
-	int i;
+	if (!img) {
-	gulong *data = server_get_property(task->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
+		int i;
-	if (data) {
+		gulong *data = server_get_property(task->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
-		// get ARGB icon
+		if (data) {
-		int w, h;
+			// get ARGB icon
-		gulong *tmp_data;
+			int w, h;
+			gulong *tmp_data;
 
-		tmp_data = get_best_icon(data, get_icon_count(data, i), i, &w, &h, panel->g_task.icon_size1);
+			tmp_data = get_best_icon(data, get_icon_count(data, i), i, &w, &h, panel->g_task.icon_size1);
-		DATA32 icon_data[w * h];
+			DATA32 icon_data[w * h];
-		for (int j = 0; j < w * h; ++j)
+			for (int j = 0; j < w * h; ++j)
-			icon_data[j] = tmp_data[j];
+				icon_data[j] = tmp_data[j];
-		img = imlib_create_image_using_copied_data(w, h, icon_data);
+			img = imlib_create_image_using_copied_data(w, h, icon_data);
-		XFree(data);
+			if (img)
-	} else {
+				fprintf(stderr, "%s: Got %dx%d icon via _NET_WM_ICON for %s\n", __FUNCTION__, w, h, task->title ? task->title : "task");
-		// get Pixmap icon
+			XFree(data);
+		}
+	}
+
+	if (!img) {
 		XWMHints *hints = XGetWMHints(server.display, task->win);
 		if (hints) {
 			if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
@@ -292,17 +297,20 @@ void task_update_icon(Task *task)
 				uint border_width, bpp;
 				uint w, h;
 
-				// printf("  get pixmap\n");
 				XGetGeometry(server.display, hints->icon_pixmap, &root, &icon_x, &icon_y, &w, &h, &border_width, &bpp);
 				imlib_context_set_drawable(hints->icon_pixmap);
 				img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0);
+				if (img)
+					fprintf(stderr, "%s: Got %dx%d pixmap icon via WM_HINTS for %s\n", __FUNCTION__, w, h, task->title ? task->title : "task");
 			}
 			XFree(hints);
 		}
 	}
+
 	if (img == NULL) {
 		imlib_context_set_image(default_icon);
 		img = imlib_clone_image();
+		fprintf(stderr, "%s: Using default icon for %s\n", __FUNCTION__, task->title ? task->title : "task");
 	}
 
 	// transform icons
@@ -348,7 +356,7 @@ void task_update_icon(Task *task)
 
 	GPtrArray *task_buttons = get_task_buttons(task->win);
 	if (task_buttons) {
-		for (i = 0; i < task_buttons->len; ++i) {
+		for (int i = 0; i < task_buttons->len; ++i) {
 			Task *task2 = g_ptr_array_index(task_buttons, i);
 			task2->icon_width = task->icon_width;
 			task2->icon_height = task->icon_height;

src/taskbar/taskbar.c

@@ -169,7 +169,7 @@ void init_taskbar_panel(void *p)
 	if (panel_horizontal) {
 		panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy;
 		panel->g_taskbar.area.height =
-			panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy;
+		    panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy;
 		panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
 		panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
 	} else {
@@ -430,18 +430,51 @@ gboolean resize_taskbar(void *obj)
 	return FALSE;
 }
 
+gboolean taskbar_is_empty(Taskbar *taskbar)
+{
+	GList *l = taskbar->area.children;
+	if (taskbarname_enabled)
+		l = l->next;
+	for (; l != NULL; l = l->next) {
+		if (((Task *)l->data)->area.on_screen) {
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+void update_one_taskbar_visibility(Taskbar *taskbar)
+{
+	if (taskbar->desktop == server.desktop) {
+		// Taskbar for current desktop is always shown
+		show(&taskbar->area);
+	} else if (taskbar_mode == MULTI_DESKTOP && taskbar_is_empty(taskbar)) {
+		// MULTI_DESKTOP : show non-empty taskbars
+		show(&taskbar->area);
+	} else {
+		hide(&taskbar->area);
+	}
+}
+
+void update_all_taskbars_visibility()
+{
+	for (int i = 0; i < num_panels; i++) {
+		Panel *panel = &panels[i];
+		for (int j = 0; j < panel->num_desktops; j++) {
+			update_one_taskbar_visibility(&panel->taskbar[j]);
+		}
+	}
+}
+
 void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
 {
 	taskbar->area.bg = panels[0].g_taskbar.background[state];
 	if (taskbarname_enabled) {
 		taskbar->bar_name.area.bg = panels[0].g_taskbar.background_name[state];
 	}
-	if (taskbar_mode != MULTI_DESKTOP) {
+
-		if (state == TASKBAR_NORMAL)
+	update_one_taskbar_visibility(taskbar);
-			taskbar->area.on_screen = FALSE;
+
-		else
-			taskbar->area.on_screen = TRUE;
-	}
 	if (taskbar->area.on_screen) {
 		schedule_redraw(&taskbar->area);
 		if (taskbarname_enabled) {
@@ -459,22 +492,6 @@ void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
 	panel_refresh = TRUE;
 }
 
-void update_taskbar_visibility(void *p)
-{
-	Panel *panel = (Panel *)p;
-
-	for (int j = 0; j < panel->num_desktops; j++) {
-		Taskbar *taskbar = &panel->taskbar[j];
-		if (taskbar_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-			// SINGLE_DESKTOP and not current desktop
-			taskbar->area.on_screen = FALSE;
-		} else {
-			taskbar->area.on_screen = TRUE;
-		}
-	}
-	panel_refresh = TRUE;
-}
-
 #define NONTRIVIAL 2
 gint compare_tasks_trivial(Task *a, Task *b, Taskbar *taskbar)
 {

src/taskbar/taskbar.h

@@ -79,10 +79,11 @@ Task *get_task(Window win);
 // However for windows shown on all desktops, there are multiple buttons, one for each taskbar.
 GPtrArray *get_task_buttons(Window win);
 
+// Change state of a taskbar (ACTIVE or NORMAL)
 void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
 
-// Updates the visibility of each taskbar when the current desktop changes.
+// Updates the visibility of all taskbars
-void update_taskbar_visibility(void *p);
+void update_all_taskbars_visibility();
 
 // Sorts the taskbar(s) on which the window is present.
 void sort_taskbar_for_win(Window win);

src/tint.c

@@ -1010,7 +1010,7 @@ void event_property_notify(XEvent *e)
 			int old_desktop = server.desktop;
 			server_get_number_of_desktops();
 			server.desktop = get_current_desktop();
-			if (old_num_desktops != server.num_desktops) {
+			if (old_num_desktops != server.num_desktops) { // If number of desktop changed
 				if (server.num_desktops <= server.desktop) {
 					server.desktop = server.num_desktops - 1;
 				}
@@ -1019,11 +1019,11 @@ void event_property_notify(XEvent *e)
 				for (int i = 0; i < num_panels; i++) {
 					init_taskbar_panel(&panels[i]);
 					set_panel_items_order(&panels[i]);
-					update_taskbar_visibility(&panels[i]);
 					panels[i].area.resize_needed = 1;
 				}
 				taskbar_refresh_tasklist();
 				reset_active_task();
+				update_all_taskbars_visibility();
 				panel_refresh = TRUE;
 			} else if (old_desktop != server.desktop) {
 				for (int i = 0; i < num_panels; i++) {
@@ -1092,6 +1092,7 @@ void event_property_notify(XEvent *e)
 			if (debug)
 				fprintf(stderr, "%s %d: win = root, atom = _NET_CLIENT_LIST\n", __FUNCTION__, __LINE__);
 			taskbar_refresh_tasklist();
+			update_all_taskbars_visibility();
 			panel_refresh = TRUE;
 		}
 		// Change active
@@ -1203,6 +1204,8 @@ void event_property_notify(XEvent *e)
 				add_urgent(task);
 			}
 			XFree(wmhints);
+			task_update_icon(task);
+			panel_refresh = TRUE;
 		}
 
 		if (!server.got_root_win)

src/tint2conf/properties.c

@@ -120,9 +120,6 @@ GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
 GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
 GtkWidget *tooltip_background;
 
-// Separators
-GArray *separators;
-
 // Executors
 GArray *executors;
 
@@ -144,8 +141,6 @@ GtkWidget *launcher_icon_theme_override;
 GtkListStore *backgrounds;
 GtkWidget *current_background,
 		  *background_fill_color,
-		  *background_fill_color2,
-		  *background_gradient,
 		  *background_border_color,
 		  *background_fill_color_over,
 		  *background_border_color_over,
@@ -190,7 +185,6 @@ void create_task_status(GtkWidget *notebook,
 						GtkWidget **task_status_icon_brightness,
 						GtkWidget **task_status_background,
 						GtkWidget **task_status_background_set);
-void create_separator(GtkWidget *parent, int i);
 void create_execp(GtkWidget *parent, int i);
 void create_clock(GtkWidget *parent);
 void create_systemtray(GtkWidget *parent);
@@ -262,7 +256,6 @@ GtkWidget *create_properties()
 	tooltips = gtk_tooltips_new();
 	(void) tooltips;
 
-	separators = g_array_new(FALSE, TRUE, sizeof(Separator));
 	executors = g_array_new(FALSE, TRUE, sizeof(Executor));
 
 	// global layer
@@ -504,9 +497,6 @@ void create_background(GtkWidget *parent)
 									 GTK_TYPE_INT,
 									 GDK_TYPE_COLOR,
 									 GTK_TYPE_INT,
-									 GTK_TYPE_BOOL,
-									 GDK_TYPE_COLOR,
-									 GTK_TYPE_INT,
 									 GTK_TYPE_INT,
 									 GTK_TYPE_INT,
 									 GTK_TYPE_STRING,
@@ -581,26 +571,6 @@ void create_background(GtkWidget *parent)
 	col++;
 	gtk_tooltips_set_tip(tooltips, background_fill_color, _("The fill color of the current background"), NULL);
 
-	row++, col = 2;
-	label = gtk_label_new(_("Secondary fill color"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_widget_show(label);
-	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-	col++;
-
-	background_fill_color2 = gtk_color_button_new();
-	gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_fill_color2), TRUE);
-	gtk_widget_show(background_fill_color2);
-	gtk_table_attach(GTK_TABLE(table), background_fill_color2, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-
-	col++;
-	background_gradient = gtk_check_button_new_with_label(_("Enable gradient"));
-	gtk_widget_show(background_gradient);
-	gtk_table_attach(GTK_TABLE(table), background_gradient, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-
-	col++;
-	gtk_tooltips_set_tip(tooltips, background_fill_color2, _("Color to fade into when using gradient background."), NULL);
-
 	row++, col = 2;
 	label = gtk_label_new(_("Border color"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
@@ -727,8 +697,6 @@ void create_background(GtkWidget *parent)
 
 	g_signal_connect(G_OBJECT(current_background), "changed", G_CALLBACK(current_background_changed), NULL);
 	g_signal_connect(G_OBJECT(background_fill_color), "color-set", G_CALLBACK(background_update), NULL);
-	g_signal_connect(G_OBJECT(background_fill_color2), "color-set", G_CALLBACK(background_update), NULL);
-	g_signal_connect(G_OBJECT(background_gradient), "toggled", G_CALLBACK(background_update), NULL);
 	g_signal_connect(G_OBJECT(background_border_color), "color-set", G_CALLBACK(background_update), NULL);
 	g_signal_connect(G_OBJECT(background_fill_color_over), "color-set", G_CALLBACK(background_update), NULL);
 	g_signal_connect(G_OBJECT(background_border_color_over), "color-set", G_CALLBACK(background_update), NULL);
@@ -781,10 +749,6 @@ void background_create_new()
 	GdkColor fillColor;
 	cairoColor2GdkColor(0, 0, 0, &fillColor);
 	int fillOpacity = 0;
-	GdkColor fillColor2;
-	cairoColor2GdkColor(0, 0, 0, &fillColor2);
-	int fillOpacity2 = 0;
-	gboolean gradient = FALSE;
 	GdkColor borderColor;
 	cairoColor2GdkColor(0, 0, 0, &borderColor);
 	int borderOpacity = 0;
@@ -811,9 +775,6 @@ void background_create_new()
 					   bgColPixbuf, NULL,
 					   bgColFillColor, &fillColor,
 					   bgColFillOpacity, fillOpacity,
-					   bgColFillColor2, &fillColor2,
-					   bgColFillOpacity2, fillOpacity2,
-					   bgColGradient, gradient,
 					   bgColBorderColor, &borderColor,
 					   bgColBorderOpacity, borderOpacity,
 					   bgColBorderWidth, b,
@@ -861,9 +822,6 @@ void background_duplicate(GtkWidget *widget, gpointer data)
     gboolean sideRight;
 	GdkColor *fillColor;
 	int fillOpacity;
-	GdkColor *fillColor2;
-	int fillOpacity2;
-	gboolean gradient;
 	GdkColor *borderColor;
 	int borderOpacity;
 	GdkColor *fillColorOver;
@@ -878,9 +836,6 @@ void background_duplicate(GtkWidget *widget, gpointer data)
 	gtk_tree_model_get(GTK_TREE_MODEL(backgrounds), &iter,
 					   bgColFillColor, &fillColor,
 					   bgColFillOpacity, &fillOpacity,
-					   bgColFillColor2, &fillColor2,
-					   bgColFillOpacity2, &fillOpacity2,
-					   bgColGradient, &gradient,
 					   bgColBorderColor, &borderColor,
 					   bgColBorderOpacity, &borderOpacity,
 					   bgColFillColorOver, &fillColorOver,
@@ -904,9 +859,6 @@ void background_duplicate(GtkWidget *widget, gpointer data)
 					   bgColPixbuf, NULL,
 					   bgColFillColor, fillColor,
 					   bgColFillOpacity, fillOpacity,
-					   bgColFillColor2, fillColor2,
-					   bgColFillOpacity2, fillOpacity2,
-					   bgColGradient, gradient,
 					   bgColBorderColor, borderColor,
 					   bgColBorderOpacity, borderOpacity,
 					   bgColText, "",
@@ -926,7 +878,6 @@ void background_duplicate(GtkWidget *widget, gpointer data)
                        bgColBorderSidesRight, sideRight,
 					   -1);
 	g_boxed_free(GDK_TYPE_COLOR, fillColor);
-	g_boxed_free(GDK_TYPE_COLOR, fillColor2);
 	g_boxed_free(GDK_TYPE_COLOR, borderColor);
 	g_boxed_free(GDK_TYPE_COLOR, fillColorOver);
 	g_boxed_free(GDK_TYPE_COLOR, borderColorOver);
@@ -975,18 +926,12 @@ void background_update_image(int index)
 	GdkPixbuf *pixbuf;
 	GdkColor *fillColor;
 	int fillOpacity = 50;
-	GdkColor *fillColor2;
-	int fillOpacity2 = 50;
-	gboolean gradient = FALSE;
 	GdkColor *borderColor;
 	int borderOpacity = 100;
 
 	gtk_tree_model_get(GTK_TREE_MODEL(backgrounds), &iter,
 					   bgColFillColor, &fillColor,
 					   bgColFillOpacity, &fillOpacity,
-					   bgColFillColor2, &fillColor2,
-					   bgColFillOpacity2, &fillOpacity2,
-					   bgColGradient, &gradient,
 					   bgColBorderColor, &borderColor,
 					   bgColBorderOpacity, &borderOpacity,
 					   bgColBorderWidth, &b,
@@ -996,17 +941,11 @@ void background_update_image(int index)
 	double bg_r, bg_g, bg_b, bg_a;
 	gdkColor2CairoColor(*fillColor, &bg_r, &bg_g, &bg_b);
 	bg_a = fillOpacity / 100.0;
-
-	double bg_r2, bg_g2, bg_b2, bg_a2;
-	gdkColor2CairoColor(*fillColor2, &bg_r2, &bg_g2, &bg_b2);
-	bg_a2 = fillOpacity2 / 100.0;
-
 	double b_r, b_g, b_b, b_a;
 	gdkColor2CairoColor(*borderColor, &b_r, &b_g, &b_b);
 	b_a = borderOpacity / 100.0;
 
 	g_boxed_free(GDK_TYPE_COLOR, fillColor);
-	g_boxed_free(GDK_TYPE_COLOR, fillColor2);
 	g_boxed_free(GDK_TYPE_COLOR, borderColor);
 
 	GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
@@ -1027,19 +966,8 @@ void background_update_image(int index)
 	cairo_arc(cr, r + b, r + b, r, 180 * degrees, 270 * degrees);
 	cairo_close_path(cr);
 
-	if (gradient) {
+	cairo_set_source_rgba(cr, bg_r, bg_g, bg_b, bg_a);
-		cairo_pattern_t *gpat;
+	cairo_fill_preserve(cr);
-		gpat = cairo_pattern_create_linear(0, 0, 0, h - b);
-		cairo_pattern_add_color_stop_rgba(gpat, 0.1, bg_r, bg_g, bg_b, bg_a);
-		cairo_pattern_add_color_stop_rgba(gpat, 0.9, bg_r2, bg_g2, bg_b2, bg_a2);
-		cairo_set_source(cr, gpat);
-		cairo_fill_preserve(cr);
-		cairo_pattern_destroy(gpat);
-	} else {
-		cairo_set_source_rgba(cr, bg_r, bg_g, bg_b, bg_a);
-		cairo_fill_preserve(cr);
-	}
-
 	cairo_set_source_rgba(cr, b_r, b_g, b_b, b_a);
 	cairo_set_line_width(cr, b);
 	cairo_stroke(cr);
@@ -1091,16 +1019,10 @@ void background_update(GtkWidget *widget, gpointer data)
 
 	GdkColor fillColor;
 	int fillOpacity;
-	GdkColor fillColor2;
-	int fillOpacity2;
-	gboolean gradient;
 	GdkColor borderColor;
 	int borderOpacity;
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color), &fillColor);
 	fillOpacity = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color)) * 100.0 / 0xffff);
-	gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color2), &fillColor2);
-	fillOpacity2 = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color2)) * 100.0 / 0xffff);
-	gradient = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(background_gradient));
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(background_border_color), &borderColor);
 	borderOpacity = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_border_color)) * 100.0 / 0xffff);
 
@@ -1126,9 +1048,6 @@ void background_update(GtkWidget *widget, gpointer data)
 					   bgColPixbuf, NULL,
 					   bgColFillColor, &fillColor,
 					   bgColFillOpacity, fillOpacity,
-					   bgColFillColor2, &fillColor2,
-					   bgColFillOpacity2, fillOpacity2,
-					   bgColGradient, gradient,
 					   bgColBorderColor, &borderColor,
 					   bgColBorderOpacity, borderOpacity,
 					   bgColFillColorOver, &fillColorOver,
@@ -1174,9 +1093,6 @@ void current_background_changed(GtkWidget *widget, gpointer data)
 
 	GdkColor *fillColor;
 	int fillOpacity;
-	GdkColor *fillColor2;
-	int fillOpacity2;
-	gboolean gradient;
 	GdkColor *borderColor;
 	int borderOpacity;
 	GdkColor *fillColorOver;
@@ -1192,9 +1108,6 @@ void current_background_changed(GtkWidget *widget, gpointer data)
 	gtk_tree_model_get(GTK_TREE_MODEL(backgrounds), &iter,
 					   bgColFillColor, &fillColor,
 					   bgColFillOpacity, &fillOpacity,
-					   bgColFillColor2, &fillColor2,
-					   bgColFillOpacity2, &fillOpacity2,
-					   bgColGradient, &gradient,
 					   bgColBorderColor, &borderColor,
 					   bgColBorderOpacity, &borderOpacity,
 					   bgColFillColorOver, &fillColorOver,
@@ -1220,12 +1133,6 @@ void current_background_changed(GtkWidget *widget, gpointer data)
 
 	gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color), fillColor);
 	gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color), (fillOpacity*0xffff)/100);
-
-	gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color2), fillColor2);
-	gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color2), (fillOpacity2*0xffff)/100);
-
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(background_gradient), gradient);
-
 	gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color), borderColor);
 	gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color), (borderOpacity*0xffff)/100);
 
@@ -1243,7 +1150,6 @@ void current_background_changed(GtkWidget *widget, gpointer data)
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_corner_radius), r);
 
 	g_boxed_free(GDK_TYPE_COLOR, fillColor);
-	g_boxed_free(GDK_TYPE_COLOR, fillColor2);
 	g_boxed_free(GDK_TYPE_COLOR, borderColor);
 	g_boxed_free(GDK_TYPE_COLOR, fillColorOver);
 	g_boxed_free(GDK_TYPE_COLOR, borderColorOver);
@@ -1883,11 +1789,6 @@ void create_panel_items(GtkWidget *parent)
 					   itemsColValue, "F",
 					   -1);
 	gtk_list_store_append(all_items, &iter);
-	gtk_list_store_set(all_items, &iter,
-					  itemsColName, _("Separator"),
-					  itemsColValue, ":",
-					  -1);
-	gtk_list_store_append(all_items, &iter);
 	gtk_list_store_set(all_items, &iter,
 					   itemsColName, _("Executor"),
 					   itemsColValue, "E",
@@ -2050,9 +1951,7 @@ void set_panel_items(const char *items)
 {
 	gtk_list_store_clear(panel_items);
 
-	int separator_index = -1;
 	int execp_index = -1;
-
 	for (; items && *items; items++) {
 		const char *value = NULL;
 		const char *name = NULL;
@@ -2077,12 +1976,6 @@ void set_panel_items(const char *items)
 		} else if (v == 'F') {
 			value = "F";
 			name = _("Free space");
-		} else if (v == ':') {
-			separator_index++;
-			buffer[0] = 0;
-			sprintf(buffer, "%s %d", _("Separator"), separator_index + 1);
-			name = buffer;
-			value = ":";
 		} else if (v == 'E') {
 			execp_index++;
 			buffer[0] = 0;
@@ -2116,17 +2009,7 @@ void panel_add_item(GtkWidget *widget, gpointer data)
 						   itemsColValue, &value,
 						   -1);
 
-		if (!panel_contains(value) || g_str_equal(value, ":")) {
+		if (!panel_contains(value) || g_str_equal(value, "E")) {
-			GtkTreeIter iter;
-			gtk_list_store_append(panel_items, &iter);
-			gtk_list_store_set(panel_items, &iter,
-							   itemsColName, g_strdup(name),
-							   itemsColValue, g_strdup(value),
-							   -1);
-			if (g_str_equal(value, ":")) {
-				separator_create_new();
-			}
-		} else if (!panel_contains(value) || g_str_equal(value, "E")) {
 			GtkTreeIter iter;
 			gtk_list_store_append(panel_items, &iter);
 			gtk_list_store_set(panel_items, &iter,
@@ -2138,7 +2021,6 @@ void panel_add_item(GtkWidget *widget, gpointer data)
 			}
 		}
 	}
-	separator_update_indices();
 	execp_update_indices();
 }
 
@@ -2156,15 +2038,7 @@ void panel_remove_item(GtkWidget *widget, gpointer data)
 						   itemsColValue, &value,
 						   -1);
 
-		if (g_str_equal(value, ":")) {
+		if (g_str_equal(value, "E")) {
-			for (int i = 0; i < separators->len; i++) {
-				Separator *separator = &g_array_index(separators, Separator, i);
-				if (g_str_equal(name, separator->name)) {
-					separator_remove(i);
-					break;
-				}
-			}
-		} else if (g_str_equal(value, "E")) {
 			for (int i = 0; i < executors->len; i++) {
 				Executor *executor = &g_array_index(executors, Executor, i);
 				if (g_str_equal(name, executor->name)) {
@@ -2177,7 +2051,6 @@ void panel_remove_item(GtkWidget *widget, gpointer data)
 		gtk_list_store_remove(panel_items, &iter);
 	}
 
-	separator_update_indices();
 	execp_update_indices();
 }
 
@@ -2202,22 +2075,7 @@ void panel_move_item_down(GtkWidget *widget, gpointer data)
 							   itemsColValue, &value2,
 							   -1);
 
-			if (g_str_equal(value1, ":") && g_str_equal(value2, ":")) {
+			if (g_str_equal(value1, "E") && g_str_equal(value2, "E")) {
-				Separator *separator1 = NULL;
-				Separator *separator2 = NULL;
-				for (int i = 0; i < separators->len; i++) {
-					Separator *separator = &g_array_index(separators, Separator, i);
-					if (g_str_equal(name1, separator->name)) {
-						separator1 = separator;
-					}
-					if (g_str_equal(name2, separator->name)) {
-						separator2 = separator;
-					}
-				}
-				Separator tmp = *separator1;
-				*separator1 = *separator2;
-				*separator2 = tmp;
-			} else if (g_str_equal(value1, "E") && g_str_equal(value2, "E")) {
 				Executor *executor1 = NULL;
 				Executor *executor2 = NULL;
 				for (int i = 0; i < executors->len; i++) {
@@ -2237,7 +2095,6 @@ void panel_move_item_down(GtkWidget *widget, gpointer data)
 			gtk_list_store_swap(panel_items, &iter, &next);
 		}
 	}
-	separator_update_indices();
 	execp_update_indices();
 }
 
@@ -2263,22 +2120,7 @@ void panel_move_item_up(GtkWidget *widget, gpointer data)
 								   itemsColValue, &value2,
 								   -1);
 
-				if (g_str_equal(value1, ":") && g_str_equal(value2, ":")) {
+				if (g_str_equal(value1, "E") && g_str_equal(value2, "E")) {
-					Separator *separator1 = NULL;
-					Separator *separator2 = NULL;
-					for (int i = 0; i < separators->len; i++) {
-						Separator *separator = &g_array_index(separators, Separator, i);
-						if (g_str_equal(name1, separator->name)) {
-							separator1 = separator;
-						}
-						if (g_str_equal(name2, separator->name)) {
-							separator2 = separator;
-						}
-					}
-					Separator tmp = *separator1;
-					*separator1 = *separator2;
-					*separator2 = tmp;
-				} else if (g_str_equal(value1, "E") && g_str_equal(value2, "E")) {
 					Executor *executor1 = NULL;
 					Executor *executor2 = NULL;
 					for (int i = 0; i < executors->len; i++) {
@@ -2299,7 +2141,6 @@ void panel_move_item_up(GtkWidget *widget, gpointer data)
 			}
 		}
 	}
-	separator_update_indices();
 	execp_update_indices();
 }
 
@@ -4499,76 +4340,6 @@ void create_clock(GtkWidget *parent)
 	change_paragraph(parent);
 }
 
-void create_separator(GtkWidget *notebook, int i)
-{
-	GtkWidget *label;
-	GtkWidget *table;
-	int row, col;
-	GtkTooltips *tooltips = gtk_tooltips_new();
-
-	Separator *separator = &g_array_index(separators, Separator, i);
-
-	separator->name[0] = 0;
-	sprintf(separator->name, "%s %d", _("Separator"), i + 1);
-	separator->page_label = gtk_label_new(separator->name);
-	gtk_widget_show(separator->page_label);
-	separator->page_separator = gtk_vbox_new(FALSE, DEFAULT_HOR_SPACING);
-	separator->container = addScrollBarToWidget(separator->page_separator);
-	gtk_container_set_border_width(GTK_CONTAINER(separator->page_separator), 10);
-	gtk_widget_show(separator->page_separator);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), separator->container, separator->page_label);
-
-	GtkWidget *parent = separator->page_separator;
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_widget_show(table);
-	gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
-	gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
-	gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
-	row = 0, col = 2;
-
-	label = gtk_label_new(_("<b>Format</b>"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(parent), label, FALSE, FALSE, 0);
-
-	table = gtk_table_new(3, 10, FALSE);
-	gtk_widget_show(table);
-	gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
-	gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
-	gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
-	row = 0, col = 2;
-
-	label = gtk_label_new(_("Foreground color"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_widget_show(label);
-	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-	col++;
-
-	separator->separator_color = gtk_color_button_new();
-	gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(separator->separator_color), TRUE);
-	gtk_widget_show(separator->separator_color);
-	gtk_table_attach(GTK_TABLE(table), separator->separator_color, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-	col++;
-	gtk_tooltips_set_tip(tooltips, separator->separator_color, _("Specifies separator's color."), NULL);
-
-	row++, col = 2;
-	label = gtk_label_new(_("Separator style"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_widget_show(label);
-	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-	col++;
-
-	separator->separator_style = gtk_spin_button_new_with_range(0, 6, 1);
-	gtk_widget_show(separator->separator_style);
-	gtk_table_attach(GTK_TABLE(table), separator->separator_style, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
-	col++;
-	gtk_tooltips_set_tip(tooltips, separator->separator_style, _("Specifies separator's appearance. 0 is empty/invisible separator."), NULL);
-
-	change_paragraph(parent);
-}
-
 void create_execp(GtkWidget *notebook, int i)
 {
 	GtkWidget *label;
@@ -4945,25 +4716,12 @@ void create_execp(GtkWidget *notebook, int i)
 	change_paragraph(parent);
 }
 
-void separator_create_new()
-{
-	g_array_set_size(separators, separators->len + 1);
-	create_separator(notebook, separators->len - 1);
-}
-
 void execp_create_new()
 {
 	g_array_set_size(executors, executors->len + 1);
 	create_execp(notebook, executors->len - 1);
 }
 
-Separator *separator_get_last()
-{
-	if (separators->len <= 0)
-		separator_create_new();
-	return &g_array_index(separators, Separator, separators->len - 1);
-}
-
 Executor *execp_get_last()
 {
 	if (executors->len <= 0)
@@ -4971,21 +4729,6 @@ Executor *execp_get_last()
 	return &g_array_index(executors, Executor, executors->len - 1);
 }
 
-void separator_remove(int i)
-{
-	Separator *separator = &g_array_index(separators, Separator, i);
-
-	for (int i_page = 0; i_page < gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)); i_page++) {
-		GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), i_page);
-		if (page == separator->container) {
-			gtk_widget_hide(page);
-			gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), i_page);
-		}
-	}
-
-	separators = g_array_remove_index(separators, i);
-}
-
 void execp_remove(int i)
 {
 	Executor *executor = &g_array_index(executors, Executor, i);
@@ -5001,43 +4744,6 @@ void execp_remove(int i)
 	executors = g_array_remove_index(executors, i);
 }
 
-void separator_update_indices()
-{
-	for (int i = 0; i < separators->len; i++) {
-		Separator *separator = &g_array_index(separators, Separator, i);
-		sprintf(separator->name, "%s %d", _("Separator"), i + 1);
-		gtk_label_set_text(GTK_LABEL(separator->page_label), separator->name);
-	}
-
-	GtkTreeModel *model = GTK_TREE_MODEL(panel_items);
-	GtkTreeIter iter;
-	if (!gtk_tree_model_get_iter_first(model, &iter))
-		return;
-	int separator_index = -1;
-	while (1) {
-		gchar *name;
-		gchar *value;
-		gtk_tree_model_get(model, &iter,
-						   itemsColName, &name,
-						   itemsColValue, &value,
-						   -1);
-
-		if (g_str_equal(value, ":")) {
-			separator_index++;
-			char buffer[256];
-			buffer[0] = 0;
-			sprintf(buffer, "%s %d", _("Separator"), separator_index + 1);
-
-			gtk_list_store_set(panel_items, &iter,
-							   itemsColName, buffer,
-							   -1);
-		}
-
-		if (!gtk_tree_model_iter_next(model, &iter))
-			break;
-	}
-}
-
 void execp_update_indices()
 {
 	for (int i = 0; i < executors->len; i++) {

src/tint2conf/properties.h

@@ -118,19 +118,6 @@ extern GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
 extern GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
 extern GtkWidget *tooltip_background;
 
-// Separator
-typedef struct Separator {
-	char name[256];
-	GtkWidget *container;
-	GtkWidget *page_separator;
-	GtkWidget *page_label;
-	GtkWidget *separator_background;
-	GtkWidget *separator_color;
-	GtkWidget *separator_style;
-} Separator;
-
-extern GArray *separators;
-
 // Executor
 typedef struct Executor {
 	char name[256];
@@ -179,9 +166,6 @@ enum {
 	bgColPixbuf = 0,
 	bgColFillColor,
 	bgColFillOpacity,
-	bgColFillColor2,
-	bgColFillOpacity2,
-	bgColGradient,
 	bgColBorderColor,
 	bgColBorderOpacity,
 	bgColBorderWidth,
@@ -205,8 +189,6 @@ enum {
 extern GtkListStore *backgrounds;
 extern GtkWidget *current_background,
 		  *background_fill_color,
-		  *background_fill_color2,
-		  *background_gradient,
 		  *background_border_color,
 		  *background_fill_color_over,
 		  *background_border_color_over,
@@ -225,11 +207,6 @@ int background_index_safe(int index);
 
 GtkWidget *create_properties();
 
-void separator_create_new();
-Separator *separator_get_last();
-void separator_remove(int i);
-void separator_update_indices();
-
 void execp_create_new();
 Executor *execp_get_last();
 void execp_remove(int i);

src/tint2conf/properties_rw.c

@@ -23,7 +23,6 @@ int no_items_systray_enabled;
 int no_items_battery_enabled;
 
 static int num_bg;
-static int read_bg_color2;
 static int read_bg_color_hover;
 static int read_border_color_hover;
 static int read_bg_color_press;
@@ -122,9 +121,6 @@ void config_write_backgrounds(FILE *fp)
         gboolean sideRight;
 		GdkColor *fillColor;
 		int fillOpacity;
-		GdkColor *fillColor2;
-		int fillOpacity2;
-		gboolean gradient;
 		GdkColor *borderColor;
 		int borderOpacity;
 		GdkColor *fillColorOver;
@@ -140,9 +136,6 @@ void config_write_backgrounds(FILE *fp)
 		gtk_tree_model_get(GTK_TREE_MODEL(backgrounds), &iter,
 						   bgColFillColor, &fillColor,
 						   bgColFillOpacity, &fillOpacity,
-						   bgColFillColor2, &fillColor2,
-						   bgColFillOpacity2, &fillOpacity2,
-						   bgColGradient, &gradient,
 						   bgColBorderColor, &borderColor,
 						   bgColBorderOpacity, &borderOpacity,
 						   bgColFillColorOver, &fillColorOver,
@@ -177,12 +170,7 @@ void config_write_backgrounds(FILE *fp)
             strcat(sides, "R");
         fprintf(fp, "border_sides = %s\n", sides);
 
-		// This is a workaround. For some reason, there was a problem while storing fillOpacity2
-		//fillOpacity2 = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color2)) * 100.0 / 0xffff);
-
 		config_write_color(fp, "background_color", *fillColor, fillOpacity);
-		config_write_color(fp, "background_color2", *fillColor2, fillOpacity2);
-		fprintf(fp, "gradient = %d\n", gradient);
 		config_write_color(fp, "border_color", *borderColor, borderOpacity);
 		config_write_color(fp, "background_color_hover", *fillColorOver, fillOpacityOver);
 		config_write_color(fp, "border_color_hover", *borderColorOver, borderOpacityOver);
@@ -681,26 +669,6 @@ void config_write_battery(FILE *fp)
 	fprintf(fp, "\n");
 }
 
-void config_write_separator(FILE *fp)
-{
-	for (int i = 0; i < separators->len; i++) {
-		fprintf(fp, "#-------------------------------------\n");
-		fprintf(fp, "# Separator %d\n", i + 1);
-
-		Separator *separator = &g_array_index(separators, Separator, i);
-
-		fprintf(fp, "separator = new\n");
-		GdkColor color;
-		gtk_color_button_get_color(GTK_COLOR_BUTTON(separator->separator_color), &color);
-		config_write_color(fp,
-					   "separator_color",
-					   color,
-					   gtk_color_button_get_alpha(GTK_COLOR_BUTTON(separator->separator_color)) * 100 / 0xffff);
-		fprintf(fp, "separator_style = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(separator->separator_style)));
-		fprintf(fp, "\n");
-	}
-}
-
 void config_write_execp(FILE *fp)
 {
 	for (int i = 0; i < executors->len; i++) {
@@ -820,7 +788,6 @@ void config_save_file(const char *path) {
 	config_write_launcher(fp);
 	config_write_clock(fp);
 	config_write_battery(fp);
-	config_write_separator(fp);
 	config_write_execp(fp);
 	config_write_tooltip(fp);
 
@@ -862,14 +829,6 @@ gboolean config_is_manual(const char *path)
 void finalize_bg()
 {
 	if (num_bg > 0) {
-		if (!read_bg_color2) {
-			GdkColor fillColor;
-			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color),&fillColor);
-			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color2), &fillColor);
-			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color2));
-			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color2), fillOpacity);
-			background_force_update();
-		}
 		if (!read_bg_color_hover) {
 			GdkColor fillColor;
 			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color), &fillColor);
@@ -915,7 +874,6 @@ void add_entry(char *key, char *value)
 		finalize_bg();
 		background_create_new();
 		num_bg++;
-		read_bg_color2 = 0;
 		read_bg_color_hover = 0;
 		read_border_color_hover = 0;
 		read_bg_color_press = 0;
@@ -936,19 +894,6 @@ void add_entry(char *key, char *value)
 		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color), (alpha*65535)/100);
 		background_force_update();
 	}
-	else if (strcmp(key, "background_color2") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		GdkColor col;
-		hex2gdk(value1, &col);
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color2), &col);
-		int alpha = value2 ? atoi(value2) : 50;
-		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color2), (alpha*65535)/100);
-		background_force_update();
-		read_bg_color2 = 1;
-	}
-	else if (strcmp(key, "gradient") == 0 ) {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(background_gradient), atoi(value));
-	}
 	else if (strcmp(key, "border_color") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		GdkColor col;
@@ -1726,24 +1671,6 @@ void add_entry(char *key, char *value)
 		set_action(value, task_mouse_scroll_down);
 	}
 
-	/* Separator */
-	else if (strcmp(key, "separator") == 0) {
-		separator_create_new();
-	}
-	else if (strcmp(key, "separator_color") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		GdkColor col;
-		hex2gdk(value1, &col);
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(separator_get_last()->separator_color), &col);
-		if (value2) {
-			int alpha = atoi(value2);
-			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(separator_get_last()->separator_color), (alpha*65535)/100);
-		}
-	}
-	else if (strcmp(key, "separator_style") == 0) {
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(separator_get_last()->separator_style), atoi(value));
-	}
-
 	/* Executor */
 	else if (strcmp(key, "execp") == 0) {
 		execp_create_new();

src/util/area.c

@@ -438,18 +438,9 @@ void draw(Area *a)
 
 void draw_background(Area *a, cairo_t *c)
 {
-	if ((a->bg->fill_color.alpha > 0.0) ||
+	if (a->bg->fill_color.alpha > 0.0 ||
-	    (panel_config.mouse_effects && (a->has_mouse_over_effect || a->has_mouse_press_effect)) ||
+	    (panel_config.mouse_effects && (a->has_mouse_over_effect || a->has_mouse_press_effect))) {
-	    (area_has_gradient_fill(a))) {
+		if (a->mouse_state == MOUSE_OVER)
-
-		cairo_pattern_t *cairo_gradient_pattern;
-
-		if (area_has_gradient_fill(a)) {
-			cairo_gradient_pattern = cairo_pattern_create_linear(0.0, 0.0, 0.0, a->height - top_bottom_border_width(a));
-			cairo_pattern_add_color_stop_rgba(cairo_gradient_pattern, 0.1, a->bg->fill_color.rgb[0], a->bg->fill_color.rgb[1], a->bg->fill_color.rgb[2], a->bg->fill_color.alpha);
-			cairo_pattern_add_color_stop_rgba(cairo_gradient_pattern, 0.9, a->bg->fill_color2.rgb[0], a->bg->fill_color2.rgb[1], a->bg->fill_color2.rgb[2], a->bg->fill_color2.alpha);
-			cairo_set_source(c, cairo_gradient_pattern);
-		} else if (a->mouse_state == MOUSE_OVER)
 			cairo_set_source_rgba(c,
 			                      a->bg->fill_color_hover.rgb[0],
 			                      a->bg->fill_color_hover.rgb[1],
@@ -476,8 +467,6 @@ void draw_background(Area *a, cairo_t *c)
 		          a->bg->border.radius - a->bg->border.width / 1.571);
 
 		cairo_fill(c);
-		if (area_has_gradient_fill(a))
-			cairo_pattern_destroy(cairo_gradient_pattern);
 	}
 
 	if (a->bg->border.width > 0) {
@@ -825,18 +814,3 @@ void area_dump_geometry(Area *area, int indent)
 			area_dump_geometry((Area *)l->data, indent);
 	}
 }
-
-gboolean area_has_gradient_fill(Area *area)
-{
-	if (!area->bg->gradient)
-		return FALSE;
-	else if ((area->bg->fill_color.alpha <= 0.0 ) && (area->bg->fill_color2.alpha <= 0.0))
-		return FALSE;
-	else if ((area->bg->fill_color.rgb[0] == area->bg->fill_color2.rgb[0]) &&
-		 (area->bg->fill_color.rgb[1] == area->bg->fill_color2.rgb[1]) &&
-		 (area->bg->fill_color.rgb[2] == area->bg->fill_color2.rgb[2]) &&
-		 (area->bg->fill_color.alpha == area->bg->fill_color2.alpha))
-		return FALSE;
-	else return TRUE;
-
-}

src/util/area.h

@@ -147,8 +147,6 @@ typedef struct Border {
 typedef struct Background {
 	// Normal state
 	Color fill_color;
-	Color fill_color2;
-	gboolean gradient;
 	Border border;
 	// On mouse hover
 	Color fill_color_hover;
@@ -316,6 +314,4 @@ void area_dump_geometry(Area *area, int indent);
 void mouse_over(Area *area, int pressed);
 void mouse_out();
 
-gboolean area_has_gradient_fill(Area *area);
-
 #endif

tint2.includes

@@ -21,6 +21,5 @@ po
 src/tint2conf/po
 src/freespace
 src/execplugin
-src/separator
 themes
 doc