author | arg@mig29 |
Fri, 01 Dec 2006 16:55:42 +0100 | |
changeset 604 | 2c366b252717 |
parent 602 | 3c765cc4bce4 |
child 605 | 755d8dcb8a05 |
permissions | -rw-r--r-- |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
1 |
/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com> |
2 | 2 |
* See LICENSE file for license details. |
3 |
*/ |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
4 |
#include "dwm.h" |
2 | 5 |
#include <stdio.h> |
6 |
#include <string.h> |
|
32 | 7 |
#include <X11/Xlocale.h> |
8 |
||
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
9 |
/* static */ |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
10 |
|
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
11 |
static Bool |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
12 |
isoccupied(unsigned int t) |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
13 |
{ |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
14 |
Client *c; |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
15 |
for(c = clients; c; c = c->next) |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
16 |
if(c->tags[t]) |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
17 |
return True; |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
18 |
return False; |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
19 |
} |
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
20 |
|
77 | 21 |
static unsigned int |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
377
diff
changeset
|
22 |
textnw(const char *text, unsigned int len) { |
77 | 23 |
XRectangle r; |
123 | 24 |
|
77 | 25 |
if(dc.font.set) { |
26 |
XmbTextExtents(dc.font.set, text, len, NULL, &r); |
|
27 |
return r.width; |
|
28 |
} |
|
29 |
return XTextWidth(dc.font.xfont, text, len); |
|
75 | 30 |
} |
31 |
||
77 | 32 |
static void |
604 | 33 |
drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborder) { |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
34 |
int x, y, w, h; |
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
35 |
static char buf[256]; |
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
36 |
unsigned int len, olen; |
352 | 37 |
XGCValues gcv; |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
38 |
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
|
39 |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
40 |
XSetForeground(dpy, dc.gc, col[ColBG]); |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
41 |
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
42 |
if(!text) |
2 | 43 |
return; |
218 | 44 |
w = 0; |
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
45 |
olen = len = strlen(text); |
581
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
572
diff
changeset
|
46 |
if(len >= sizeof buf) |
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
572
diff
changeset
|
47 |
len = sizeof buf - 1; |
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
48 |
memcpy(buf, text, len); |
2 | 49 |
buf[len] = 0; |
34 | 50 |
h = dc.font.ascent + dc.font.descent; |
51 |
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; |
|
52 |
x = dc.x + (h / 2); |
|
2 | 53 |
/* shorten text if necessary */ |
43 | 54 |
while(len && (w = textnw(buf, len)) > dc.w - h) |
2 | 55 |
buf[--len] = 0; |
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
56 |
if(len < olen) { |
273 | 57 |
if(len > 1) |
58 |
buf[len - 1] = '.'; |
|
59 |
if(len > 2) |
|
60 |
buf[len - 2] = '.'; |
|
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
61 |
if(len > 3) |
273 | 62 |
buf[len - 3] = '.'; |
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
63 |
} |
34 | 64 |
if(w > dc.w) |
2 | 65 |
return; /* too long */ |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
66 |
gcv.foreground = col[ColFG]; |
352 | 67 |
if(dc.font.set) { |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
68 |
XChangeGC(dpy, dc.gc, GCForeground, &gcv); |
342 | 69 |
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); |
352 | 70 |
} |
2 | 71 |
else { |
352 | 72 |
gcv.font = dc.font.xfont->fid; |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
73 |
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
342 | 74 |
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
75 |
} |
|
604 | 76 |
if(vborder) { |
77 |
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1); |
|
78 |
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1); |
|
2 | 79 |
} |
604 | 80 |
if(hborder) { |
81 |
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1); |
|
82 |
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2); |
|
83 |
} |
|
84 |
} |
|
2 | 85 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
86 |
/* extern */ |
77 | 87 |
|
88 |
void |
|
487 | 89 |
drawall(void) { |
77 | 90 |
Client *c; |
91 |
||
142
9b9deafa0508
committed a patch which fixes the hints of Jukka
arg@10ksloc.org
parents:
124
diff
changeset
|
92 |
for(c = clients; c; c = getnext(c->next)) |
77 | 93 |
drawtitle(c); |
94 |
drawstatus(); |
|
95 |
} |
|
96 |
||
97 |
void |
|
487 | 98 |
drawstatus(void) { |
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
99 |
int i, x; |
77 | 100 |
|
101 |
dc.x = dc.y = 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
|
102 |
for(i = 0; i < ntags; i++) { |
77 | 103 |
dc.w = textw(tags[i]); |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
104 |
if(seltag[i]) |
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
105 |
drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i)); |
77 | 106 |
else |
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
107 |
drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i)); |
362
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
361
diff
changeset
|
108 |
dc.x += dc.w; |
77 | 109 |
} |
362
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
361
diff
changeset
|
110 |
dc.w = bmw; |
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
111 |
drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); |
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); |
570 | 114 |
dc.x = bw - dc.w; |
342 | 115 |
if(dc.x < x) { |
116 |
dc.x = x; |
|
117 |
dc.w = bw - x; |
|
118 |
} |
|
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
119 |
drawtext(stext, dc.status, False, False); |
371
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
120 |
if((dc.w = dc.x - x) > bh) { |
342 | 121 |
dc.x = x; |
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
122 |
drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); |
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
123 |
} |
77 | 124 |
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
|
125 |
XSync(dpy, False); |
77 | 126 |
} |
127 |
||
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
128 |
void |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
377
diff
changeset
|
129 |
drawtitle(Client *c) { |
239
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
237
diff
changeset
|
130 |
if(c == sel && issel) { |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
131 |
drawstatus(); |
342 | 132 |
XUnmapWindow(dpy, c->twin); |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
133 |
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
|
134 |
return; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
135 |
} |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
136 |
XSetWindowBorder(dpy, c->win, dc.norm[ColBG]); |
342 | 137 |
XMapWindow(dpy, c->twin); |
138 |
dc.x = dc.y = 0; |
|
139 |
dc.w = c->tw; |
|
572
427708bf5f36
added a similiar patch to Daves solution to indicate if there are clients with a specific tag
arg@mig29
parents:
571
diff
changeset
|
140 |
drawtext(c->name, dc.norm, False,False); |
342 | 141 |
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
|
142 |
XSync(dpy, False); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
143 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
144 |
|
43 | 145 |
unsigned long |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
377
diff
changeset
|
146 |
getcolor(const char *colstr) { |
123 | 147 |
Colormap cmap = DefaultColormap(dpy, screen); |
2 | 148 |
XColor color; |
43 | 149 |
|
495 | 150 |
if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) |
151 |
eprint("error, cannot allocate color '%s'\n", colstr); |
|
2 | 152 |
return color.pixel; |
153 |
} |
|
154 |
||
155 |
void |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
377
diff
changeset
|
156 |
setfont(const char *fontstr) { |
2 | 157 |
char **missing, *def; |
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
158 |
int i, n; |
2 | 159 |
|
7 | 160 |
missing = NULL; |
2 | 161 |
setlocale(LC_ALL, ""); |
43 | 162 |
if(dc.font.set) |
163 |
XFreeFontSet(dpy, dc.font.set); |
|
164 |
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); |
|
2 | 165 |
if(missing) { |
166 |
while(n--) |
|
167 |
fprintf(stderr, "missing fontset: %s\n", missing[n]); |
|
168 |
XFreeStringList(missing); |
|
43 | 169 |
if(dc.font.set) { |
170 |
XFreeFontSet(dpy, dc.font.set); |
|
171 |
dc.font.set = NULL; |
|
2 | 172 |
} |
173 |
} |
|
43 | 174 |
if(dc.font.set) { |
2 | 175 |
XFontSetExtents *font_extents; |
176 |
XFontStruct **xfonts; |
|
177 |
char **font_names; |
|
43 | 178 |
dc.font.ascent = dc.font.descent = 0; |
179 |
font_extents = XExtentsOfFontSet(dc.font.set); |
|
180 |
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); |
|
181 |
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { |
|
182 |
if(dc.font.ascent < (*xfonts)->ascent) |
|
183 |
dc.font.ascent = (*xfonts)->ascent; |
|
184 |
if(dc.font.descent < (*xfonts)->descent) |
|
185 |
dc.font.descent = (*xfonts)->descent; |
|
2 | 186 |
xfonts++; |
187 |
} |
|
188 |
} |
|
189 |
else { |
|
43 | 190 |
if(dc.font.xfont) |
191 |
XFreeFont(dpy, dc.font.xfont); |
|
192 |
dc.font.xfont = NULL; |
|
193 |
dc.font.xfont = XLoadQueryFont(dpy, fontstr); |
|
194 |
if (!dc.font.xfont) |
|
195 |
dc.font.xfont = XLoadQueryFont(dpy, "fixed"); |
|
196 |
if (!dc.font.xfont) |
|
75 | 197 |
eprint("error, cannot init 'fixed' font\n"); |
43 | 198 |
dc.font.ascent = dc.font.xfont->ascent; |
199 |
dc.font.descent = dc.font.xfont->descent; |
|
2 | 200 |
} |
43 | 201 |
dc.font.height = dc.font.ascent + dc.font.descent; |
2 | 202 |
} |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
203 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
204 |
unsigned int |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
377
diff
changeset
|
205 |
textw(const char *text) { |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
206 |
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
|
207 |
} |