changed things like I described in last mail
49f0ee32
1 file(s) · +11 −15
| 30 | 30 | } |
|
| 31 | 31 | ||
| 32 | 32 | static void |
|
| 33 | - | drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) { |
|
| 33 | + | drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) { |
|
| 34 | 34 | int x, y, w, h; |
|
| 35 | 35 | static char buf[256]; |
|
| 36 | 36 | unsigned int len, olen; |
|
| 37 | 37 | XGCValues gcv; |
|
| 38 | 38 | XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
|
| 39 | - | XPoint pt[5]; |
|
| 39 | + | XPoint pt[3]; |
|
| 40 | 40 | ||
| 41 | 41 | XSetForeground(dpy, dc.gc, col[ColBG]); |
|
| 42 | 42 | XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
|
| 74 | 74 | XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
|
| 75 | 75 | XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
|
| 76 | 76 | } |
|
| 77 | - | if(ldot) { |
|
| 78 | - | r.x = dc.x + 2; |
|
| 79 | - | r.y = dc.y + 2; |
|
| 77 | + | if(dot) { |
|
| 80 | 78 | r.width = r.height = (h + 2) / 4; |
|
| 79 | + | r.x = dc.x + dc.w - r.width - 2; |
|
| 80 | + | r.y = dc.y + dc.h - r.height - 2; |
|
| 81 | 81 | XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
|
| 82 | 82 | } |
|
| 83 | 83 | if(border) { |
|
| 84 | 84 | pt[0].x = dc.x; |
|
| 85 | - | pt[0].y = dc.y; |
|
| 86 | - | pt[1].x = dc.w - 1; |
|
| 87 | - | pt[1].y = 0; |
|
| 88 | - | pt[2].x = 0; |
|
| 89 | - | pt[2].y = dc.h - 1; |
|
| 90 | - | pt[3].x = -(dc.w - 1); |
|
| 91 | - | pt[3].y = 0; |
|
| 92 | - | pt[4].x = 0; |
|
| 93 | - | pt[4].y = -(dc.h - 1); |
|
| 94 | - | XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious); |
|
| 85 | + | pt[0].y = dc.y + dc.h - 1; |
|
| 86 | + | pt[1].x = 0; |
|
| 87 | + | pt[1].y = -(dc.h - 1); |
|
| 88 | + | pt[2].x = dc.w - 1; |
|
| 89 | + | pt[2].y = 0; |
|
| 90 | + | XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious); |
|
| 95 | 91 | } |
|
| 96 | 92 | } |
|
| 97 | 93 | ||