renamed blitz_draw_input into blitz_draw_label, now implementing blitz_draw_input

This commit is contained in:
Anselm R. Garbe 2006-06-22 12:00:18 +02:00
parent dbe41d2ff3
commit 8ad66e8f67
4 changed files with 11 additions and 10 deletions

View File

@ -134,7 +134,7 @@ draw_bar()
for(; b; b=b->next) {
if(b == rbar)
b->brush.align = EAST;
blitz_draw_input(&b->brush, b->text);
blitz_draw_label(&b->brush, b->text);
}
MapBar:
XCopyArea(blz.display, bbrush.drawable, barwin, bbrush.gc, 0, 0,

View File

@ -173,9 +173,9 @@ draw_frame(Frame *f)
f->titlebar.rect.width = f->rect.width - (f->tagbar.rect.width + f->posbar.rect.width);
blitz_draw_tile(&f->tile);
blitz_draw_input(&f->tagbar, f->client->tags);
blitz_draw_input(&f->titlebar, f->client->name);
blitz_draw_input(&f->posbar, buf);
blitz_draw_label(&f->tagbar, f->client->tags);
blitz_draw_label(&f->titlebar, f->client->name);
blitz_draw_label(&f->posbar, buf);
}
void

View File

@ -142,13 +142,13 @@ draw_menu()
cmdw = cwidth;
if(cmdw && item.size)
brush.rect.width = cmdw;
blitz_draw_input(&brush, text);
blitz_draw_label(&brush, text);
}
else {
cmdw = twidth;
brush.color = selcolor;
brush.rect.width = cmdw;
blitz_draw_input(&brush, title);
blitz_draw_label(&brush, title);
}
offx += brush.rect.width;
@ -158,7 +158,7 @@ draw_menu()
brush.rect.x = offx;
brush.rect.width = seek;
offx += brush.rect.width;
blitz_draw_input(&brush, prevoff < curroff ? "<" : nil);
blitz_draw_label(&brush, prevoff < curroff ? "<" : nil);
/* determine maximum items */
for(i = curroff; i < nextoff; i++) {
@ -171,14 +171,14 @@ draw_menu()
brush.color = selcolor;
else
brush.color = normcolor;
blitz_draw_input(&brush, item.data[i]);
blitz_draw_label(&brush, item.data[i]);
offx += brush.rect.width;
}
brush.color = normcolor;
brush.rect.x = irect.width - seek;
brush.rect.width = seek;
blitz_draw_input(&brush, item.size > nextoff ? ">" : nil);
blitz_draw_label(&brush, item.size > nextoff ? ">" : nil);
}
XCopyArea(blz.display, brush.drawable, win, brush.gc, 0, 0, irect.width,
irect.height, 0, 0);

View File

@ -72,7 +72,8 @@ struct BlitzInput {
int blitz_loadcolor(Blitz *blitz, BlitzColor *c);
/* brush.c */
void blitz_draw_input(BlitzBrush *b, char *text);
void blitz_draw_label(BlitzBrush *b, char *text);
void blitz_draw_input(BlitzBrush *b, BlitzInput *input);
void blitz_draw_tile(BlitzBrush *b);
/* font.c */