*
* Tint2 : taskbar
*
-* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
urgent_timeout = 0;
urgent_list = 0;
taskbar_enabled = 0;
+ default_taskbarname();
}
void cleanup_taskbar()
{
Panel *panel;
Taskbar *tskbar;
- int i, j;
+ int i, j, k;
+ cleanup_taskbarname();
if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
for (j=0 ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[j];
+ for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+ if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+ }
free_area (&tskbar->area);
// remove taskbar from the panel
panel->area.list = g_slist_remove(panel->area.list, tskbar);
Panel *panel =(Panel*)p;
int j;
- 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;
+ 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_taskbar.background_name[TASKBAR_NORMAL] == 0) {
+ panel->g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
+ panel->g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
}
- if (panel->g_taskbar.bg_active == 0)
- panel->g_taskbar.bg_active = panel->g_taskbar.bg;
if (panel->g_task.area.bg == 0)
panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
+ // taskbar name
+ panel->g_taskbar.area_name.panel = panel;
+ panel->g_taskbar.area_name.size_mode = SIZE_BY_CONTENT;
+ panel->g_taskbar.area_name._resize = resize_taskbarname;
+ panel->g_taskbar.area_name._draw_foreground = draw_taskbarname;
+ panel->g_taskbar.area_name._on_change_layout = 0;
+ panel->g_taskbar.area_name.resize = 1;
+ panel->g_taskbar.area_name.on_screen = 1;
+
// taskbar
+ panel->g_taskbar.area.parent = panel;
+ panel->g_taskbar.area.panel = panel;
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._draw_foreground = draw_taskbar;
+ panel->g_taskbar.area._on_change_layout = on_change_taskbar;
+ panel->g_taskbar.area.resize = 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);
+ panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
+ panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
}
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);
+ panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
+ panel->g_taskbar.area_name.width = panel->g_taskbar.area.width;
}
// task
+ panel->g_task.area.panel = panel;
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_change_layout = on_change_task;
+ panel->g_task.area.resize = 1;
panel->g_task.area.on_screen = 1;
if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
panel->g_task.alpha[TASK_NORMAL] = 100;
if ((panel->g_task.config_background_mask & (1<<TASK_URGENT)) == 0) panel->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.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.bg->border.width + panel->g_taskbar.area.paddingy;
+ 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;
}
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));
+ memcpy(&tskbar->area, &panel->g_taskbar.area, sizeof(Area));
tskbar->desktop = j;
if (j == server.desktop)
- tskbar->area.bg = panel->g_taskbar.bg_active;
+ tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
+ else
+ tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
}
+ init_taskbarname_panel(panel);
}
}
+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;
- Task *tsk;
- GSList *l;
- int task_count, border_width;
+ int text_width;
//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
-// taskbar->area.redraw = 1;
- border_width = taskbar->area.bg->border.width;
-
if (panel_horizontal) {
- int pixel_width, modulo_width=0;
- int 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
- for (l = taskbar->area.list; l ; l = l->next) {
- tsk = l->data;
- if (!tsk->area.on_screen) continue;
- //set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
- tsk->area.width = pixel_width;
-
- if (modulo_width) {
- tsk->area.width++;
- modulo_width--;
- }
+ resize_by_layout(obj, panel->g_task.maximum_width);
+
+ text_width = panel->g_task.maximum_width;
+ GSList *l = taskbar->area.list;
+ if (taskbarname_enabled) l = l->next;
+ if (l != NULL) {
+ text_width = ((Task *)l->data)->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 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;
+void on_change_taskbar (void *obj)
+{
+ Taskbar *tskbar = obj;
+ int k;
- // change pos_y and height for all tasks
- for (l = taskbar->area.list; l ; l = l->next) {
- tsk = l->data;
- if (!tsk->area.on_screen) continue;
- //set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
- tsk->area.height = pixel_height;
+ // reset Pixmap when position/size changed
+ for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+ if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+ tskbar->state_pix[k] = 0;
+ }
+ tskbar->area.pix = 0;
+ tskbar->area.redraw = 1;
+}
- if (modulo_height) {
- tsk->area.height++;
- modulo_height--;
- }
+
+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 (panel_mode != MULTI_DESKTOP) {
+ if (state == TASKBAR_NORMAL)
+ tskbar->area.on_screen = 0;
+ else
+ tskbar->area.on_screen = 1;
+ }
+ if (tskbar->area.on_screen == 1) {
+ if (tskbar->state_pix[state] == 0)
+ tskbar->area.redraw = 1;
+ if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
+ GSList *l = tskbar->area.list;
+ if (taskbarname_enabled) l = l->next;
+ for ( ; l ; l = l->next)
+ set_task_redraw(l->data);
}
}
-
- return 0;
+ panel_refresh = 1;
}
projects / chaz / tint2 / blobdiff