Refactoring

src/taskbar/task.c

@@ -330,8 +330,6 @@ void task_update_icon(Task *task)
     if (img == NULL) {
         imlib_context_set_image(default_icon);
         img = imlib_clone_image();
-        if (0)
-            fprintf(stderr, "%s: Using default icon for %s\n", __FUNCTION__, task->title ? task->title : "task");
     }
 
     // transform icons
@@ -782,3 +780,13 @@ void task_handle_mouse_event(Task *task, MouseAction action)
     }
     }
 }
+
+void task_update_desktop(Task *task)
+{
+    // fprintf(stderr, "%s %d:\n", __FUNCTION__, __LINE__);
+    Window win = task->win;
+    remove_task(task);
+    task = add_task(win);
+    reset_active_task();
+    schedule_panel_redraw();
+}

src/taskbar/task.h

@@ -86,6 +86,7 @@ void draw_task(void *obj, cairo_t *c);
 void on_change_task(void *obj);
 
 void task_update_icon(Task *task);
+void task_update_desktop(Task *task);
 gboolean task_update_title(Task *task);
 void reset_active_task();
 void set_task_state(Task *task, TaskState state);

src/taskbar/taskbar.c

@@ -299,16 +299,6 @@ void init_taskbar_panel(void *p)
                                                                          top_bottom_border_width(&panel->g_task.area));
         panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx;
         panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
-        if (0)
-            printf("task: icon_size = %d, textx = %f, texth = %f, icony = %d, w = %d, h = %d, maxw = %d, maxh = %d\n",
-                   panel->g_task.icon_size1,
-                   panel->g_task.text_posx,
-                   panel->g_task.text_height,
-                   panel->g_task.icon_posy,
-                   panel->g_task.area.width,
-                   panel->g_task.area.height,
-                   panel->g_task.maximum_width,
-                   panel->g_task.maximum_height);
     }
 
     Taskbar *taskbar;

src/taskbar/taskbarname.c

@@ -214,3 +214,35 @@ void draw_taskbarname(void *obj, cairo_t *c)
 
     g_object_unref(layout);
 }
+
+void update_desktop_names()
+{
+    if (!taskbarname_enabled)
+        return;
+    GSList *list = get_desktop_names();
+    for (int i = 0; i < num_panels; i++) {
+        int j;
+        GSList *l;
+        for (j = 0, l = list; j < panels[i].num_desktops; j++) {
+            gchar *name;
+            if (l) {
+                name = g_strdup(l->data);
+                l = l->next;
+            } else {
+                name = g_strdup_printf("%d", j + 1);
+            }
+            Taskbar *taskbar = &panels[i].taskbar[j];
+            if (strcmp(name, taskbar->bar_name.name) != 0) {
+                g_free(taskbar->bar_name.name);
+                taskbar->bar_name.name = name;
+                taskbar->bar_name.area.resize_needed = 1;
+            } else {
+                g_free(name);
+            }
+        }
+    }
+    for (GSList *l = list; l; l = l->next)
+        g_free(l->data);
+    g_slist_free(list);
+    schedule_panel_redraw();
+}

src/taskbar/taskbarname.h

@@ -23,4 +23,6 @@ gboolean resize_taskbarname(void *obj);
 
 void taskbarname_default_font_changed();
 
+void update_desktop_names();
+
 #endif