equal
deleted
inserted
replaced
26 { |
26 { |
27 int x, y, w, h; |
27 int x, y, w, h; |
28 static char buf[256]; |
28 static char buf[256]; |
29 unsigned int len; |
29 unsigned int len; |
30 XGCValues gcv; |
30 XGCValues gcv; |
|
31 XPoint points[5]; |
31 XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
32 XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
32 |
33 |
33 XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); |
34 XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); |
34 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
35 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
35 |
|
36 if(!text) |
36 if(!text) |
37 return; |
37 return; |
38 |
38 |
39 w = 0; |
39 w = 0; |
40 len = strlen(text); |
40 len = strlen(text); |
64 else { |
64 else { |
65 gcv.font = dc.font.xfont->fid; |
65 gcv.font = dc.font.xfont->fid; |
66 XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); |
66 XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); |
67 XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
67 XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
68 } |
68 } |
|
69 |
|
70 XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); |
|
71 points[0].x = dc.x; |
|
72 points[0].y = dc.y; |
|
73 points[1].x = dc.w - 1; |
|
74 points[1].y = 0; |
|
75 points[2].x = 0; |
|
76 points[2].y = dc.h - 1; |
|
77 points[3].x = -(dc.w - 1); |
|
78 points[3].y = 0; |
|
79 points[4].x = 0; |
|
80 points[4].y = -(dc.h - 1); |
|
81 XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); |
69 } |
82 } |
70 |
83 |
71 /* extern */ |
84 /* extern */ |
72 |
85 |
73 void |
86 void |