int taskbarname_enabled;
PangoFontDescription *taskbarname_font_desc;
Color taskbarname_font;
+Color taskbarname_active_font;
void default_taskbarname()
void init_taskbarname_panel(void *p)
{
Panel *panel =(Panel*)p;
+ Taskbar *tskbar;
int j;
- if (!taskbarname_enabled || !taskbar_enabled) return;
+ if (!taskbarname_enabled) return;
- for (j=0 ; j < panel->nb_desktop ; j++) {
- panel->taskbar[j].bar_name.name = g_strdup_printf("%d", j+1);
+ GSList *l, *list = server_get_name_of_desktop();
+ for (j=0, l=list ; j < panel->nb_desktop ; j++) {
+ tskbar = &panel->taskbar[j];
+ memcpy(&tskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
+ tskbar->bar_name.area.parent = tskbar;
+ if (j == server.desktop)
+ tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
+ else
+ tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
+
+ // use desktop number if name is missing
+ if (l) {
+ tskbar->bar_name.name = g_strdup(l->data);
+ l = l->next;
+ }
+ else
+ tskbar->bar_name.name = g_strdup_printf("%d", j+1);
+
+ // append the name at the beginning of taskbar
+ tskbar->area.list = g_slist_append(tskbar->area.list, &tskbar->bar_name);
}
+
+ for (l=list ; l ; l = l->next)
+ g_free(l->data);
+ g_slist_free(list);
}
panel = &panel1[i];
for (j=0 ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[j];
- if (taskbarname_font_desc) pango_font_description_free(taskbarname_font_desc);
if (tskbar->bar_name.name) g_free(tskbar->bar_name.name);
free_area (&tskbar->bar_name.area);
for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
}
+ tskbar->area.list = g_slist_remove(tskbar->area.list, &tskbar->bar_name);
}
}
}
void draw_taskbarname (void *obj, cairo_t *c)
{
Taskbarname *taskbar_name = obj;
+ Taskbar *taskbar = taskbar_name->area.parent;
PangoLayout *layout;
+ Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
+ int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
+ taskbar_name->state_pix[state] = taskbar_name->area.pix;
+
+ // draw content
layout = pango_cairo_create_layout (c);
-
- // draw layout
pango_layout_set_font_description (layout, taskbarname_font_desc);
pango_layout_set_width (layout, taskbar_name->area.width * PANGO_SCALE);
pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
pango_layout_set_text (layout, taskbar_name->name, strlen(taskbar_name->name));
- cairo_set_source_rgba (c, taskbarname_font.color[0], taskbarname_font.color[1], taskbarname_font.color[2], taskbarname_font.alpha);
+ cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
pango_cairo_update_layout (c, layout);
- cairo_move_to (c, 0, 2);
+ cairo_move_to (c, 0, taskbar_name->posy);
pango_cairo_show_layout (c, layout);
g_object_unref (layout);
- printf("draw_taskbarname %s ******************************\n", taskbar_name->name);
+ //printf("draw_taskbarname %s ******************************\n", taskbar_name->name);
}
int resize_taskbarname(void *obj)
{
- Taskbarname *taskbar_name = (Taskbar*)obj;
+ Taskbarname *taskbar_name = obj;
Panel *panel = taskbar_name->area.panel;
- int time_height, time_width, ret = 0;
+ int name_height, name_width, name_height_ink;
+ int ret = 0;
taskbar_name->area.redraw = 1;
- /*
- strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
- get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
- if (time2_format) {
- strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
- get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
- }
+ get_text_size2(taskbarname_font_desc, &name_height_ink, &name_height, &name_width, panel->area.height, panel->area.width, taskbar_name->name, strlen(taskbar_name->name));
if (panel_horizontal) {
- int new_size = (time_width > date_width) ? time_width : date_width;
- new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
- if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
- // we try to limit the number of resize
- clock->area.width = new_size + 1;
- clock->time1_posy = (clock->area.height - time_height) / 2;
- if (time2_format) {
- clock->time1_posy -= ((date_height_ink + 2) / 2);
- clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
- }
+ int new_size = name_width + (2* (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
+ if (new_size != taskbar_name->area.width) {
+ taskbar_name->area.width = new_size;
+ taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
ret = 1;
}
}
else {
- int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
- if (new_size != clock->area.height) {
- // we try to limit the number of resize
- clock->area.height = new_size;
- clock->time1_posy = (clock->area.height - time_height) / 2;
- if (time2_format) {
- clock->time1_posy -= ((date_height_ink + 2) / 2);
- clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
- }
+ int new_size = name_height + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
+ if (new_size != taskbar_name->area.height) {
+ taskbar_name->area.height = new_size;
+ taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
ret = 1;
}
}
return ret;
-*/
-
- taskbar_name->area.width = 10;
- return 1;
}
-
-
-
projects / chaz / tint2 / blobdiff