Mercurial > dwm-meillo
annotate draw.c @ 234:10a8c83e18d8
swapping my default colors (bg with fg)
| author | Anselm R.Garbe <arg@10ksloc.org> |
|---|---|
| date | Thu, 10 Aug 2006 10:22:15 +0200 |
| parents | c674a0baac63 |
| children | 60e73ebaab27 |
| rev | line source |
|---|---|
| 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 |
| 218 | 45 drawtext(const char *text, Bool invert) |
| 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); |
| 218 | 55 drawborder(); |
| 2 | 56 |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
57 if(!text) |
| 2 | 58 return; |
| 59 | |
| 218 | 60 w = 0; |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
61 len = strlen(text); |
| 2 | 62 if(len >= sizeof(buf)) |
| 63 len = sizeof(buf) - 1; | |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
64 memcpy(buf, text, len); |
| 2 | 65 buf[len] = 0; |
| 66 | |
| 34 | 67 h = dc.font.ascent + dc.font.descent; |
| 68 y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; | |
| 69 x = dc.x + (h / 2); | |
| 2 | 70 |
| 71 /* shorten text if necessary */ | |
| 43 | 72 while(len && (w = textnw(buf, len)) > dc.w - h) |
| 2 | 73 buf[--len] = 0; |
| 74 | |
| 34 | 75 if(w > dc.w) |
| 2 | 76 return; /* too long */ |
| 77 | |
|
66
50450aa24a46
removed a bunch of lines through swap removal
Anselm R. Garbe <garbeam@wmii.de>
parents:
57
diff
changeset
|
78 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
|
79 gcv.background = invert ? dc.fg : dc.bg; |
| 34 | 80 if(dc.font.set) { |
| 81 XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); | |
| 82 XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, | |
| 2 | 83 x, y, buf, len); |
| 84 } | |
| 85 else { | |
| 34 | 86 gcv.font = dc.font.xfont->fid; |
| 87 XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); | |
| 88 XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); | |
| 2 | 89 } |
| 90 } | |
| 91 | |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
92 /* extern */ |
| 77 | 93 |
| 94 void | |
| 95 drawall() | |
| 96 { | |
| 97 Client *c; | |
| 98 | |
|
142
9b9deafa0508
committed a patch which fixes the hints of Jukka
arg@10ksloc.org
parents:
124
diff
changeset
|
99 for(c = clients; c; c = getnext(c->next)) |
| 77 | 100 drawtitle(c); |
| 101 drawstatus(); | |
| 102 } | |
| 103 | |
| 104 void | |
| 105 drawstatus() | |
| 106 { | |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
107 int i, x; |
| 77 | 108 Bool istile = arrange == dotile; |
| 109 | |
| 110 dc.x = dc.y = 0; | |
| 111 dc.w = bw; | |
| 218 | 112 drawtext(NULL, !istile); |
| 77 | 113 |
| 114 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
|
115 for(i = 0; i < ntags; i++) { |
| 77 | 116 dc.x += dc.w; |
| 117 dc.w = textw(tags[i]); | |
| 118 if(istile) | |
| 218 | 119 drawtext(tags[i], (i == tsel)); |
| 77 | 120 else |
| 218 | 121 drawtext(tags[i], (i != tsel)); |
| 77 | 122 } |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
123 x = dc.x + dc.w; |
| 77 | 124 dc.w = textw(stext); |
| 125 dc.x = bx + bw - dc.w; | |
| 218 | 126 drawtext(stext, !istile); |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
127 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
|
128 dc.x = x; |
| 218 | 129 drawtext(sel->name, istile); |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
130 } |
| 77 | 131 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
|
132 XSync(dpy, False); |
| 77 | 133 } |
| 134 | |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
135 void |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
136 drawtitle(Client *c) |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
137 { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
138 int i; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
139 Bool istile = arrange == dotile; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
140 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
141 if(c == sel) { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
142 drawstatus(); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
143 XUnmapWindow(dpy, c->title); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
144 XSetWindowBorder(dpy, c->win, dc.fg); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
145 return; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
146 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
147 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
148 XSetWindowBorder(dpy, c->win, dc.bg); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
149 XMapWindow(dpy, c->title); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
150 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
151 dc.x = dc.y = 0; |
|
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.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
|
154 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
|
155 if(c->tags[i]) { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
156 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
|
157 dc.w = textw(tags[i]); |
| 218 | 158 drawtext(tags[i], !istile); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
159 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
160 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
161 dc.x += dc.w; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
162 dc.w = textw(c->name); |
| 218 | 163 drawtext(c->name, !istile); |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
164 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
|
165 XSync(dpy, False); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
166 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
167 |
| 43 | 168 unsigned long |
| 74 | 169 getcolor(const char *colstr) |
| 2 | 170 { |
| 123 | 171 Colormap cmap = DefaultColormap(dpy, screen); |
| 2 | 172 XColor color; |
| 43 | 173 |
| 2 | 174 XAllocNamedColor(dpy, cmap, colstr, &color, &color); |
| 175 return color.pixel; | |
| 176 } | |
| 177 | |
| 178 void | |
| 74 | 179 setfont(const char *fontstr) |
| 2 | 180 { |
| 181 char **missing, *def; | |
|
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
182 int i, n; |
| 2 | 183 |
| 7 | 184 missing = NULL; |
| 2 | 185 setlocale(LC_ALL, ""); |
| 43 | 186 if(dc.font.set) |
| 187 XFreeFontSet(dpy, dc.font.set); | |
| 188 dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); | |
| 2 | 189 if(missing) { |
| 190 while(n--) | |
| 191 fprintf(stderr, "missing fontset: %s\n", missing[n]); | |
| 192 XFreeStringList(missing); | |
| 43 | 193 if(dc.font.set) { |
| 194 XFreeFontSet(dpy, dc.font.set); | |
| 195 dc.font.set = NULL; | |
| 2 | 196 } |
| 197 } | |
| 43 | 198 if(dc.font.set) { |
| 2 | 199 XFontSetExtents *font_extents; |
| 200 XFontStruct **xfonts; | |
| 201 char **font_names; | |
| 202 | |
| 43 | 203 dc.font.ascent = dc.font.descent = 0; |
| 204 font_extents = XExtentsOfFontSet(dc.font.set); | |
| 205 n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); | |
| 206 for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { | |
| 207 if(dc.font.ascent < (*xfonts)->ascent) | |
| 208 dc.font.ascent = (*xfonts)->ascent; | |
| 209 if(dc.font.descent < (*xfonts)->descent) | |
| 210 dc.font.descent = (*xfonts)->descent; | |
| 2 | 211 xfonts++; |
| 212 } | |
| 213 } | |
| 214 else { | |
| 43 | 215 if(dc.font.xfont) |
| 216 XFreeFont(dpy, dc.font.xfont); | |
| 217 dc.font.xfont = NULL; | |
| 218 dc.font.xfont = XLoadQueryFont(dpy, fontstr); | |
| 219 if (!dc.font.xfont) | |
| 220 dc.font.xfont = XLoadQueryFont(dpy, "fixed"); | |
| 221 if (!dc.font.xfont) | |
| 75 | 222 eprint("error, cannot init 'fixed' font\n"); |
| 43 | 223 dc.font.ascent = dc.font.xfont->ascent; |
| 224 dc.font.descent = dc.font.xfont->descent; | |
| 2 | 225 } |
| 43 | 226 dc.font.height = dc.font.ascent + dc.font.descent; |
| 2 | 227 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
228 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
229 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
|
230 textw(const char *text) |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
231 { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
232 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
|
233 } |