642 drawtext(lt[m->sellt]->symbol, dc.norm, False); |
642 drawtext(lt[m->sellt]->symbol, dc.norm, False); |
643 x = dc.x + dc.w; |
643 x = dc.x + dc.w; |
644 } |
644 } |
645 else |
645 else |
646 x = dc.x; |
646 x = dc.x; |
647 if(m == selmon) { |
647 if(m == selmon) { /* status is only drawn on selected monitor */ |
648 dc.w = TEXTW(stext); |
648 dc.w = TEXTW(stext); |
649 dc.x = m->ww - dc.w; |
649 dc.x = m->ww - dc.w; |
650 if(dc.x < x) { |
650 if(dc.x < x) { |
651 dc.x = x; |
651 dc.x = x; |
652 dc.w = m->ww - x; |
652 dc.w = m->ww - x; |
653 } |
653 } |
654 drawtext(stext, dc.norm, False); |
654 drawtext(stext, dc.norm, False); |
655 if((dc.w = dc.x - x) > bh) { |
|
656 dc.x = x; |
|
657 if(selmon->sel) { |
|
658 drawtext(selmon->sel->name, dc.sel, False); |
|
659 drawsquare(selmon->sel->isfixed, selmon->sel->isfloating, False, dc.sel); |
|
660 } |
|
661 else |
|
662 drawtext(NULL, dc.norm, False); |
|
663 } |
|
664 } |
655 } |
665 else { |
656 else { |
|
657 dc.x = m->ww; |
|
658 } |
|
659 if((dc.w = dc.x - x) > bh) { |
666 dc.x = x; |
660 dc.x = x; |
667 dc.w = m->ww - x; |
661 if(m->sel) { |
668 drawtext(NULL, dc.norm, False); |
662 col = m == selmon ? dc.sel : dc.norm; |
|
663 drawtext(m->sel->name, col, False); |
|
664 drawsquare(m->sel->isfixed, m->sel->isfloating, False, col); |
|
665 } |
|
666 else |
|
667 drawtext(NULL, dc.norm, False); |
669 } |
668 } |
670 XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0); |
669 XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0); |
671 XSync(dpy, False); |
670 XSync(dpy, False); |
672 } |
671 } |
673 |
672 |