draw.c
author Anselm R. Garbe <arg@suckless.org>
Tue, 20 Feb 2007 13:46:21 +0100
changeset 793 79cb72e82b21
child 794 6fa07beba3a7
permissions -rw-r--r--
added draw.c again (except getcolor and setfont which are helpers in main.c)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
793
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     1
/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     2
 * See LICENSE file for license details.
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     3
 */
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     4
#include "dwm.h"
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     5
#include <string.h>
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     6
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     7
/* static */
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     8
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
     9
static unsigned int
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    10
textnw(const char *text, unsigned int len) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    11
	XRectangle r;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    12
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    13
	if(dc.font.set) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    14
		XmbTextExtents(dc.font.set, text, len, NULL, &r);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    15
		return r.width;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    16
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    17
	return XTextWidth(dc.font.xfont, text, len);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    18
}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    19
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    20
static void
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    21
drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    22
	int x;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    23
	XGCValues gcv;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    24
	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    25
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    26
	gcv.foreground = col[ColFG];
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    27
	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    28
	x = (dc.font.ascent + dc.font.descent + 2) / 4;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    29
	r.x = dc.x + 1;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    30
	r.y = dc.y + 1;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    31
	if(filled) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    32
		r.width = r.height = x + 1;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    33
		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    34
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    35
	else if(empty) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    36
		r.width = r.height = x;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    37
		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    38
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    39
}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    40
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    41
static Bool
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    42
isoccupied(unsigned int t) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    43
	Client *c;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    44
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    45
	for(c = clients; c; c = c->next)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    46
		if(c->tags[t])
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    47
			return True;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    48
	return False;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    49
}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    50
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    51
/* extern */
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    52
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    53
void
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    54
drawstatus(void) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    55
	int i, x;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    56
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    57
	dc.x = dc.y = 0;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    58
	for(i = 0; i < ntags; i++) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    59
		dc.w = textw(tags[i]);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    60
		if(seltag[i]) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    61
			drawtext(tags[i], dc.sel);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    62
			drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    63
		}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    64
		else {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    65
			drawtext(tags[i], dc.norm);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    66
			drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    67
		}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    68
		dc.x += dc.w;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    69
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    70
	dc.w = blw;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    71
	drawtext(lt->symbol, dc.norm);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    72
	x = dc.x + dc.w;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    73
	dc.w = textw(stext);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    74
	dc.x = sw - dc.w;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    75
	if(dc.x < x) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    76
		dc.x = x;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    77
		dc.w = sw - x;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    78
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    79
	drawtext(stext, dc.norm);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    80
	if((dc.w = dc.x - x) > bh) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    81
		dc.x = x;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    82
		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    83
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    84
	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    85
	XSync(dpy, False);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    86
}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    87
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    88
void
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    89
drawtext(const char *text, unsigned long col[ColLast]) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    90
	int x, y, w, h;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    91
	static char buf[256];
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    92
	unsigned int len, olen;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    93
	XGCValues gcv;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    94
	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    95
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    96
	XSetForeground(dpy, dc.gc, col[ColBG]);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    97
	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    98
	if(!text)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
    99
		return;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   100
	w = 0;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   101
	olen = len = strlen(text);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   102
	if(len >= sizeof buf)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   103
		len = sizeof buf - 1;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   104
	memcpy(buf, text, len);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   105
	buf[len] = 0;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   106
	h = dc.font.ascent + dc.font.descent;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   107
	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   108
	x = dc.x + (h / 2);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   109
	/* shorten text if necessary */
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   110
	while(len && (w = textnw(buf, len)) > dc.w - h)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   111
		buf[--len] = 0;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   112
	if(len < olen) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   113
		if(len > 1)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   114
			buf[len - 1] = '.';
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   115
		if(len > 2)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   116
			buf[len - 2] = '.';
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   117
		if(len > 3)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   118
			buf[len - 3] = '.';
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   119
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   120
	if(w > dc.w)
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   121
		return; /* too long */
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   122
	gcv.foreground = col[ColFG];
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   123
	if(dc.font.set) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   124
		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   125
		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   126
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   127
	else {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   128
		gcv.font = dc.font.xfont->fid;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   129
		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   130
		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   131
	}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   132
}
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   133
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   134
unsigned int
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   135
textw(const char *text) {
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   136
	return textnw(text, strlen(text)) + dc.font.height;
79cb72e82b21 added draw.c again (except getcolor and setfont which are helpers in main.c)
Anselm R. Garbe <arg@suckless.org>
parents:
diff changeset
   137
}