Mercurial > aewl
annotate draw.c @ 603:213d67302d28
darkening the fg colors somewhat
| author | arg@mig29 |
|---|---|
| date | Fri, 01 Dec 2006 15:50:22 +0100 |
| parents | 3c765cc4bce4 |
| children | 2c366b252717 |
| rev | line source |
|---|---|
|
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 |
| 602 | 33 drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool line) { |
|
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 } | |
| 598 | 76 if(dot) { |
| 602 | 77 r.x = dc.x + 1; |
| 599 | 78 r.y = dc.y + 2; |
|
519
6cad48068e4c
applied dave's highlight patch for big fonts
Anselm R. Garbe <arg@10kloc.org>
parents:
516
diff
changeset
|
79 r.width = r.height = (h + 2) / 4; |
| 352 | 80 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
| 2 | 81 } |
| 602 | 82 if(line) |
| 83 XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 1, dc.y + 1); } | |
| 2 | 84 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
85 /* extern */ |
| 77 | 86 |
| 87 void | |
| 487 | 88 drawall(void) { |
| 77 | 89 Client *c; |
| 90 | |
|
142
9b9deafa0508
committed a patch which fixes the hints of Jukka
arg@10ksloc.org
parents:
124
diff
changeset
|
91 for(c = clients; c; c = getnext(c->next)) |
| 77 | 92 drawtitle(c); |
| 93 drawstatus(); | |
| 94 } | |
| 95 | |
| 96 void | |
| 487 | 97 drawstatus(void) { |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
98 int i, x; |
| 77 | 99 |
| 100 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
|
101 for(i = 0; i < ntags; i++) { |
| 77 | 102 dc.w = textw(tags[i]); |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
103 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
|
104 drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i)); |
| 77 | 105 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
|
106 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
|
107 dc.x += dc.w; |
| 77 | 108 } |
|
362
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
361
diff
changeset
|
109 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
|
110 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
|
111 x = dc.x + dc.w; |
| 77 | 112 dc.w = textw(stext); |
| 570 | 113 dc.x = bw - dc.w; |
| 342 | 114 if(dc.x < x) { |
| 115 dc.x = x; | |
| 116 dc.w = bw - x; | |
| 117 } | |
|
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
|
118 drawtext(stext, dc.status, False, False); |
|
371
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
119 if((dc.w = dc.x - x) > bh) { |
| 342 | 120 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
|
121 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
|
122 } |
| 77 | 123 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
|
124 XSync(dpy, False); |
| 77 | 125 } |
| 126 | |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
127 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
|
128 drawtitle(Client *c) { |
|
239
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
237
diff
changeset
|
129 if(c == sel && issel) { |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
130 drawstatus(); |
| 342 | 131 XUnmapWindow(dpy, c->twin); |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
132 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
|
133 return; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
134 } |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
135 XSetWindowBorder(dpy, c->win, dc.norm[ColBG]); |
| 342 | 136 XMapWindow(dpy, c->twin); |
| 137 dc.x = dc.y = 0; | |
| 138 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
|
139 drawtext(c->name, dc.norm, False,False); |
| 342 | 140 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
|
141 XSync(dpy, False); |
|
76
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 |
| 43 | 144 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
|
145 getcolor(const char *colstr) { |
| 123 | 146 Colormap cmap = DefaultColormap(dpy, screen); |
| 2 | 147 XColor color; |
| 43 | 148 |
| 495 | 149 if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) |
| 150 eprint("error, cannot allocate color '%s'\n", colstr); | |
| 2 | 151 return color.pixel; |
| 152 } | |
| 153 | |
| 154 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
|
155 setfont(const char *fontstr) { |
| 2 | 156 char **missing, *def; |
|
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
157 int i, n; |
| 2 | 158 |
| 7 | 159 missing = NULL; |
| 2 | 160 setlocale(LC_ALL, ""); |
| 43 | 161 if(dc.font.set) |
| 162 XFreeFontSet(dpy, dc.font.set); | |
| 163 dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); | |
| 2 | 164 if(missing) { |
| 165 while(n--) | |
| 166 fprintf(stderr, "missing fontset: %s\n", missing[n]); | |
| 167 XFreeStringList(missing); | |
| 43 | 168 if(dc.font.set) { |
| 169 XFreeFontSet(dpy, dc.font.set); | |
| 170 dc.font.set = NULL; | |
| 2 | 171 } |
| 172 } | |
| 43 | 173 if(dc.font.set) { |
| 2 | 174 XFontSetExtents *font_extents; |
| 175 XFontStruct **xfonts; | |
| 176 char **font_names; | |
| 43 | 177 dc.font.ascent = dc.font.descent = 0; |
| 178 font_extents = XExtentsOfFontSet(dc.font.set); | |
| 179 n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); | |
| 180 for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { | |
| 181 if(dc.font.ascent < (*xfonts)->ascent) | |
| 182 dc.font.ascent = (*xfonts)->ascent; | |
| 183 if(dc.font.descent < (*xfonts)->descent) | |
| 184 dc.font.descent = (*xfonts)->descent; | |
| 2 | 185 xfonts++; |
| 186 } | |
| 187 } | |
| 188 else { | |
| 43 | 189 if(dc.font.xfont) |
| 190 XFreeFont(dpy, dc.font.xfont); | |
| 191 dc.font.xfont = NULL; | |
| 192 dc.font.xfont = XLoadQueryFont(dpy, fontstr); | |
| 193 if (!dc.font.xfont) | |
| 194 dc.font.xfont = XLoadQueryFont(dpy, "fixed"); | |
| 195 if (!dc.font.xfont) | |
| 75 | 196 eprint("error, cannot init 'fixed' font\n"); |
| 43 | 197 dc.font.ascent = dc.font.xfont->ascent; |
| 198 dc.font.descent = dc.font.xfont->descent; | |
| 2 | 199 } |
| 43 | 200 dc.font.height = dc.font.ascent + dc.font.descent; |
| 2 | 201 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
202 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
203 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
|
204 textw(const char *text) { |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
205 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
|
206 } |