readded border color, this sucks least
This commit is contained in:
		
							parent
							
								
									4b0328f209
								
							
						
					
					
						commit
						00255728aa
					
				| @ -11,6 +11,7 @@ const char *tags[] = { "work", "net", "fnord", NULL }; | |||||||
| #define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*" | #define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*" | ||||||
| #define BGCOLOR			"#eeeeee" | #define BGCOLOR			"#eeeeee" | ||||||
| #define FGCOLOR			"#666699" | #define FGCOLOR			"#666699" | ||||||
|  | #define BORDERCOLOR		"#9999CC" | ||||||
| #define MODKEY			Mod1Mask | #define MODKEY			Mod1Mask | ||||||
| #define NUMLOCKMASK		Mod2Mask | #define NUMLOCKMASK		Mod2Mask | ||||||
| #define MASTERW			60 /* percent */ | #define MASTERW			60 /* percent */ | ||||||
|  | |||||||
| @ -11,6 +11,7 @@ const char *tags[] = { "0", "1", "2", "3", "4", NULL }; | |||||||
| #define FONT			"fixed" | #define FONT			"fixed" | ||||||
| #define BGCOLOR			"#666699" | #define BGCOLOR			"#666699" | ||||||
| #define FGCOLOR			"#eeeeee" | #define FGCOLOR			"#eeeeee" | ||||||
|  | #define BORDERCOLOR		"#9999CC" | ||||||
| #define MODKEY			Mod1Mask | #define MODKEY			Mod1Mask | ||||||
| #define NUMLOCKMASK		Mod2Mask | #define NUMLOCKMASK		Mod2Mask | ||||||
| #define MASTERW			60 /* percent */ | #define MASTERW			60 /* percent */ | ||||||
|  | |||||||
							
								
								
									
										36
									
								
								draw.c
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								draw.c
									
									
									
									
									
								
							| @ -9,6 +9,26 @@ | |||||||
| 
 | 
 | ||||||
| /* static */ | /* static */ | ||||||
| 
 | 
 | ||||||
|  | static void | ||||||
|  | drawborder(void) | ||||||
|  | { | ||||||
|  | 	XPoint points[5]; | ||||||
|  | 
 | ||||||
|  | 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); | ||||||
|  | 	XSetForeground(dpy, dc.gc, dc.border); | ||||||
|  | 	points[0].x = dc.x; | ||||||
|  | 	points[0].y = dc.y; | ||||||
|  | 	points[1].x = dc.w - 1; | ||||||
|  | 	points[1].y = 0; | ||||||
|  | 	points[2].x = 0; | ||||||
|  | 	points[2].y = dc.h - 1; | ||||||
|  | 	points[3].x = -(dc.w - 1); | ||||||
|  | 	points[3].y = 0; | ||||||
|  | 	points[4].x = 0; | ||||||
|  | 	points[4].y = -(dc.h - 1); | ||||||
|  | 	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); | ||||||
|  | } | ||||||
|  | 
 | ||||||
| static unsigned int | static unsigned int | ||||||
| textnw(const char *text, unsigned int len) | textnw(const char *text, unsigned int len) | ||||||
| { | { | ||||||
| @ -28,11 +48,12 @@ drawtext(const char *text, Bool invert) | |||||||
| 	static char buf[256]; | 	static char buf[256]; | ||||||
| 	unsigned int len; | 	unsigned int len; | ||||||
| 	XGCValues gcv; | 	XGCValues gcv; | ||||||
| 	XPoint points[5]; |  | ||||||
| 	XRectangle r = { dc.x, dc.y, dc.w, dc.h }; | 	XRectangle r = { dc.x, dc.y, dc.w, dc.h }; | ||||||
| 
 | 
 | ||||||
| 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); | 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); | ||||||
| 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); | 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); | ||||||
|  | 	drawborder(); | ||||||
|  | 
 | ||||||
| 	if(!text) | 	if(!text) | ||||||
| 		return; | 		return; | ||||||
| 
 | 
 | ||||||
| @ -66,19 +87,6 @@ drawtext(const char *text, Bool invert) | |||||||
| 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); | 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); | ||||||
| 		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); | 		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); | ||||||
| 	} | 	} | ||||||
| 
 |  | ||||||
| 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); |  | ||||||
| 	points[0].x = dc.x; |  | ||||||
| 	points[0].y = dc.y; |  | ||||||
| 	points[1].x = dc.w - 1; |  | ||||||
| 	points[1].y = 0; |  | ||||||
| 	points[2].x = 0; |  | ||||||
| 	points[2].y = dc.h - 1; |  | ||||||
| 	points[3].x = -(dc.w - 1); |  | ||||||
| 	points[3].y = 0; |  | ||||||
| 	points[4].x = 0; |  | ||||||
| 	points[4].y = -(dc.h - 1); |  | ||||||
| 	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| /* extern */ | /* extern */ | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								dwm.h
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								dwm.h
									
									
									
									
									
								
							| @ -43,6 +43,7 @@ struct DC { /* draw context */ | |||||||
| 	int x, y, w, h; | 	int x, y, w, h; | ||||||
| 	unsigned long bg; | 	unsigned long bg; | ||||||
| 	unsigned long fg; | 	unsigned long fg; | ||||||
|  | 	unsigned long border; | ||||||
| 	Drawable drawable; | 	Drawable drawable; | ||||||
| 	Fnt font; | 	Fnt font; | ||||||
| 	GC gc; | 	GC gc; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Anselm R.Garbe
						Anselm R.Garbe