From dfd84f9bf3b9d949412a73bc62a43109b340d395 Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Wed, 12 Jul 2006 15:17:22 +0200 Subject: simplified several portions of code through replacing rect structs with x,y,h,w counterparts (much more readable) --- bar.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'bar.c') diff --git a/bar.c b/bar.c index 1f12512..f70a246 100644 --- a/bar.c +++ b/bar.c @@ -8,23 +8,22 @@ void draw_bar() { - brush.rect = barrect; - brush.rect.x = brush.rect.y = 0; + brush.x = brush.y = 0; + brush.w = bw; + brush.h = bh; draw(dpy, &brush, False, NULL); if(stack) { - brush.rect.width = textwidth(&brush.font, stack->name) + labelheight(&brush.font); + brush.w = textw(&brush.font, stack->name) + bh; swap((void **)&brush.fg, (void **)&brush.bg); draw(dpy, &brush, True, stack->name); swap((void **)&brush.fg, (void **)&brush.bg); - brush.rect.x += brush.rect.width; + brush.x += brush.w; } - brush.rect.width = textwidth(&brush.font, statustext) + labelheight(&brush.font); - brush.rect.x = barrect.x + barrect.width - brush.rect.width; + brush.w = textw(&brush.font, statustext) + bh; + brush.x = bx + bw - brush.w; draw(dpy, &brush, False, statustext); - - XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, barrect.width, - barrect.height, 0, 0); + XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, bw, bh, 0, 0); XFlush(dpy); } -- cgit v1.2.3