author | Anselm R. Garbe <arg@10kloc.org> |
Fri, 25 Aug 2006 15:37:00 +0200 | |
changeset 361 | 728e74820e1d |
parent 360 | b430e328ae03 |
child 362 | ba6c55e1b9b2 |
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 |
|
77 | 12 |
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
|
13 |
textnw(const char *text, unsigned int len) |
75 | 14 |
{ |
77 | 15 |
XRectangle r; |
123 | 16 |
|
77 | 17 |
if(dc.font.set) { |
18 |
XmbTextExtents(dc.font.set, text, len, NULL, &r); |
|
19 |
return r.width; |
|
20 |
} |
|
21 |
return XTextWidth(dc.font.xfont, text, len); |
|
75 | 22 |
} |
23 |
||
77 | 24 |
static void |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
25 |
drawtext(const char *text, unsigned long col[ColLast], Bool highlight) |
2 | 26 |
{ |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
27 |
int x, y, w, h; |
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
28 |
static char buf[256]; |
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
29 |
unsigned int len, olen; |
352 | 30 |
XGCValues gcv; |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
31 |
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
32 |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
33 |
XSetForeground(dpy, dc.gc, col[ColBG]); |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
34 |
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
237
7f8f7f14e9cd
readded border color, this sucks least
Anselm R.Garbe <arg@10ksloc.org>
parents:
236
diff
changeset
|
35 |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
36 |
if(!text) |
2 | 37 |
return; |
38 |
||
218 | 39 |
w = 0; |
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
40 |
olen = len = strlen(text); |
2 | 41 |
if(len >= sizeof(buf)) |
42 |
len = sizeof(buf) - 1; |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
43 |
memcpy(buf, text, len); |
2 | 44 |
buf[len] = 0; |
45 |
||
34 | 46 |
h = dc.font.ascent + dc.font.descent; |
47 |
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; |
|
48 |
x = dc.x + (h / 2); |
|
2 | 49 |
|
50 |
/* shorten text if necessary */ |
|
43 | 51 |
while(len && (w = textnw(buf, len)) > dc.w - h) |
2 | 52 |
buf[--len] = 0; |
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
53 |
if(len < olen) { |
273 | 54 |
if(len > 1) |
55 |
buf[len - 1] = '.'; |
|
56 |
if(len > 2) |
|
57 |
buf[len - 2] = '.'; |
|
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
58 |
if(len > 3) |
273 | 59 |
buf[len - 3] = '.'; |
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
60 |
} |
2 | 61 |
|
34 | 62 |
if(w > dc.w) |
2 | 63 |
return; /* too long */ |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
64 |
gcv.foreground = col[ColFG]; |
352 | 65 |
if(dc.font.set) { |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
66 |
XChangeGC(dpy, dc.gc, GCForeground, &gcv); |
342 | 67 |
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); |
352 | 68 |
} |
2 | 69 |
else { |
352 | 70 |
gcv.font = dc.font.xfont->fid; |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
71 |
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
342 | 72 |
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
73 |
} |
|
345 | 74 |
if(highlight) { |
352 | 75 |
r.x = dc.x + 2; |
76 |
r.y = dc.y + 2; |
|
77 |
r.width = r.height = 3; |
|
78 |
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
|
2 | 79 |
} |
80 |
} |
|
81 |
||
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
82 |
/* extern */ |
77 | 83 |
|
84 |
void |
|
85 |
drawall() |
|
86 |
{ |
|
87 |
Client *c; |
|
88 |
||
142
9b9deafa0508
committed a patch which fixes the hints of Jukka
arg@10ksloc.org
parents:
124
diff
changeset
|
89 |
for(c = clients; c; c = getnext(c->next)) |
77 | 90 |
drawtitle(c); |
91 |
drawstatus(); |
|
92 |
} |
|
93 |
||
94 |
void |
|
95 |
drawstatus() |
|
96 |
{ |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
97 |
int i, x; |
77 | 98 |
|
99 |
dc.x = dc.y = 0; |
|
100 |
dc.w = bw; |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
101 |
|
358 | 102 |
drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False); |
357
27082985e51e
removed a bunch of lines, made mode symbols configurable
Anselm R. Garbe <arg@10kloc.org>
parents:
356
diff
changeset
|
103 |
dc.w = modew; |
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
|
104 |
for(i = 0; i < ntags; i++) { |
77 | 105 |
dc.x += dc.w; |
106 |
dc.w = textw(tags[i]); |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
107 |
if(seltag[i]) |
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
108 |
drawtext(tags[i], dc.sel, sel && sel->tags[i]); |
77 | 109 |
else |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
110 |
drawtext(tags[i], dc.norm, sel && sel->tags[i]); |
77 | 111 |
} |
361
728e74820e1d
removed small 1px gap, somehow without it things feel better
Anselm R. Garbe <arg@10kloc.org>
parents:
360
diff
changeset
|
112 |
x = dc.x + dc.w; |
77 | 113 |
dc.w = textw(stext); |
114 |
dc.x = bx + bw - dc.w; |
|
342 | 115 |
if(dc.x < x) { |
116 |
dc.x = x; |
|
117 |
dc.w = bw - x; |
|
118 |
} |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
119 |
drawtext(stext, dc.status, False); |
340
ae0affabdc02
implemented right tag drawing in the status bar and titlebars
Anselm R. Garbe <arg@10kloc.org>
parents:
334
diff
changeset
|
120 |
|
342 | 121 |
if(sel && ((dc.w = dc.x - x) > bh)) { |
122 |
dc.x = x; |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
123 |
drawtext(sel->name, dc.sel, False); |
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
124 |
} |
77 | 125 |
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
|
126 |
XSync(dpy, False); |
77 | 127 |
} |
128 |
||
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
129 |
void |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
130 |
drawtitle(Client *c) |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
131 |
{ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
132 |
int i; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
133 |
|
239
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
237
diff
changeset
|
134 |
if(c == sel && issel) { |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
135 |
drawstatus(); |
342 | 136 |
XUnmapWindow(dpy, c->twin); |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
137 |
XSetWindowBorder(dpy, c->win, dc.sel[ColBG]); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
138 |
return; |
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 |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
141 |
XSetWindowBorder(dpy, c->win, dc.norm[ColBG]); |
342 | 142 |
XMapWindow(dpy, c->twin); |
143 |
dc.x = dc.y = 0; |
|
144 |
dc.w = c->tw; |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
145 |
drawtext(c->name, dc.norm, False); |
342 | 146 |
XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0); |
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
147 |
XSync(dpy, False); |
76
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 |
|
43 | 150 |
unsigned long |
74 | 151 |
getcolor(const char *colstr) |
2 | 152 |
{ |
123 | 153 |
Colormap cmap = DefaultColormap(dpy, screen); |
2 | 154 |
XColor color; |
43 | 155 |
|
2 | 156 |
XAllocNamedColor(dpy, cmap, colstr, &color, &color); |
157 |
return color.pixel; |
|
158 |
} |
|
159 |
||
160 |
void |
|
74 | 161 |
setfont(const char *fontstr) |
2 | 162 |
{ |
163 |
char **missing, *def; |
|
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
164 |
int i, n; |
2 | 165 |
|
7 | 166 |
missing = NULL; |
2 | 167 |
setlocale(LC_ALL, ""); |
43 | 168 |
if(dc.font.set) |
169 |
XFreeFontSet(dpy, dc.font.set); |
|
170 |
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); |
|
2 | 171 |
if(missing) { |
172 |
while(n--) |
|
173 |
fprintf(stderr, "missing fontset: %s\n", missing[n]); |
|
174 |
XFreeStringList(missing); |
|
43 | 175 |
if(dc.font.set) { |
176 |
XFreeFontSet(dpy, dc.font.set); |
|
177 |
dc.font.set = NULL; |
|
2 | 178 |
} |
179 |
} |
|
43 | 180 |
if(dc.font.set) { |
2 | 181 |
XFontSetExtents *font_extents; |
182 |
XFontStruct **xfonts; |
|
183 |
char **font_names; |
|
184 |
||
43 | 185 |
dc.font.ascent = dc.font.descent = 0; |
186 |
font_extents = XExtentsOfFontSet(dc.font.set); |
|
187 |
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); |
|
188 |
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { |
|
189 |
if(dc.font.ascent < (*xfonts)->ascent) |
|
190 |
dc.font.ascent = (*xfonts)->ascent; |
|
191 |
if(dc.font.descent < (*xfonts)->descent) |
|
192 |
dc.font.descent = (*xfonts)->descent; |
|
2 | 193 |
xfonts++; |
194 |
} |
|
195 |
} |
|
196 |
else { |
|
43 | 197 |
if(dc.font.xfont) |
198 |
XFreeFont(dpy, dc.font.xfont); |
|
199 |
dc.font.xfont = NULL; |
|
200 |
dc.font.xfont = XLoadQueryFont(dpy, fontstr); |
|
201 |
if (!dc.font.xfont) |
|
202 |
dc.font.xfont = XLoadQueryFont(dpy, "fixed"); |
|
203 |
if (!dc.font.xfont) |
|
75 | 204 |
eprint("error, cannot init 'fixed' font\n"); |
43 | 205 |
dc.font.ascent = dc.font.xfont->ascent; |
206 |
dc.font.descent = dc.font.xfont->descent; |
|
2 | 207 |
} |
43 | 208 |
dc.font.height = dc.font.ascent + dc.font.descent; |
2 | 209 |
} |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
210 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
211 |
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
|
212 |
textw(const char *text) |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
213 |
{ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
214 |
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
|
215 |
} |