Mercurial > dwm-meillo
annotate draw.c @ 732:a642068c4834
simplification
| author | Anselm R. Garbe <arg@suckless.org> |
|---|---|
| date | Tue, 06 Feb 2007 15:28:25 +0100 |
| parents | 295c8ca7a27a |
| children | 61821891835c |
| rev | line source |
|---|---|
|
643
e90bf387bf6f
next version will contain updated copyright notice
arg@mig29
parents:
627
diff
changeset
|
1 /* (C)opyright MMIV-MMVII 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 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
8 /* static */ |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
9 |
|
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
|
10 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
|
11 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
|
12 { |
|
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 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
|
14 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
|
15 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
|
16 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
|
17 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
|
18 } |
|
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 |
| 77 | 20 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
|
21 textnw(const char *text, unsigned int len) { |
| 77 | 22 XRectangle r; |
| 123 | 23 |
| 77 | 24 if(dc.font.set) { |
| 25 XmbTextExtents(dc.font.set, text, len, NULL, &r); | |
| 26 return r.width; | |
| 27 } | |
| 28 return XTextWidth(dc.font.xfont, text, len); | |
| 75 | 29 } |
| 30 | |
| 77 | 31 static void |
|
607
16762f7414de
if client is focused, the emptysquare don't needs to be drawed
arg@mig29
parents:
606
diff
changeset
|
32 drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) { |
|
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
33 int x, y, w, h; |
|
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
34 static char buf[256]; |
|
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
35 unsigned int len, olen; |
| 352 | 36 XGCValues gcv; |
|
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
37 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
|
38 |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
39 XSetForeground(dpy, dc.gc, col[ColBG]); |
|
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
342
diff
changeset
|
40 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
|
41 if(!text) |
| 2 | 42 return; |
| 218 | 43 w = 0; |
|
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
44 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
|
45 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
|
46 len = sizeof buf - 1; |
|
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
47 memcpy(buf, text, len); |
| 2 | 48 buf[len] = 0; |
| 34 | 49 h = dc.font.ascent + dc.font.descent; |
| 50 y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; | |
| 51 x = dc.x + (h / 2); | |
| 2 | 52 /* shorten text if necessary */ |
| 43 | 53 while(len && (w = textnw(buf, len)) > dc.w - h) |
| 2 | 54 buf[--len] = 0; |
|
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
55 if(len < olen) { |
| 273 | 56 if(len > 1) |
| 57 buf[len - 1] = '.'; | |
| 58 if(len > 2) | |
| 59 buf[len - 2] = '.'; | |
|
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
60 if(len > 3) |
| 273 | 61 buf[len - 3] = '.'; |
|
269
bf6792e3e700
fixed string cutting in draw.c
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
62 } |
| 34 | 63 if(w > dc.w) |
| 2 | 64 return; /* too long */ |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
65 gcv.foreground = col[ColFG]; |
| 352 | 66 if(dc.font.set) { |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
67 XChangeGC(dpy, dc.gc, GCForeground, &gcv); |
| 342 | 68 XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); |
| 352 | 69 } |
| 2 | 70 else { |
| 352 | 71 gcv.font = dc.font.xfont->fid; |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
72 XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
| 342 | 73 XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
| 74 } | |
| 606 | 75 x = (h + 2) / 4; |
|
728
295c8ca7a27a
applied apm's patch proposal, getting rid of XDrawLines
Anselm R. Garbe <arg@suckless.org>
parents:
697
diff
changeset
|
76 r.x = dc.x + 1; |
|
295c8ca7a27a
applied apm's patch proposal, getting rid of XDrawLines
Anselm R. Garbe <arg@suckless.org>
parents:
697
diff
changeset
|
77 r.y = dc.y + 1; |
|
607
16762f7414de
if client is focused, the emptysquare don't needs to be drawed
arg@mig29
parents:
606
diff
changeset
|
78 if(filledsquare) { |
| 608 | 79 r.width = r.height = x + 1; |
| 605 | 80 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
| 2 | 81 } |
|
607
16762f7414de
if client is focused, the emptysquare don't needs to be drawed
arg@mig29
parents:
606
diff
changeset
|
82 else if(emptysquare) { |
|
728
295c8ca7a27a
applied apm's patch proposal, getting rid of XDrawLines
Anselm R. Garbe <arg@suckless.org>
parents:
697
diff
changeset
|
83 r.width = r.height = x; |
|
295c8ca7a27a
applied apm's patch proposal, getting rid of XDrawLines
Anselm R. Garbe <arg@suckless.org>
parents:
697
diff
changeset
|
84 XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
| 604 | 85 } |
| 86 } | |
| 2 | 87 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
88 /* extern */ |
| 77 | 89 |
| 90 void | |
| 487 | 91 drawstatus(void) { |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
92 int i, x; |
| 77 | 93 |
| 94 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
|
95 for(i = 0; i < ntags; i++) { |
| 77 | 96 dc.w = textw(tags[i]); |
|
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
97 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
|
98 drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i)); |
| 77 | 99 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
|
100 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
|
101 dc.x += dc.w; |
| 77 | 102 } |
|
362
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
361
diff
changeset
|
103 dc.w = bmw; |
|
689
cbec08a54a15
implemented new color scheme accordingly to Sanders proposal
Anselm R. Garbe <arg@suckless.org>
parents:
688
diff
changeset
|
104 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); |
|
361
728e74820e1d
removed small 1px gap, somehow without it things feel better
Anselm R. Garbe <arg@10kloc.org>
parents:
360
diff
changeset
|
105 x = dc.x + dc.w; |
| 77 | 106 dc.w = textw(stext); |
|
697
4d12382fef8e
removed unnecessary bx, by, bw variables
Anselm R. Garbe <arg@suckless.org>
parents:
690
diff
changeset
|
107 dc.x = sw - dc.w; |
| 342 | 108 if(dc.x < x) { |
| 109 dc.x = x; | |
|
697
4d12382fef8e
removed unnecessary bx, by, bw variables
Anselm R. Garbe <arg@suckless.org>
parents:
690
diff
changeset
|
110 dc.w = sw - x; |
| 342 | 111 } |
|
689
cbec08a54a15
implemented new color scheme accordingly to Sanders proposal
Anselm R. Garbe <arg@suckless.org>
parents:
688
diff
changeset
|
112 drawtext(stext, dc.norm, False, False); |
|
371
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
113 if((dc.w = dc.x - x) > bh) { |
| 342 | 114 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
|
115 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
|
116 } |
|
697
4d12382fef8e
removed unnecessary bx, by, bw variables
Anselm R. Garbe <arg@suckless.org>
parents:
690
diff
changeset
|
117 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
118 XSync(dpy, False); |
| 77 | 119 } |
| 120 | |
| 43 | 121 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
|
122 getcolor(const char *colstr) { |
| 123 | 123 Colormap cmap = DefaultColormap(dpy, screen); |
| 2 | 124 XColor color; |
| 43 | 125 |
| 495 | 126 if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) |
| 127 eprint("error, cannot allocate color '%s'\n", colstr); | |
| 2 | 128 return color.pixel; |
| 129 } | |
| 130 | |
| 131 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
|
132 setfont(const char *fontstr) { |
| 619 | 133 char *def, **missing; |
|
33
e90449e03167
new stuff (some warning elimination)
Anselm R. Garbe <garbeam@wmii.de>
parents:
32
diff
changeset
|
134 int i, n; |
| 2 | 135 |
| 7 | 136 missing = NULL; |
| 43 | 137 if(dc.font.set) |
| 138 XFreeFontSet(dpy, dc.font.set); | |
| 139 dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); | |
| 2 | 140 if(missing) { |
| 141 while(n--) | |
| 142 fprintf(stderr, "missing fontset: %s\n", missing[n]); | |
| 143 XFreeStringList(missing); | |
| 144 } | |
| 43 | 145 if(dc.font.set) { |
| 2 | 146 XFontSetExtents *font_extents; |
| 147 XFontStruct **xfonts; | |
| 148 char **font_names; | |
| 43 | 149 dc.font.ascent = dc.font.descent = 0; |
| 150 font_extents = XExtentsOfFontSet(dc.font.set); | |
| 151 n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); | |
| 152 for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { | |
| 153 if(dc.font.ascent < (*xfonts)->ascent) | |
| 154 dc.font.ascent = (*xfonts)->ascent; | |
| 155 if(dc.font.descent < (*xfonts)->descent) | |
| 156 dc.font.descent = (*xfonts)->descent; | |
| 2 | 157 xfonts++; |
| 158 } | |
| 159 } | |
| 160 else { | |
| 43 | 161 if(dc.font.xfont) |
| 162 XFreeFont(dpy, dc.font.xfont); | |
| 163 dc.font.xfont = NULL; | |
|
626
2644c951fc74
removed the hardcoded fixed fallback, it is useless in non-Latin1 environments
arg@mig29
parents:
619
diff
changeset
|
164 if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) |
| 627 | 165 eprint("error, cannot load font: '%s'\n", fontstr); |
| 43 | 166 dc.font.ascent = dc.font.xfont->ascent; |
| 167 dc.font.descent = dc.font.xfont->descent; | |
| 2 | 168 } |
| 43 | 169 dc.font.height = dc.font.ascent + dc.font.descent; |
| 2 | 170 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
171 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
172 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
|
173 textw(const char *text) { |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
174 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
|
175 } |