X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=89267f6e591fcc55d5cccfc39f37ac8fae0ee519;hb=275fa7c8678c39a1c1f7437de12aac0144f61a85;hp=5264fc32c28fa1f9a1fb2221b8d465938144b501;hpb=9920c62290bd174979c2e42cbc72070155a2a4ac;p=chaz%2Ftint2 diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c index 5264fc3..89267f6 100644 --- a/src/taskbar/taskbar.c +++ b/src/taskbar/taskbar.c @@ -33,120 +33,29 @@ #include "panel.h" -GHashTable* win_to_task_table = 0; +/* win_to_task_table holds for every Window an array of tasks. Usually the array contains only one + element. However for omnipresent windows (windows which are visible in every taskbar) the array + contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.nb_desktop) +*/ +GHashTable* win_to_task_table; + +Task *task_active; +Task *task_drag; +int taskbar_enabled; 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); } - -void init_taskbar() -{ - Panel *panel; - int i, j; - - if (win_to_task_table == 0) - win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array); - - for (i=0 ; i < nb_panel ; i++) { - panel = &panel1[i]; - - if (panel->taskbar) { - free(panel->taskbar); - panel->taskbar = 0; - } - - // taskbar - panel->g_taskbar.area._resize = resize_taskbar; - panel->g_taskbar.area.redraw = 1; - panel->g_taskbar.area.on_screen = 1; - if (panel_horizontal) { - panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy; - panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy); - } - else { - panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy; - panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx); - } - - // task - panel->g_task.area._draw_foreground = draw_task; - panel->g_task.area.redraw = 1; - panel->g_task.area.on_screen = 1; - if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL]; - panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL]; - panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL]; - } - if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL]; - panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL]; - panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL]; - } - if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE]; - panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE]; - panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE]; - } - if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL]; - if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL]; - if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE]; - if ((panel->g_task.config_background_mask & (1<g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL]; - if ((panel->g_task.config_background_mask & (1<g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL]; - if ((panel->g_task.config_background_mask & (1<g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE]; - - if (panel_horizontal) { - panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.bg->border.width + panel->g_taskbar.area.paddingy; - panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy); - } - else { - panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.bg->border.width + panel->g_taskbar.area.paddingy; - panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx); - panel->g_task.area.height = panel->g_task.maximum_height; - } - - int k; - for (k=0; kg_task.background[k]->border.rounded > panel->g_task.area.height/2) { - printf("task%sbackground_id is too big. Please fix your tint2rc\n", k==0 ? "_" : k==1 ? "_active_" : k==2 ? "_iconified_" : "_urgent_"); - g_array_append_val(backgrounds, *panel->g_task.background[k]); - panel->g_task.background[k] = &g_array_index(backgrounds, Background, backgrounds->len-1); - panel->g_task.background[k]->border.rounded = panel->g_task.area.height/2; - } - } - - // compute vertical position : text and icon - int height_ink, height; - get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5); - - if (!panel->g_task.maximum_width && panel_horizontal) - panel->g_task.maximum_width = server.monitor[panel->monitor].width; - - panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr; - panel->g_task.text_posy = (panel->g_task.area.height - height) / 2.0; - if (panel->g_task.icon) { - panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy); - panel->g_task.text_posx += panel->g_task.icon_size1; - panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2; - } - //printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width); +void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); } - 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); - } - } +void default_taskbar() +{ + win_to_task_table = 0; + urgent_timeout = 0; + urgent_list = 0; + taskbar_enabled = 0; } -void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data) {remove_task(task_get_task(*(Window*)key)); } void cleanup_taskbar() { Panel *panel; @@ -175,6 +84,134 @@ void cleanup_taskbar() } +void init_taskbar() +{ + 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; +} + + +void init_taskbar_panel(void *p) +{ + Panel *panel =(Panel*)p; + int j; + + if (panel->g_taskbar.background[TASKBAR_NORMAL] == 0) { + panel->g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0); + panel->g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0); + } + if (panel->g_task.area.bg == 0) + 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._draw_foreground = draw_taskbar; + panel->g_taskbar.area.redraw = 1; + panel->g_taskbar.area.on_screen = 1; + if (panel_horizontal) { + panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy; + panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy); + } + else { + panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy; + panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx); + } + + // task + panel->g_task.area.size_mode = SIZE_BY_LAYOUT; + panel->g_task.area._draw_foreground = draw_task; + panel->g_task.area._on_change_layout = on_change_task; + panel->g_task.area.redraw = 1; + panel->g_task.area.on_screen = 1; + if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_NORMAL] = 100; + panel->g_task.saturation[TASK_NORMAL] = 0; + panel->g_task.brightness[TASK_NORMAL] = 0; + } + if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL]; + panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL]; + panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL]; + } + if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL]; + panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL]; + panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL]; + } + if ((panel->g_task.config_asb_mask & (1<g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE]; + panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE]; + panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE]; + } + if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_NORMAL] = (Color){{0, 0, 0}, 0}; + if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL]; + if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL]; + if ((panel->g_task.config_font_mask & (1<g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE]; + if ((panel->g_task.config_font_mask & (1<g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0); + if ((panel->g_task.config_background_mask & (1<g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL]; + if ((panel->g_task.config_background_mask & (1<g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL]; + if ((panel->g_task.config_background_mask & (1<g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE]; + + if (panel_horizontal) { + panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy; + panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy); + } + else { + panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy; + panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx); + panel->g_task.area.height = panel->g_task.maximum_height; + } + + for (j=0; jg_task.background[j]->border.rounded > panel->g_task.area.height/2) { + printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n", j==0 ? "_" : j==1 ? "_active_" : j==2 ? "_iconified_" : "_urgent_"); + g_array_append_val(backgrounds, *panel->g_task.background[j]); + panel->g_task.background[j] = &g_array_index(backgrounds, Background, backgrounds->len-1); + panel->g_task.background[j]->border.rounded = panel->g_task.area.height/2; + } + } + + // compute vertical position : text and icon + int height_ink, height; + get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5); + + if (!panel->g_task.maximum_width && panel_horizontal) + panel->g_task.maximum_width = server.monitor[panel->monitor].width; + + panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr; + panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy); + if (panel->g_task.icon) { + panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy); + panel->g_task.text_posx += panel->g_task.icon_size1; + panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2; + } + //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(server.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) + tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE]; + else + tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL]; + } +} + + +void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data) +{ + remove_task(task_get_task(*(Window*)key)); +} + + Task *task_get_task (Window win) { GPtrArray* task_group = task_get_tasks(win); @@ -187,7 +224,10 @@ Task *task_get_task (Window win) GPtrArray* task_get_tasks(Window win) { - return g_hash_table_lookup(win_to_task_table, &win); + if (win_to_task_table && taskbar_enabled) + return g_hash_table_lookup(win_to_task_table, &win); + else + return 0; } @@ -196,13 +236,10 @@ void task_refresh_tasklist () Window *win; int num_results, i; + if (!taskbar_enabled) return; 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) { @@ -223,93 +260,72 @@ void task_refresh_tasklist () } -void resize_taskbar(void *obj) +void draw_taskbar (void *obj, cairo_t *c) +{ + Taskbar *taskbar = obj; + int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL; + + taskbar->state_pix[state] = taskbar->area.pix; +} + + +int resize_taskbar(void *obj) { Taskbar *taskbar = (Taskbar*)obj; Panel *panel = (Panel*)taskbar->area.panel; + int text_width; Task *tsk; - GSList *l; - int task_count, border_width; - - //printf("resize_taskbar : posx et width des taches\n"); - taskbar->area.redraw = 1; - - border_width = taskbar->area.bg->border.width; + //printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy); if (panel_horizontal) { - int pixel_width, modulo_width=0; - int x, taskbar_width; - - // new task width for 'desktop' - task_count = g_slist_length(taskbar->area.list); - if (!task_count) pixel_width = panel->g_task.maximum_width; - else { - taskbar_width = taskbar->area.width - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr); - if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.area.paddingx); - - pixel_width = taskbar_width / task_count; - if (pixel_width > panel->g_task.maximum_width) - pixel_width = panel->g_task.maximum_width; - else - modulo_width = taskbar_width % task_count; - } - - taskbar->task_width = pixel_width; - taskbar->task_modulo = modulo_width; - 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; - if (tsk->area.width != pixel_width) set_task_redraw(tsk); - tsk->area.width = pixel_width; - if (modulo_width) { - tsk->area.width++; - modulo_width--; - } - - x += tsk->area.width + panel->g_taskbar.area.paddingx; + resize_by_layout(obj, panel->g_task.maximum_width); + + text_width = panel->g_task.maximum_width; + if (taskbar->area.list != NULL) { + tsk = taskbar->area.list->data; + text_width = tsk->area.width; } + taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx; } else { - int pixel_height, modulo_height=0; - int y, taskbar_height; + resize_by_layout(obj, panel->g_task.maximum_height); + + 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; + } + return 0; +} - // new task width for 'desktop' - task_count = g_slist_length(taskbar->area.list); - if (!task_count) pixel_height = panel->g_task.maximum_height; - else { - taskbar_height = taskbar->area.height - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr); - if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.area.paddingx); - - pixel_height = taskbar_height / task_count; - if (pixel_height > panel->g_task.maximum_height) - pixel_height = panel->g_task.maximum_height; - else - modulo_height = taskbar_height % task_count; - } - taskbar->task_width = pixel_height; - taskbar->task_modulo = modulo_height; - 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; - if (tsk->area.height != pixel_height) set_task_redraw(tsk); - tsk->area.height = pixel_height; - if (modulo_height) { - tsk->area.height++; - modulo_height--; - } - - y += tsk->area.height + panel->g_taskbar.area.paddingx; +void set_taskbar_state(Taskbar *tskbar, int state) +{ + tskbar->area.bg = panel1[0].g_taskbar.background[state]; + tskbar->area.pix = tskbar->state_pix[state]; + if (tskbar->state_pix[state] == 0) { + tskbar->area.redraw = 1; + GSList *l; + for (l = tskbar->area.list ; l ; l = l->next) + ((Area*)l->data)->redraw = 1; + } + panel_refresh = 1; +} + + +void visible_taskbar(void *p) +{ + Panel *panel =(Panel*)p; + int j; + + Taskbar *taskbar; + for (j=0 ; j < panel->nb_desktop ; j++) { + taskbar = &panel->taskbar[j]; + if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) { + // SINGLE_DESKTOP and not current desktop + taskbar->area.on_screen = 0; + } + else { + taskbar->area.on_screen = 1; } } + panel_refresh = 1; } +