Add statusbar colors
							parent
							
								
									69ad8cd996
								
							
						
					
					
						commit
						df9bee20a2
					
				| 
						 | 
					@ -12,11 +12,20 @@ static const char col_gray0[]       = "#0a0a0a";
 | 
				
			||||||
static const char col_gray1[]       = "#111111";
 | 
					static const char col_gray1[]       = "#111111";
 | 
				
			||||||
static const char col_gray2[]       = "#333333";
 | 
					static const char col_gray2[]       = "#333333";
 | 
				
			||||||
static const char col_gray3[]       = "#555555";
 | 
					static const char col_gray3[]       = "#555555";
 | 
				
			||||||
 | 
					// Warn & urgent colors
 | 
				
			||||||
static const char col_gray4[]       = "#cccccc";
 | 
					static const char col_gray4[]       = "#cccccc";
 | 
				
			||||||
 | 
					static const char col_black[]       = "#000000";
 | 
				
			||||||
 | 
					static const char col_red[]         = "#ff0000";
 | 
				
			||||||
 | 
					static const char col_yellow[]      = "#ffff00";
 | 
				
			||||||
 | 
					static const char col_white[]       = "#ffffff";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const char *colors[][3]      = {
 | 
					static const char *colors[][3]      = {
 | 
				
			||||||
	/*               fg         bg         border   */
 | 
						/*                fg         bg         border   */
 | 
				
			||||||
	[SchemeNorm] = { col_gray3, col_gray0, col_gray0 },
 | 
						[SchemeNorm] =  { col_gray4, col_gray0, col_gray2 },
 | 
				
			||||||
	[SchemeSel]  = { col_gray4, col_gray0,  col_gray2  },
 | 
						[SchemeSel]  =  { col_white, col_gray0,  col_gray3 },
 | 
				
			||||||
 | 
					  // Extra color schemes
 | 
				
			||||||
 | 
					  [SchemeWarn] =	{ col_black, col_yellow, col_red },
 | 
				
			||||||
 | 
					  [SchemeUrgent]=	{ col_white, col_red,    col_red },
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* tagging */
 | 
					/* tagging */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -60,7 +60,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* enums */
 | 
					/* enums */
 | 
				
			||||||
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 | 
					enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 | 
				
			||||||
enum { SchemeNorm, SchemeSel }; /* color schemes */
 | 
					enum { SchemeNorm, SchemeSel, SchemeWarn, SchemeUrgent }; /* 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 */
 | 
				
			||||||
| 
						 | 
					@ -729,13 +729,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[SchemeNorm]);
 | 
							drw_setscheme(drw, scheme[SchemeNorm]);
 | 
				
			||||||
		sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
 | 
							sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
 | 
				
			||||||
		drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
 | 
					 		while (1) {
 | 
				
			||||||
 | 
					 			if ((unsigned int)*ts > LENGTH(colors)) { ts++; continue ; }
 | 
				
			||||||
 | 
					 			ctmp = *ts;
 | 
				
			||||||
 | 
					 			*ts = '\0';
 | 
				
			||||||
 | 
					 			drw_text(drw, m->ww - sw + tx, 0, sw - 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) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue