*/
GHashTable* win_to_task_table;
+Task *task_active;
+Task *task_drag;
+
guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
if (win_to_task_table == 0)
win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
+ task_active = 0;
+ task_drag = 0;
+
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
- if (panel->taskbar) {
- free(panel->taskbar);
- panel->taskbar = 0;
- }
-
if (panel->g_taskbar.bg == 0) {
panel->g_taskbar.bg = &g_array_index(backgrounds, Background, 0);
panel->g_taskbar.area.bg = panel->g_taskbar.bg;
panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
// taskbar
+ panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
panel->g_taskbar.area._resize = resize_taskbar;
panel->g_taskbar.area.redraw = 1;
panel->g_taskbar.area.on_screen = 1;
}
// task
+ panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
panel->g_task.area._draw_foreground = draw_task;
panel->g_task.area.redraw = 1;
panel->g_task.area.on_screen = 1;
//printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
Taskbar *tskbar;
- panel->nb_desktop = server.nb_desktop;
- panel->taskbar = calloc(panel->nb_desktop, sizeof(Taskbar));
for (j=0 ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[j];
memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
tskbar->desktop = j;
if (j == server.desktop && panel->g_taskbar.use_active)
tskbar->area.bg = panel->g_taskbar.bg_active;
-
- // add taskbar to the panel
- panel->area.list = g_slist_append(panel->area.list, tskbar);
}
}
}
GPtrArray* task_get_tasks(Window win)
{
- return g_hash_table_lookup(win_to_task_table, &win);
+ if (win_to_task_table)
+ return g_hash_table_lookup(win_to_task_table, &win);
+ else
+ return 0;
}
win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
if (!win) return;
- // Remove any old and set active win
- // remark from Andreas: This seems unneccessary...
-// active_task();
-
GList* win_list = g_hash_table_get_keys(win_to_task_table);
GList* it;
for (it=win_list; it; it=it->next) {
}
-void resize_taskbar(void *obj)
+int resize_taskbar(void *obj)
{
Taskbar *taskbar = (Taskbar*)obj;
Panel *panel = (Panel*)taskbar->area.panel;
if (panel_horizontal) {
int pixel_width, modulo_width=0;
- int x, taskbar_width;
+ int taskbar_width;
// new task width for 'desktop'
task_count = g_slist_length(taskbar->area.list);
taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
// change pos_x and width for all tasks
- x = taskbar->area.posx + border_width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
if (!tsk->area.on_screen) continue;
- tsk->area.posx = x;
set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
tsk->area.width = pixel_width;
+// TODO : move later (when posx is known)
+// long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
+// XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+
if (modulo_width) {
tsk->area.width++;
modulo_width--;
}
-
- x += tsk->area.width + panel->g_taskbar.area.paddingx;
}
}
else {
int pixel_height, modulo_height=0;
- int y, taskbar_height;
+ int taskbar_height;
// new task width for 'desktop'
task_count = g_slist_length(taskbar->area.list);
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
// change pos_y and height for all tasks
- y = taskbar->area.posy + border_width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
if (!tsk->area.on_screen) continue;
- tsk->area.posy = y;
set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
tsk->area.height = pixel_height;
+// TODO : move later (when posy is known)
+// long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
+// XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+
if (modulo_height) {
tsk->area.height++;
modulo_height--;
}
-
- y += tsk->area.height + panel->g_taskbar.area.paddingx;
}
}
+ return 0;
}
+