equal
deleted
inserted
replaced
515 drawbar(void) { |
515 drawbar(void) { |
516 int i, x; |
516 int i, x; |
517 Client *c; |
517 Client *c; |
518 |
518 |
519 dc.x = 0; |
519 dc.x = 0; |
520 dc.w = bgw; |
520 if(bgw > 0) { |
521 drawtext(geom->symbol, dc.norm, False); |
521 dc.w = bgw; |
522 dc.x += bgw; |
522 drawtext(geom->symbol, dc.norm, False); |
|
523 dc.x += bgw; |
|
524 } |
523 for(c = stack; c && !isvisible(c); c = c->snext); |
525 for(c = stack; c && !isvisible(c); c = c->snext); |
524 for(i = 0; i < LENGTH(tags); i++) { |
526 for(i = 0; i < LENGTH(tags); i++) { |
525 dc.w = textw(tags[i]); |
527 dc.w = textw(tags[i]); |
526 if(seltags[i]) { |
528 if(seltags[i]) { |
527 drawtext(tags[i], dc.sel, isurgent(i)); |
529 drawtext(tags[i], dc.sel, isurgent(i)); |
531 drawtext(tags[i], dc.norm, isurgent(i)); |
533 drawtext(tags[i], dc.norm, isurgent(i)); |
532 drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm); |
534 drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm); |
533 } |
535 } |
534 dc.x += dc.w; |
536 dc.x += dc.w; |
535 } |
537 } |
536 dc.w = blw; |
538 if(blw > 0) { |
537 drawtext(lt->symbol, dc.norm, False); |
539 dc.w = blw; |
538 x = dc.x + dc.w; |
540 drawtext(lt->symbol, dc.norm, False); |
|
541 x = dc.x + dc.w; |
|
542 } |
|
543 else |
|
544 x = dc.x; |
539 dc.w = textw(stext); |
545 dc.w = textw(stext); |
540 dc.x = bw - dc.w; |
546 dc.x = bw - dc.w; |
541 if(dc.x < x) { |
547 if(dc.x < x) { |
542 dc.x = x; |
548 dc.x = x; |
543 dc.w = bw - x; |
549 dc.w = bw - x; |
1500 |
1506 |
1501 /* init layouts */ |
1507 /* init layouts */ |
1502 lt = &layouts[0]; |
1508 lt = &layouts[0]; |
1503 |
1509 |
1504 /* init bar */ |
1510 /* init bar */ |
1505 for(blw = i = 0; i < LENGTH(layouts); i++) { |
1511 for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) { |
1506 w = textw(layouts[i].symbol); |
1512 w = textw(layouts[i].symbol); |
1507 if(w > blw) |
1513 if(w > blw) |
1508 blw = w; |
1514 blw = w; |
1509 } |
1515 } |
1510 for(bgw = i = 0; i < LENGTH(geoms); i++) { |
1516 for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) { |
1511 w = textw(geoms[i].symbol); |
1517 w = textw(geoms[i].symbol); |
1512 if(w > bgw) |
1518 if(w > bgw) |
1513 bgw = w; |
1519 bgw = w; |
1514 } |
1520 } |
1515 |
1521 |