awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[taglist] Stop using styles, use markup string 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-04-28 14:26:30 +02:00
parent 0bbbfb5c67
commit 1fc2b7997a
2 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/configopts.c
View File

@ -279,6 +279,12 @@ cfg_opt_t widget_taglist_opts[] =
CFG_ALIGNMENT((char *) "align", (char *) "auto", CFGF_NONE), CFG_ALIGNMENT((char *) "align", (char *) "auto", CFGF_NONE),
/** Mouse bindings. */ /** Mouse bindings. */
CFG_SEC((char *) "mouse", mouse_taglist_opts, CFGF_MULTI), CFG_SEC((char *) "mouse", mouse_taglist_opts, CFGF_MULTI),
/** Markup title string for normal tags */
CFG_STR((char *) "text_normal", (char *) "<text align=\"center\"/><bg color=\"#444444\"/><title/>", CFGF_NONE),
/** Markup title string for selected tags. */
CFG_STR((char *) "text_focus", (char *) "<text align=\"center\"/><bg color=\"#535d6c\"/><title/>", CFGF_NONE),
/** Markup title string for tags with urgent windows. */
CFG_STR((char *) "text_urgent", (char *) "<text align=\"center\"/><bg color=\"#ff4500\"/><title/>", CFGF_NONE),
CFG_AWESOME_END() CFG_AWESOME_END()
}; };
/** This section defines iconbox widget options. */ /** This section defines iconbox widget options. */
@ -324,7 +330,7 @@ cfg_opt_t widget_tasklist_opts[] =
CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), CFG_INT((char *) "y", 0xffffffff, CFGF_NONE),
/** Mouse bindings. */ /** Mouse bindings. */
CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI),
/** Markup title string for normal window */ /** Markup title string for normal window. */
CFG_STR((char *) "text_normal", (char *) "<bg color=\"#444444\"/><title/>", CFGF_NONE), CFG_STR((char *) "text_normal", (char *) "<bg color=\"#444444\"/><title/>", CFGF_NONE),
/** Markup title string for focused windows. */ /** Markup title string for focused windows. */
CFG_STR((char *) "text_focus", (char *) "<bg color=\"#535d6c\"/><title/>", CFGF_NONE), CFG_STR((char *) "text_focus", (char *) "<bg color=\"#535d6c\"/><title/>", CFGF_NONE),

140
widgets/taglist.c
View File

@ -24,11 +24,33 @@
#include "widget.h" #include "widget.h"
#include "tag.h" #include "tag.h"
#include "event.h" #include "event.h"
#include "common/markup.h"
#include "common/util.h" #include "common/util.h"
#include "common/configopts.h" #include "common/configopts.h"
extern AwesomeConf globalconf; extern AwesomeConf globalconf;
typedef struct
{
char *text_normal, *text_focus, *text_urgent;
area_t *draw_area;
} taglist_data_t;
static char *
tag_markup_parse(tag_t *t, const char *str, ssize_t len)
{
const char *elements[] = { "title", NULL };
const char *elements_sub[] = { t->name , NULL };
markup_parser_data_t *p;
p = markup_parser_data_new(elements, elements_sub, countof(elements));
if(!markup_parse(p, str, len))
return a_strdup(str);
return p->text;
}
/** Check if at least one client is tagged with tag number t and is on screen /** Check if at least one client is tagged with tag number t and is on screen
* screen * screen
* \param screen screen number * \param screen screen number
@ -59,15 +81,15 @@ tag_isurgent(tag_t *t)
return false; return false;
} }
static style_t static char *
taglist_style_get(VirtScreen vscreen, tag_t *tag) taglist_text_get(tag_t *tag, taglist_data_t *data)
{ {
if(tag->selected) if(tag->selected)
return vscreen.styles.focus; return data->text_focus;
else if(tag_isurgent(tag)) else if(tag_isurgent(tag))
return vscreen.styles.urgent; return data->text_urgent;
return vscreen.styles.normal; return data->text_normal;
} }
static int static int
@ -77,21 +99,34 @@ taglist_draw(widget_t *widget,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
tag_t *tag; tag_t *tag;
taglist_data_t *data = widget->data;
client_t *sel = globalconf.focus->client; client_t *sel = globalconf.focus->client;
VirtScreen vscreen = globalconf.screens[widget->statusbar->screen]; VirtScreen vscreen = globalconf.screens[widget->statusbar->screen];
int w = 0, flagsize; int i = 0;
style_t style; style_t style = vscreen.styles.normal;
area_t area; area_t *area, rectangle = { 0, 0, 0, 0, NULL, NULL };
char **text;
flagsize = (vscreen.styles.normal.font->height + 2) / 3; rectangle.width = rectangle.height = (style.font->height + 2) / 3;
widget->area.width = 0; widget->area.width = 0;
for(tag = vscreen.tags; tag; tag = tag->next) area_list_wipe(&data->draw_area);
text = p_new(char *, 1);
for(tag = vscreen.tags; tag; tag = tag->next, i++)
{ {
style = tag->selected ? vscreen.styles.focus : vscreen.styles.normal; area = p_new(area_t, 1);
widget->area.width += draw_text_extents(ctx->connection, ctx->default_screen, p_realloc(&text, i + 1);
style.font, tag->name).width + style.font->height; text[i] = taglist_text_get(tag, data);
text[i] = tag_markup_parse(tag, text[i], a_strlen(text[i]));
*area = draw_text_extents(ctx->connection, ctx->default_screen,
style.font, text[i]);
area->x = widget->area.width;
area->width += style.font->height;
area->height = widget->statusbar->height;
area_list_append(&data->draw_area, area);
widget->area.width += area->width;
} }
if(!widget->user_supplied_x) if(!widget->user_supplied_x)
@ -103,28 +138,19 @@ taglist_draw(widget_t *widget,
if(!widget->user_supplied_y) if(!widget->user_supplied_y)
widget->area.y = 0; widget->area.y = 0;
widget->area.width = 0; for(area = data->draw_area, tag = vscreen.tags, i = 0;
for(tag = vscreen.tags; tag; tag = tag->next) tag && area;
tag = tag->next, area = area->next, i++)
{ {
style = taglist_style_get(vscreen, tag); draw_text(ctx, *area, 0, text[i], style);
w = draw_text_extents(ctx->connection, ctx->default_screen,
style.font, tag->name).width + style.font->height;
area.x = widget->area.x + widget->area.width;
area.y = widget->area.y;
area.width = w;
area.height = widget->statusbar->height;
draw_text(ctx, area, 0, tag->name, style);
if(tag_isoccupied(tag)) if(tag_isoccupied(tag))
{ {
area_t rectangle = { widget->area.x + widget->area.width, rectangle.x = area->x;
widget->area.y, rectangle.y = area->y;
flagsize, draw_rectangle(ctx, rectangle, 1.0,
flagsize, sel && is_client_tagged(sel, tag), style.fg);
NULL, NULL };
draw_rectangle(ctx, rectangle, 1.0, sel && is_client_tagged(sel, tag), style.fg);
} }
widget->area.width += w;
} }
widget->area.height = widget->statusbar->height; widget->area.height = widget->statusbar->height;
@ -138,62 +164,43 @@ taglist_button_press(widget_t *widget, xcb_button_press_event_t *ev)
Button *b; Button *b;
tag_t *tag; tag_t *tag;
char buf[4]; char buf[4];
int prev_width = 0, width = 0, i = 1; int i = 1;
style_t style; taglist_data_t *data = widget->data;
area_t *area = data->draw_area;
for(b = widget->buttons; b; b = b->next) for(b = widget->buttons; b; b = b->next)
if(ev->detail == b->button && CLEANMASK(ev->state) == b->mod && b->func) if(ev->detail == b->button && CLEANMASK(ev->state) == b->mod && b->func)
switch(widget->statusbar->position) switch(widget->statusbar->position)
{ {
case Top: default:
case Bottom: for(tag = vscreen.tags; tag; tag = tag->next, i++, area = area->next)
for(tag = vscreen.tags; tag; tag = tag->next, i++) if(ev->event_x >= AREA_LEFT(*area)
{ && ev->event_x < AREA_RIGHT(*area))
style = taglist_style_get(vscreen, tag);
width = draw_text_extents(globalconf.connection, globalconf.default_screen,
style.font, tag->name).width
+ style.font->height;
if(ev->event_x >= widget->area.x + prev_width
&& ev->event_x < widget->area.x + prev_width + width)
{ {
snprintf(buf, sizeof(buf), "%d", i); snprintf(buf, sizeof(buf), "%d", i);
b->func(widget->statusbar->screen, buf); b->func(widget->statusbar->screen, buf);
return; return;
} }
prev_width += width;
}
break; break;
case Right: case Right:
for(tag = vscreen.tags; tag; tag = tag->next, i++) for(tag = vscreen.tags; tag; tag = tag->next, i++, area = area->next)
{ if(ev->event_y >= AREA_LEFT(*area)
style = taglist_style_get(vscreen, tag); && ev->event_y < AREA_RIGHT(*area))
width = draw_text_extents(globalconf.connection, globalconf.default_screen,
style.font, tag->name).width + style.font->height;
if(ev->event_y >= widget->area.x + prev_width
&& ev->event_y < widget->area.x + prev_width + width)
{ {
snprintf(buf, sizeof(buf), "%d", i); snprintf(buf, sizeof(buf), "%d", i);
b->func(widget->statusbar->screen, buf); b->func(widget->statusbar->screen, buf);
return; return;
} }
prev_width += width;
}
break; break;
default: case Left:
for(tag = vscreen.tags; tag; tag = tag->next, i++) for(tag = vscreen.tags; tag; tag = tag->next, i++, area = area->next)
{ if(widget->statusbar->width - ev->event_y >= AREA_LEFT(*area)
style = taglist_style_get(vscreen, tag); && widget->statusbar->width - ev->event_y < AREA_RIGHT(*area))
width = draw_text_extents(globalconf.connection, globalconf.default_screen,
style.font, tag->name).width + style.font->height;
if(widget->statusbar->width - ev->event_y >= widget->area.x + prev_width
&& widget->statusbar->width - ev->event_y < widget->area.x + prev_width + width)
{ {
snprintf(buf, sizeof(buf), "%d", i); snprintf(buf, sizeof(buf), "%d", i);
b->func(widget->statusbar->screen, buf); b->func(widget->statusbar->screen, buf);
return; return;
} }
prev_width += width;
}
break; break;
} }
} }
@ -202,12 +209,19 @@ widget_t *
taglist_new(statusbar_t *statusbar, cfg_t *config) taglist_new(statusbar_t *statusbar, cfg_t *config)
{ {
widget_t *w; widget_t *w;
taglist_data_t *d;
w = p_new(widget_t, 1); w = p_new(widget_t, 1);
widget_common_new(w, statusbar, config); widget_common_new(w, statusbar, config);
w->draw = taglist_draw; w->draw = taglist_draw;
w->button_press = taglist_button_press; w->button_press = taglist_button_press;
w->alignment = cfg_getalignment(config, "align"); w->alignment = cfg_getalignment(config, "align");
w->data = d = p_new(taglist_data_t, 1);
d->text_normal = a_strdup(cfg_getstr(config, "text_normal"));
d->text_focus = a_strdup(cfg_getstr(config, "text_focus"));
d->text_urgent = a_strdup(cfg_getstr(config, "text_urgent"));
/* Set cache property */ /* Set cache property */
w->cache.flags = WIDGET_CACHE_TAGS | WIDGET_CACHE_CLIENTS; w->cache.flags = WIDGET_CACHE_TAGS | WIDGET_CACHE_CLIENTS;