Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use 2 vars for knowing if users supplied coords

This commit is contained in:
Julien Danjou 2008-01-05 12:35:12 +01:00
parent a34d1bc583
commit 609318cbec
10 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h
View File

@ -106,6 +106,9 @@ struct Widget
Alignment alignment; Alignment alignment;
/** Misc private data */ /** Misc private data */
void *data; void *data;
/** True if user supplied coords */
Bool user_supplied_x;
Bool user_supplied_y;
/** Area */ /** Area */
Area area; Area area;
/** Buttons bindings */ /** Buttons bindings */

2
widget.c
View File

@ -117,6 +117,8 @@ widget_common_new(Widget *widget, Statusbar *statusbar, cfg_t* config)
widget->button_press = widget_common_button_press; widget->button_press = widget_common_button_press;
widget->area.x = cfg_getint(config, "x"); widget->area.x = cfg_getint(config, "x");
widget->area.y = cfg_getint(config, "y"); widget->area.y = cfg_getint(config, "y");
widget->user_supplied_x = (widget->area.x >= 0);
widget->user_supplied_y = (widget->area.y >= 0);
} }
/** Send command to widget /** Send command to widget

15
widgets/focustitle.c
View File

@ -43,32 +43,31 @@ focustitle_draw(Widget *widget, DrawCtx *ctx, int offset, int used)
{ {
Data *d = widget->data; Data *d = widget->data;
Client *sel = focus_get_current_client(widget->statusbar->screen); Client *sel = focus_get_current_client(widget->statusbar->screen);
Area widget_area = widget->area;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
0, 0,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
if(sel) if(sel)
{ {
draw_text(ctx, widget_area.x, widget_area.y, draw_text(ctx, widget->area.x, widget->area.y,
widget->statusbar->width - used, widget->statusbar->width - used,
widget->statusbar->height, widget->statusbar->height,
d->align, d->align,
widget->font->height / 2, widget->font, sel->name, widget->font->height / 2, widget->font, sel->name,
d->fg, d->bg); d->fg, d->bg);
if(sel->isfloating) if(sel->isfloating)
draw_circle(ctx, widget_area.x, widget_area.y, draw_circle(ctx, widget->area.x, widget->area.y,
(widget->font->height + 2) / 4, (widget->font->height + 2) / 4,
sel->ismax, d->fg); sel->ismax, d->fg);
} }
else else
draw_rectangle(ctx, widget_area.x, widget_area.y, draw_rectangle(ctx, widget->area.x, widget->area.y,
widget->statusbar->width - used, widget->statusbar->height, True, d->bg); widget->statusbar->width - used, widget->statusbar->height, True, d->bg);
widget->area.width = widget->statusbar->width - used; widget->area.width = widget->statusbar->width - used;

12
widgets/iconbox.c
View File

@ -35,23 +35,23 @@ iconbox_draw(Widget *widget, DrawCtx *ctx, int offset,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
Data *d = widget->data; Data *d = widget->data;
Area area = draw_get_image_size(d->image), widget_area = widget->area; Area area = draw_get_image_size(d->image);
if(d->resize) if(d->resize)
widget->area.width = ((double) widget->statusbar->height / area.height) * area.width; widget->area.width = ((double) widget->statusbar->height / area.height) * area.width;
else else
widget->area.width = area.width; widget->area.width = area.width;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
widget->area.width, widget->area.width,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
draw_image(ctx, widget_area.x, widget_area.y, draw_image(ctx, widget->area.x, widget->area.y,
d->resize ? widget->statusbar->height : 0, d->image); d->resize ? widget->statusbar->height : 0, d->image);
return widget->area.width; return widget->area.width;

11
widgets/layoutinfo.c
View File

@ -34,20 +34,19 @@ layoutinfo_draw(Widget *widget,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
Tag **curtags = get_current_tags(widget->statusbar->screen); Tag **curtags = get_current_tags(widget->statusbar->screen);
Area widget_area = widget->area;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
widget->statusbar->height, widget->statusbar->height,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
widget->area.width = widget->statusbar->height; widget->area.width = widget->statusbar->height;
draw_image(ctx, widget_area.x, widget_area.y, draw_image(ctx, widget->area.x, widget->area.y,
widget->statusbar->height, widget->statusbar->height,
curtags[0]->layout->image); curtags[0]->layout->image);

22
widgets/netwmicon.c
View File

@ -34,7 +34,7 @@ static int
netwmicon_draw(Widget *widget, DrawCtx *ctx, int offset, netwmicon_draw(Widget *widget, DrawCtx *ctx, int offset,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
Area area, widget_area = widget->area; Area area;
Rule* r; Rule* r;
Client *sel = focus_get_current_client(widget->statusbar->screen); Client *sel = focus_get_current_client(widget->statusbar->screen);
NetWMIcon *icon; NetWMIcon *icon;
@ -51,15 +51,15 @@ netwmicon_draw(Widget *widget, DrawCtx *ctx, int offset,
area = draw_get_image_size(r->icon); area = draw_get_image_size(r->icon);
widget->area.width = ((double) widget->statusbar->height / (double) area.height) widget->area.width = ((double) widget->statusbar->height / (double) area.height)
* area.width; * area.width;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
widget->area.width, widget->area.width,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
draw_image(ctx, widget_area.x, widget_area.y, draw_image(ctx, widget->area.x, widget->area.y,
widget->statusbar->height, r->icon); widget->statusbar->height, r->icon);
return widget->area.width; return widget->area.width;
@ -74,17 +74,17 @@ netwmicon_draw(Widget *widget, DrawCtx *ctx, int offset,
widget->area.width = ((double) widget->statusbar->height / (double) icon->height) * icon->width; widget->area.width = ((double) widget->statusbar->height / (double) icon->height) * icon->width;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
widget->area.width, widget->area.width,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
draw_image_from_argb_data(ctx, draw_image_from_argb_data(ctx,
widget_area.x, widget_area.y, widget->area.x, widget->area.y,
icon->width, icon->height, icon->width, icon->height,
widget->statusbar->height, icon->image); widget->statusbar->height, icon->image);

13
widgets/progressbar.c
View File

@ -55,7 +55,6 @@ progressbar_draw(Widget *widget, DrawCtx *ctx, int offset,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
int i, width, pwidth, margin_top, pb_height, left_offset; int i, width, pwidth, margin_top, pb_height, left_offset;
Area widget_area = widget->area;
Data *d = widget->data; Data *d = widget->data;
@ -64,18 +63,18 @@ progressbar_draw(Widget *widget, DrawCtx *ctx, int offset,
width = d->width - d->lpadding; width = d->width - d->lpadding;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
d->width, d->width,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
margin_top = (int) (widget->statusbar->height * (1 - d->height)) / 2 + 0.5 + widget_area.y; margin_top = (int) (widget->statusbar->height * (1 - d->height)) / 2 + 0.5 + widget->area.y;
pb_height = (int) (widget->statusbar->height * d->height - (d->gap * (d->bars - 1))) / d->bars + 0.5; pb_height = (int) (widget->statusbar->height * d->height - (d->gap * (d->bars - 1))) / d->bars + 0.5;
left_offset = widget_area.x + d->lpadding; left_offset = widget->area.x + d->lpadding;
for(i = 0; i < d->bars; i++) for(i = 0; i < d->bars; i++)
{ {

5
widgets/taglist.c
View File

@ -75,12 +75,13 @@ taglist_draw(Widget *widget,
for(tag = vscreen.tags; tag; tag = tag->next) for(tag = vscreen.tags; tag; tag = tag->next)
widget->area.width += textwidth(vscreen.font, tag->name) + vscreen.font->height; widget->area.width += textwidth(vscreen.font, tag->name) + vscreen.font->height;
widget->area.x = widget_calculate_offset(widget->statusbar->width, if(!widget->user_supplied_x)
widget->area.x = widget_calculate_offset(widget->statusbar->width,
widget->area.width, widget->area.width,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget->area.y = 0; widget->area.y = 0;
widget->area.width = 0; widget->area.width = 0;

6
widgets/tasklist.c
View File

@ -67,14 +67,14 @@ tasklist_draw(Widget *widget, DrawCtx *ctx, int offset, int used)
box_width = (widget->statusbar->width - used) / n; box_width = (widget->statusbar->width - used) / n;
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget->area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
0, 0,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget->area.y = 0; widget->area.y = widget->area.y = 0;
for(c = globalconf.clients; c; c = c->next) for(c = globalconf.clients; c; c = c->next)
if(ISVISIBLE_ON_TB(c, widget->statusbar->screen)) if(ISVISIBLE_ON_TB(c, widget->statusbar->screen))

11
widgets/textbox.c
View File

@ -40,22 +40,21 @@ textbox_draw(Widget *widget, DrawCtx *ctx, int offset,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
Data *d = widget->data; Data *d = widget->data;
Area widget_area = widget->area;
if(d->width) if(d->width)
widget->area.width = d->width; widget->area.width = d->width;
else else
widget->area.width = textwidth(widget->font, d->text); widget->area.width = textwidth(widget->font, d->text);
if(widget->area.x < 0) if(!widget->user_supplied_x)
widget_area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
widget->area.width, widget->area.width,
offset, offset,
widget->alignment); widget->alignment);
if(widget->area.y < 0) if(!widget->user_supplied_y)
widget_area.y = 0; widget->area.y = 0;
draw_text(ctx, widget_area.x, widget_area.y, widget->area.width, draw_text(ctx, widget->area.x, widget->area.y, widget->area.width,
widget->statusbar->height, d->align, 0, widget->font, widget->statusbar->height, d->align, 0, widget->font,
d->text, d->fg, d->bg); d->text, d->fg, d->bg);