@ -59,7 +59,7 @@
/* enums */
/* enums */
enum { CurNormal , CurResize , CurMove , CurLast } ; /* cursor */
enum { CurNormal , CurResize , CurMove , CurLast } ; /* cursor */
enum { SchemeNorm , SchemeSel , SchemeStatus , SchemeTagsSel , SchemeTagsNorm , SchemeInfoSel , SchemeInfoNorm } ; /* color schemes */
enum { SchemeNorm , SchemeSel , SchemeStatus , SchemeTagsSel , SchemeTagsNorm , SchemeInfoSel , SchemeInfoNorm , SchemeWarn , SchemeUrgent , SchemeWorking } ; /* color schemes */
enum { NetSupported , NetWMName , NetWMState , NetWMCheck ,
enum { NetSupported , NetWMName , NetWMState , NetWMCheck ,
NetWMFullscreen , NetActiveWindow , NetWMWindowType ,
NetWMFullscreen , NetActiveWindow , NetWMWindowType ,
NetWMWindowTypeDialog , NetClientList , NetLast } ; /* EWMH atoms */
NetWMWindowTypeDialog , NetClientList , NetLast } ; /* EWMH atoms */
@ -745,13 +745,27 @@ drawbar(Monitor *m)
int boxs = drw - > fonts - > h / 9 ;
int boxs = drw - > fonts - > h / 9 ;
int boxw = drw - > fonts - > h / 6 + 2 ;
int boxw = drw - > fonts - > h / 6 + 2 ;
unsigned int i , occ = 0 , urg = 0 ;
unsigned int i , occ = 0 , urg = 0 ;
char * ts = stext ;
char * tp = stext ;
int tx = 0 ;
char ctmp ;
Client * c ;
Client * c ;
/* draw status first so it can be overdrawn by tags later */
/* draw status first so it can be overdrawn by tags later */
if ( m = = selmon ) { /* status is only drawn on selected monitor */
if ( m = = selmon ) { /* status is only drawn on selected monitor */
drw_setscheme ( drw , scheme [ SchemeStatus ] ) ;
drw_setscheme ( drw , scheme [ SchemeStatus ] ) ;
tw = TEXTW ( stext ) - lrpad + 2 ; /* 2px right padding */
tw = TEXTW ( stext ) - lrpad + 2 ; /* 2px right padding */
drw_text ( drw , m - > ww - tw , 0 , tw , bh , 0 , stext , 0 ) ;
while ( 1 ) {
if ( ( unsigned int ) * ts > LENGTH ( colors ) ) { ts + + ; continue ; }
ctmp = * ts ;
* ts = ' \0 ' ;
drw_text ( drw , m - > ww - tw + tx , 0 , tw - tx , bh , 0 , tp , 0 ) ;
tx + = TEXTW ( tp ) - lrpad ;
if ( ctmp = = ' \0 ' ) { break ; }
drw_setscheme ( drw , scheme [ ( unsigned int ) ( ctmp - 1 ) ] ) ;
* ts = ctmp ;
tp = + + ts ;
}
}
}
for ( c = m - > clients ; c ; c = c - > next ) {
for ( c = m - > clients ; c ; c = c - > next ) {