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

[textbox] Clean things which became useless with markup 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-04-25 18:58:29 +02:00
parent d3190fcf63
commit 3965c1e1f0
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/configopts.c
View File

@ -317,8 +317,6 @@ cfg_opt_t widget_textbox_opts[] =
CFG_STR((char *) "text", NULL, CFGF_NONE), CFG_STR((char *) "text", NULL, CFGF_NONE),
/** Text alignment. */ /** Text alignment. */
CFG_ALIGNMENT((char *) "text_align", (char *) "center", CFGF_NONE), CFG_ALIGNMENT((char *) "text_align", (char *) "center", CFGF_NONE),
/** Style to use for drawing. */
CFG_SEC((char *) "style", style_opts, CFGF_NONE),
CFG_AWESOME_END() CFG_AWESOME_END()
}; };
/** This section defines emptybox widget options. */ /** This section defines emptybox widget options. */

27
widgets/textbox.c
View File

@ -31,7 +31,6 @@ typedef struct
char *text; char *text;
int width; int width;
alignment_t align; alignment_t align;
style_t style;
} Data; } Data;
static int static int
@ -45,7 +44,7 @@ textbox_draw(widget_t *widget, DrawCtx *ctx, int offset, int used)
widget->area.width = widget->statusbar->width - used; widget->area.width = widget->statusbar->width - used;
else else
widget->area.width = MIN(draw_text_extents(ctx->connection, ctx->default_screen, widget->area.width = MIN(draw_text_extents(ctx->connection, ctx->default_screen,
d->style.font, d->text).width, globalconf.screens[widget->statusbar->screen].styles.normal.font, d->text).width,
widget->statusbar->width - used); widget->statusbar->width - used);
widget->area.height = widget->statusbar->height; widget->area.height = widget->statusbar->height;
@ -58,7 +57,7 @@ textbox_draw(widget_t *widget, DrawCtx *ctx, int offset, int used)
if(!widget->user_supplied_y) if(!widget->user_supplied_y)
widget->area.y = 0; widget->area.y = 0;
draw_text(ctx, widget->area, d->align, 0, d->text, d->style); draw_text(ctx, widget->area, d->align, 0, d->text, globalconf.screens[widget->statusbar->screen].styles.normal);
return widget->area.width; return widget->area.width;
} }
@ -67,7 +66,6 @@ static widget_tell_status_t
textbox_tell(widget_t *widget, char *property, char *new_value) textbox_tell(widget_t *widget, char *property, char *new_value)
{ {
Data *d = widget->data; Data *d = widget->data;
font_t *newfont;
if(!a_strcmp(property, "text")) if(!a_strcmp(property, "text"))
{ {
@ -75,22 +73,6 @@ textbox_tell(widget_t *widget, char *property, char *new_value)
p_delete(&d->text); p_delete(&d->text);
d->text = a_strdup(new_value); d->text = a_strdup(new_value);
} }
else if(!a_strcmp(property, "fg"))
if(draw_color_new(globalconf.connection, widget->statusbar->screen, new_value, &d->style.fg))
return WIDGET_NOERROR;
else
return WIDGET_ERROR_FORMAT_COLOR;
else if(!a_strcmp(property, "font"))
{
if((newfont = draw_font_new(globalconf.connection, globalconf.default_screen, new_value)))
{
if(d->style.font != globalconf.screens[widget->statusbar->screen].styles.normal.font)
draw_font_delete(&d->style.font);
d->style.font = newfont;
}
else
return WIDGET_ERROR_FORMAT_FONT;
}
else if(!a_strcmp(property, "width")) else if(!a_strcmp(property, "width"))
d->width = atoi(new_value); d->width = atoi(new_value);
else if(!a_strcmp(property, "text_align")) else if(!a_strcmp(property, "text_align"))
@ -115,11 +97,6 @@ textbox_new(statusbar_t *statusbar, cfg_t *config)
w->data = d = p_new(Data, 1); w->data = d = p_new(Data, 1);
draw_style_init(globalconf.connection, statusbar->phys_screen,
cfg_getsec(config, "style"),
&d->style,
&globalconf.screens[statusbar->screen].styles.normal);
d->width = cfg_getint(config, "width"); d->width = cfg_getint(config, "width");
d->align = cfg_getalignment(config, "text_align"); d->align = cfg_getalignment(config, "text_align");