aewl: draw.c annotate

annotate draw.c @ 76:4bd49f404f10

proceeded with cleaning up, sorting functions, etc

author	Anselm R. Garbe <garbeam@wmii.de>
date	Sat, 15 Jul 2006 17:00:56 +0200
parents	f08271b7cb20
children	38c8f7f7d401

rev	line source
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	1 /*
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	2 * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	3 * See LICENSE file for license details.
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	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 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	6
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	7 #include <stdio.h>
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	8 #include <string.h>
32 082c75b937b5 removed unnecessary crap Anselm R. Garbe <garbeam@wmii.de> parents: 30 diff changeset	9 #include <X11/Xlocale.h>
082c75b937b5 removed unnecessary crap Anselm R. Garbe <garbeam@wmii.de> parents: 30 diff changeset	10
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	11 /* static functions */
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	12
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	13 static void
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	14 drawborder(void)
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	15 {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	16 XPoint points[5];
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
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	32 /* extern functions */
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	33
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	34 void
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	35 drawall()
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	36 {
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	37 Client *c;
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	38
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	39 for(c = clients; c; c = getnext(c->next))
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	40 drawtitle(c);
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	41 drawstatus();
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	42 }
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	43
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	44 void
74 5370ef170cc9 sanitized names Anselm R. Garbe <garbeam@wmii.de> parents: 73 diff changeset	45 drawstatus()
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	46 {
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	47 int i;
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	48 Bool istile = arrange == dotile;
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	49
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	50 dc.x = dc.y = 0;
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	51 dc.w = bw;
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	52 drawtext(NULL, !istile, False);
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	53
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	54 dc.w = 0;
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	55 for(i = 0; i < TLast; i++) {
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	56 dc.x += dc.w;
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	57 dc.w = textw(tags[i]);
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	58 if(istile)
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	59 drawtext(tags[i], (i == tsel), True);
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	60 else
f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	61 drawtext(tags[i], (i != tsel), True);
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	62 }
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	63 if(sel) {
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	64 dc.x += dc.w;
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	65 dc.w = textw(sel->name);
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	66 drawtext(sel->name, istile, True);
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	67 }
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	68 dc.w = textw(stext);
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	69 dc.x = bx + bw - dc.w;
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	70 drawtext(stext, !istile, False);
73 c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	71
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	72 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	73 XFlush(dpy);
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	74 }
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	75
c2ddb9dbbd10 rearranged Anselm R. Garbe <garbeam@wmii.de> parents: 66 diff changeset	76 void
66 50450aa24a46 removed a bunch of lines through swap removal Anselm R. Garbe <garbeam@wmii.de> parents: 57 diff changeset	77 drawtext(const char *text, Bool invert, Bool border)
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	78 {
33 e90449e03167 new stuff (some warning elimination) Anselm R. Garbe <garbeam@wmii.de> parents: 32 diff changeset	79 int x, y, w, h;
e90449e03167 new stuff (some warning elimination) Anselm R. Garbe <garbeam@wmii.de> parents: 32 diff changeset	80 unsigned int len;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	81 static char buf[256];
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	82 XGCValues gcv;
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	83 XRectangle r = { dc.x, dc.y, dc.w, dc.h };
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	84
66 50450aa24a46 removed a bunch of lines through swap removal Anselm R. Garbe <garbeam@wmii.de> parents: 57 diff changeset	85 XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	86 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	87
30 2e0fb4130bfb new stuff, fixed several issues Anselm R. Garbe <garbeam@wmii.de> parents: 26 diff changeset	88 w = 0;
3 e969f3575b7a several new changes, made gridmenu working Anselm R. Garbe <garbeam@wmii.de> parents: 2 diff changeset	89 if(border)
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	90 drawborder();
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	91
3 e969f3575b7a several new changes, made gridmenu working Anselm R. Garbe <garbeam@wmii.de> parents: 2 diff changeset	92 if(!text)
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	93 return;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	94
3 e969f3575b7a several new changes, made gridmenu working Anselm R. Garbe <garbeam@wmii.de> parents: 2 diff changeset	95 len = strlen(text);
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	96 if(len >= sizeof(buf))
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	97 len = sizeof(buf) - 1;
3 e969f3575b7a several new changes, made gridmenu working Anselm R. Garbe <garbeam@wmii.de> parents: 2 diff changeset	98 memcpy(buf, text, len);
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	99 buf[len] = 0;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	100
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	101 h = dc.font.ascent + dc.font.descent;
cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	102 y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	103 x = dc.x + (h / 2);
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	104
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	105 /* shorten text if necessary */
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	106 while(len && (w = textnw(buf, len)) > dc.w - h)
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	107 buf[--len] = 0;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	108
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	109 if(w > dc.w)
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	110 return; /* too long */
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	111
66 50450aa24a46 removed a bunch of lines through swap removal Anselm R. Garbe <garbeam@wmii.de> parents: 57 diff changeset	112 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	113 gcv.background = invert ? dc.fg : dc.bg;
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	114 if(dc.font.set) {
cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	115 XChangeGC(dpy, dc.gc, GCForeground \| GCBackground, &gcv);
cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	116 XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	117 x, y, buf, len);
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	118 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	119 else {
34 cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	120 gcv.font = dc.font.xfont->fid;
cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	121 XChangeGC(dpy, dc.gc, GCForeground \| GCBackground \| GCFont, &gcv);
cd30cce52b78 added logo+description Anselm R. Garbe <garbeam@wmii.de> parents: 33 diff changeset	122 XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	123 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	124 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	125
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	126 void
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	127 drawtitle(Client *c)
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	128 {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	129 int i;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	130 Bool istile = arrange == dotile;
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 if(c == sel) {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	133 drawstatus();
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	134 XUnmapWindow(dpy, c->title);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	135 XSetWindowBorder(dpy, c->win, dc.fg);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	136 return;
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
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	139 XSetWindowBorder(dpy, c->win, dc.bg);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	140 XMapWindow(dpy, c->title);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	141
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	142 dc.x = dc.y = 0;
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 dc.w = 0;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	145 for(i = 0; i < TLast; i++) {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	146 if(c->tags[i]) {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	147 dc.x += dc.w;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	148 dc.w = textw(c->tags[i]);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	149 drawtext(c->tags[i], !istile, True);
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 }
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	152 dc.x += dc.w;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	153 dc.w = textw(c->name);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	154 drawtext(c->name, !istile, True);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	155 XCopyArea(dpy, dc.drawable, c->title, dc.gc,
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	156 0, 0, c->tw, c->th, 0, 0);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	157 XFlush(dpy);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	158 }
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	159
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	160 unsigned long
74 5370ef170cc9 sanitized names Anselm R. Garbe <garbeam@wmii.de> parents: 73 diff changeset	161 getcolor(const char *colstr)
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	162 {
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	163 XColor color;
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	164 Colormap cmap = DefaultColormap(dpy, screen);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	165
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	166 XAllocNamedColor(dpy, cmap, colstr, &color, &color);
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	167 return color.pixel;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	168 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	169
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	170 void
74 5370ef170cc9 sanitized names Anselm R. Garbe <garbeam@wmii.de> parents: 73 diff changeset	171 setfont(const char *fontstr)
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	172 {
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	173 char *missing, def;
33 e90449e03167 new stuff (some warning elimination) Anselm R. Garbe <garbeam@wmii.de> parents: 32 diff changeset	174 int i, n;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	175
7 49e2fc9fb94f new stuff Anselm R. Garbe <garbeam@wmii.de> parents: 5 diff changeset	176 missing = NULL;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	177 setlocale(LC_ALL, "");
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	178 if(dc.font.set)
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	179 XFreeFontSet(dpy, dc.font.set);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	180 dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	181 if(missing) {
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	182 while(n--)
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	183 fprintf(stderr, "missing fontset: %s\n", missing[n]);
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	184 XFreeStringList(missing);
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	185 if(dc.font.set) {
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	186 XFreeFontSet(dpy, dc.font.set);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	187 dc.font.set = NULL;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	188 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	189 }
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	190 if(dc.font.set) {
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	191 XFontSetExtents *font_extents;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	192 XFontStruct **xfonts;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	193 char **font_names;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	194
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	195 dc.font.ascent = dc.font.descent = 0;
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	196 font_extents = XExtentsOfFontSet(dc.font.set);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	197 n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	198 for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	199 if(dc.font.ascent < (*xfonts)->ascent)
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	200 dc.font.ascent = (*xfonts)->ascent;
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	201 if(dc.font.descent < (*xfonts)->descent)
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	202 dc.font.descent = (*xfonts)->descent;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	203 xfonts++;
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	204 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	205 }
a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	206 else {
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	207 if(dc.font.xfont)
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	208 XFreeFont(dpy, dc.font.xfont);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	209 dc.font.xfont = NULL;
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	210 dc.font.xfont = XLoadQueryFont(dpy, fontstr);
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	211 if (!dc.font.xfont)
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	212 dc.font.xfont = XLoadQueryFont(dpy, "fixed");
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	213 if (!dc.font.xfont)
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: 74 diff changeset	214 eprint("error, cannot init 'fixed' font\n");
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	215 dc.font.ascent = dc.font.xfont->ascent;
989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	216 dc.font.descent = dc.font.xfont->descent;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	217 }
43 989178822938 changed default colors Anselm R. Garbe <garbeam@wmii.de> parents: 34 diff changeset	218 dc.font.height = dc.font.ascent + dc.font.descent;
2 a79188fe4a40 added new stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	219 }
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	220
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	221 unsigned int
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	222 textnw(char *text, unsigned int len)
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	223 {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	224 XRectangle r;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	225 if(dc.font.set) {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	226 XmbTextExtents(dc.font.set, text, len, NULL, &r);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	227 return r.width;
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 return XTextWidth(dc.font.xfont, text, len);
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	230 }
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 unsigned int
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	233 textw(char *text)
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	234 {
4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	235 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	236 }

Mercurial > aewl

annotate draw.c @ 76:4bd49f404f10