changed things like I described in last mail
This commit is contained in:
		
							
								
								
									
										26
									
								
								draw.c
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								draw.c
									
									
									
									
									
								
							@@ -30,13 +30,13 @@ textnw(const char *text, unsigned int len) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void
 | 
					static void
 | 
				
			||||||
drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) {
 | 
					drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) {
 | 
				
			||||||
	int x, y, w, h;
 | 
						int x, y, w, h;
 | 
				
			||||||
	static char buf[256];
 | 
						static char buf[256];
 | 
				
			||||||
	unsigned int len, olen;
 | 
						unsigned int len, olen;
 | 
				
			||||||
	XGCValues gcv;
 | 
						XGCValues gcv;
 | 
				
			||||||
	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 | 
						XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 | 
				
			||||||
	XPoint pt[5];
 | 
						XPoint pt[3];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	XSetForeground(dpy, dc.gc, col[ColBG]);
 | 
						XSetForeground(dpy, dc.gc, col[ColBG]);
 | 
				
			||||||
	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 | 
						XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 | 
				
			||||||
@@ -74,24 +74,20 @@ drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) {
 | 
				
			|||||||
		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 | 
							XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 | 
				
			||||||
		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 | 
							XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if(ldot) {
 | 
						if(dot) {
 | 
				
			||||||
		r.x = dc.x + 2;
 | 
					 | 
				
			||||||
		r.y = dc.y + 2;
 | 
					 | 
				
			||||||
		r.width = r.height = (h + 2) / 4;
 | 
							r.width = r.height = (h + 2) / 4;
 | 
				
			||||||
 | 
							r.x = dc.x + dc.w - r.width - 2;
 | 
				
			||||||
 | 
							r.y = dc.y + dc.h - r.height - 2;
 | 
				
			||||||
		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 | 
							XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if(border) {
 | 
						if(border) {
 | 
				
			||||||
		pt[0].x = dc.x;
 | 
							pt[0].x = dc.x;
 | 
				
			||||||
		pt[0].y = dc.y;
 | 
							pt[0].y = dc.y + dc.h - 1;
 | 
				
			||||||
		pt[1].x = dc.w - 1;
 | 
							pt[1].x = 0;
 | 
				
			||||||
		pt[1].y = 0;
 | 
							pt[1].y = -(dc.h - 1);
 | 
				
			||||||
		pt[2].x = 0;
 | 
							pt[2].x = dc.w - 1;
 | 
				
			||||||
		pt[2].y = dc.h - 1;
 | 
							pt[2].y = 0;
 | 
				
			||||||
		pt[3].x = -(dc.w - 1);
 | 
							XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious);
 | 
				
			||||||
		pt[3].y = 0;
 | 
					 | 
				
			||||||
		pt[4].x = 0;
 | 
					 | 
				
			||||||
		pt[4].y = -(dc.h - 1);
 | 
					 | 
				
			||||||
		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user