about summary refs log tree commit diff stats
path: root/draw.c
diff options
context:
space:
mode:
Diffstat (limited to 'draw.c')
-rw-r--r--draw.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/draw.c b/draw.c
index e0a93fe..175017b 100644
--- a/draw.c
+++ b/draw.c
@@ -95,7 +95,6 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
-	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
@@ -124,16 +123,11 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	}
 	if(w > dc.w)
 		return; /* too long */
-	gcv.foreground = col[ColFG];
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+	XSetForeground(dpy, dc.gc, col[ColFG]);
+	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-	}
-	else {
-		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+	else
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
 }
 
 unsigned int
class='oid'>d68782cd3 ^
1dd9ec85b ^
d68782cd3 ^


4922b52de ^
beb9e3d32 ^
4922b52de ^
beb9e3d32 ^
d68782cd3 ^


4922b52de ^

d68782cd3 ^



4922b52de ^
d68782cd3 ^
4922b52de ^

d68782cd3 ^



4922b52de ^

d68782cd3 ^
4922b52de ^

d68782cd3 ^




beb9e3d32 ^
d68782cd3 ^
0f37d0e1f ^
d68782cd3 ^


0f37d0e1f ^
d68782cd3 ^

877bd9390 ^
d68782cd3 ^

877bd9390 ^
d68782cd3 ^




0f37d0e1f ^
d68782cd3 ^



877bd9390 ^
d68782cd3 ^

8733886e5 ^





d68782cd3 ^











1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96