author | arg@10ksloc.org |
Mon, 07 Aug 2006 10:32:36 +0200 | |
changeset 210 | 4f96eae34049 |
parent 208 | e4bfe46c7910 |
child 218 | c674a0baac63 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
2 |
* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com> |
|
3 |
* See LICENSE file for license details. |
|
4 |
*/ |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
5 |
#include "dwm.h" |
2 | 6 |
#include <stdio.h> |
7 |
#include <string.h> |
|
32 | 8 |
#include <X11/Xlocale.h> |
9 |
||
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
10 |
/* static */ |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
11 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
12 |
static void |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
13 |
drawborder(void) |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
14 |
{ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
15 |
XPoint points[5]; |
123 | 16 |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
17 |
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
18 |
XSetForeground(dpy, dc.gc, dc.border); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
19 |
points[0].x = dc.x; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
20 |
points[0].y = dc.y; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
21 |
points[1].x = dc.w - 1; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
22 |
points[1].y = 0; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
23 |
points[2].x = 0; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
24 |
points[2].y = dc.h - 1; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
25 |
points[3].x = -(dc.w - 1); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
26 |
points[3].y = 0; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
27 |
points[4].x = 0; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
28 |
points[4].y = -(dc.h - 1); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
29 |
XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
30 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
31 |
|
77 | 32 |
static unsigned int |
173
1db04019684e
changed Client->tags and Rule->tags to be Bool (I'll also try to remove the TLast enum)
arg@10ksloc.org
parents:
164
diff
changeset
|
33 |
textnw(const char *text, unsigned int len) |
75 | 34 |
{ |
77 | 35 |
XRectangle r; |
123 | 36 |
|
77 | 37 |
if(dc.font.set) { |
38 |
XmbTextExtents(dc.font.set, text, len, NULL, &r); |
|
39 |
return r.width; |
|
40 |
} |
|
41 |
return XTextWidth(dc.font.xfont, text, len); |
|
75 | 42 |
} |
43 |
||
77 | 44 |
static void |
66
50450aa24a46
removed a bunch of lines through swap removal
Anselm R. Garbe <garbeam@wmii.de>
parents:
57
diff
changeset
|
45 |
drawtext(const char *text, Bool invert, Bool border) |
2 | 46 |
{ |
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
47 |
int x, y, w, h; |
123 | 48 |
static char buf[256]; |
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
49 |
unsigned int len; |
2 | 50 |
XGCValues gcv; |
34 | 51 |
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
2 | 52 |
|
66
50450aa24a46
removed a bunch of lines through swap removal
Anselm R. Garbe <garbeam@wmii.de>
parents:
57
diff
changeset
|
53 |
XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); |
34 | 54 |
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
2 | 55 |
|
30
2e0fb4130bfb
new stuff, fixed several issues
Anselm R. Garbe <garbeam@wmii.de>
parents:
26
diff
changeset
|
56 |
w = 0; |
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
57 |
if(border) |
34 | 58 |
drawborder(); |
2 | 59 |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
60 |
if(!text) |
2 | 61 |
return; |
62 |
||
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
63 |
len = strlen(text); |
2 | 64 |
if(len >= sizeof(buf)) |
65 |
len = sizeof(buf) - 1; |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
66 |
memcpy(buf, text, len); |
2 | 67 |
buf[len] = 0; |
68 |
||
34 | 69 |
h = dc.font.ascent + dc.font.descent; |
70 |
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; |
|
71 |
x = dc.x + (h / 2); |
|
2 | 72 |
|
73 |
/* shorten text if necessary */ |
|
43 | 74 |
while(len && (w = textnw(buf, len)) > dc.w - h) |
2 | 75 |
buf[--len] = 0; |
76 |
||
34 | 77 |
if(w > dc.w) |
2 | 78 |
return; /* too long */ |
79 |
||
66
50450aa24a46
removed a bunch of lines through swap removal
Anselm R. Garbe <garbeam@wmii.de>
parents:
57
diff
changeset
|
80 |
gcv.foreground = invert ? dc.bg : dc.fg; |
50450aa24a46
removed a bunch of lines through swap removal
Anselm R. Garbe <garbeam@wmii.de>
parents:
57
diff
changeset
|
81 |
gcv.background = invert ? dc.fg : dc.bg; |
34 | 82 |
if(dc.font.set) { |
83 |
XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); |
|
84 |
XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, |
|
2 | 85 |
x, y, buf, len); |
86 |
} |
|
87 |
else { |
|
34 | 88 |
gcv.font = dc.font.xfont->fid; |
89 |
XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); |
|
90 |
XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
|
2 | 91 |
} |
92 |
} |
|
93 |
||
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
94 |
/* extern */ |
77 | 95 |
|
96 |
void |
|
97 |
drawall() |
|
98 |
{ |
|
99 |
Client *c; |
|
100 |
||
142
9b9deafa0508
committed a patch which fixes the hints of Jukka
arg@10ksloc.org
parents:
124
diff
changeset
|
101 |
for(c = clients; c; c = getnext(c->next)) |
77 | 102 |
drawtitle(c); |
103 |
drawstatus(); |
|
104 |
} |
|
105 |
||
106 |
void |
|
107 |
drawstatus() |
|
108 |
{ |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
109 |
int i, x; |
77 | 110 |
Bool istile = arrange == dotile; |
111 |
||
112 |
dc.x = dc.y = 0; |
|
113 |
dc.w = bw; |
|
114 |
drawtext(NULL, !istile, False); |
|
115 |
||
116 |
dc.w = 0; |
|
178
e848966a1ac6
removed TLast tag enum, now tags is simple defined as char *[] array, the rest is calculated correctly, rules take an int array for the tags
arg@10ksloc.org
parents:
173
diff
changeset
|
117 |
for(i = 0; i < ntags; i++) { |
77 | 118 |
dc.x += dc.w; |
119 |
dc.w = textw(tags[i]); |
|
120 |
if(istile) |
|
121 |
drawtext(tags[i], (i == tsel), True); |
|
122 |
else |
|
123 |
drawtext(tags[i], (i != tsel), True); |
|
124 |
} |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
125 |
x = dc.x + dc.w; |
77 | 126 |
dc.w = textw(stext); |
127 |
dc.x = bx + bw - dc.w; |
|
208 | 128 |
drawtext(stext, !istile, True); |
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
129 |
if(sel && ((dc.w = dc.x - x) >= bh)) { |
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
130 |
dc.x = x; |
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
131 |
drawtext(sel->name, istile, True); |
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
132 |
} |
77 | 133 |
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); |
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
134 |
XSync(dpy, False); |
77 | 135 |
} |
136 |
||
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
137 |
void |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
138 |
drawtitle(Client *c) |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
139 |
{ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
140 |
int i; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
141 |
Bool istile = arrange == dotile; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
142 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
143 |
if(c == sel) { |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
144 |
drawstatus(); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
145 |
XUnmapWindow(dpy, c->title); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
146 |
XSetWindowBorder(dpy, c->win, dc.fg); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
147 |
return; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
148 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
149 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
150 |
XSetWindowBorder(dpy, c->win, dc.bg); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
151 |
XMapWindow(dpy, c->title); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
152 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
153 |
dc.x = dc.y = 0; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
154 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
155 |
dc.w = 0; |
178
e848966a1ac6
removed TLast tag enum, now tags is simple defined as char *[] array, the rest is calculated correctly, rules take an int array for the tags
arg@10ksloc.org
parents:
173
diff
changeset
|
156 |
for(i = 0; i < ntags; i++) { |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
157 |
if(c->tags[i]) { |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
158 |
dc.x += dc.w; |
173
1db04019684e
changed Client->tags and Rule->tags to be Bool (I'll also try to remove the TLast enum)
arg@10ksloc.org
parents:
164
diff
changeset
|
159 |
dc.w = textw(tags[i]); |
1db04019684e
changed Client->tags and Rule->tags to be Bool (I'll also try to remove the TLast enum)
arg@10ksloc.org
parents:
164
diff
changeset
|
160 |
drawtext(tags[i], !istile, True); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
161 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
162 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
163 |
dc.x += dc.w; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
164 |
dc.w = textw(c->name); |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
165 |
drawtext(c->name, !istile, True); |
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
166 |
XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0); |
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
167 |
XSync(dpy, False); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
168 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
169 |
|
43 | 170 |
unsigned long |
74 | 171 |
getcolor(const char *colstr) |
2 | 172 |
{ |
123 | 173 |
Colormap cmap = DefaultColormap(dpy, screen); |
2 | 174 |
XColor color; |
43 | 175 |
|
2 | 176 |
XAllocNamedColor(dpy, cmap, colstr, &color, &color); |
177 |
return color.pixel; |
|
178 |
} |
|
179 |
||
180 |
void |
|
74 | 181 |
setfont(const char *fontstr) |
2 | 182 |
{ |
183 |
char **missing, *def; |
|
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
184 |
int i, n; |
2 | 185 |
|
7 | 186 |
missing = NULL; |
2 | 187 |
setlocale(LC_ALL, ""); |
43 | 188 |
if(dc.font.set) |
189 |
XFreeFontSet(dpy, dc.font.set); |
|
190 |
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); |
|
2 | 191 |
if(missing) { |
192 |
while(n--) |
|
193 |
fprintf(stderr, "missing fontset: %s\n", missing[n]); |
|
194 |
XFreeStringList(missing); |
|
43 | 195 |
if(dc.font.set) { |
196 |
XFreeFontSet(dpy, dc.font.set); |
|
197 |
dc.font.set = NULL; |
|
2 | 198 |
} |
199 |
} |
|
43 | 200 |
if(dc.font.set) { |
2 | 201 |
XFontSetExtents *font_extents; |
202 |
XFontStruct **xfonts; |
|
203 |
char **font_names; |
|
204 |
||
43 | 205 |
dc.font.ascent = dc.font.descent = 0; |
206 |
font_extents = XExtentsOfFontSet(dc.font.set); |
|
207 |
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); |
|
208 |
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { |
|
209 |
if(dc.font.ascent < (*xfonts)->ascent) |
|
210 |
dc.font.ascent = (*xfonts)->ascent; |
|
211 |
if(dc.font.descent < (*xfonts)->descent) |
|
212 |
dc.font.descent = (*xfonts)->descent; |
|
2 | 213 |
xfonts++; |
214 |
} |
|
215 |
} |
|
216 |
else { |
|
43 | 217 |
if(dc.font.xfont) |
218 |
XFreeFont(dpy, dc.font.xfont); |
|
219 |
dc.font.xfont = NULL; |
|
220 |
dc.font.xfont = XLoadQueryFont(dpy, fontstr); |
|
221 |
if (!dc.font.xfont) |
|
222 |
dc.font.xfont = XLoadQueryFont(dpy, "fixed"); |
|
223 |
if (!dc.font.xfont) |
|
75 | 224 |
eprint("error, cannot init 'fixed' font\n"); |
43 | 225 |
dc.font.ascent = dc.font.xfont->ascent; |
226 |
dc.font.descent = dc.font.xfont->descent; |
|
2 | 227 |
} |
43 | 228 |
dc.font.height = dc.font.ascent + dc.font.descent; |
2 | 229 |
} |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
230 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
231 |
unsigned int |
173
1db04019684e
changed Client->tags and Rule->tags to be Bool (I'll also try to remove the TLast enum)
arg@10ksloc.org
parents:
164
diff
changeset
|
232 |
textw(const char *text) |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
233 |
{ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
234 |
return textnw(text, strlen(text)) + dc.font.height; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
235 |
} |