draw.c
author Anselm R. Garbe <arg@suckless.org>
Thu, 29 Mar 2007 15:18:30 +0200
changeset 853 55478328b242
parent 850 2ea201354cf0
child 857 453788ae925c
permissions -rw-r--r--
next version will be 3.9, but don't expect it this week
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 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
    10
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
    11
	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
    12
	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
    13
	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
    14
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
	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
    16
	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
    17
	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
    18
	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
    19
	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
    20
	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
    21
		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
    22
		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
    23
	}
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
	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
    25
		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
    26
		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
    27
	}
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
}
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
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
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
    31
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
    32
	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
    33
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
	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
    35
		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
    36
			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
    37
	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
    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
794
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    40
static unsigned int
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    41
textnw(const char *text, unsigned int len) {
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    42
	XRectangle r;
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    43
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    44
	if(dc.font.set) {
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    45
		XmbTextExtents(dc.font.set, text, len, NULL, &r);
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    46
		return r.width;
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    47
	}
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    48
	return XTextWidth(dc.font.xfont, text, len);
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    49
}
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    50
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
    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;
817
90435b444620 dwm draws a small caret before the client title if it's a versatile client
Anselm R. Garbe <arg@suckless.org>
parents: 794
diff changeset
    82
		if(sel) {
90435b444620 dwm draws a small caret before the client title if it's a versatile client
Anselm R. Garbe <arg@suckless.org>
parents: 794
diff changeset
    83
			drawtext(sel->name, dc.sel);
837
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me
Anselm R. Garbe <arg@suckless.org>
parents: 830
diff changeset
    84
			drawsquare(sel->ismax, sel->isfloating, dc.sel);
817
90435b444620 dwm draws a small caret before the client title if it's a versatile client
Anselm R. Garbe <arg@suckless.org>
parents: 794
diff changeset
    85
		}
90435b444620 dwm draws a small caret before the client title if it's a versatile client
Anselm R. Garbe <arg@suckless.org>
parents: 794
diff changeset
    86
		else
90435b444620 dwm draws a small caret before the client title if it's a versatile client
Anselm R. Garbe <arg@suckless.org>
parents: 794
diff changeset
    87
			drawtext(NULL, dc.norm);
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
    88
	}
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
	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
    90
	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
    91
}
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
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
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
    94
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
    95
	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
    96
	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
    97
	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
    98
	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
    99
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
	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
   101
	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
   102
	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
   103
		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
   104
	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
   105
	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
   106
	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
   107
		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
   108
	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
   109
	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
   110
	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
   111
	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
   112
	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
   113
	/* 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
   114
	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
   115
		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
   116
	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
   117
		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
   118
			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
   119
		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
   120
			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
   121
		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
   122
			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
   123
	}
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
	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
   125
		return; /* too long */
850
2ea201354cf0 we don't need to set the font all the time
Anselm R. Garbe <arg@suckless.org>
parents: 837
diff changeset
   126
	XSetForeground(dpy, dc.gc, col[ColFG]);
2ea201354cf0 we don't need to set the font all the time
Anselm R. Garbe <arg@suckless.org>
parents: 837
diff changeset
   127
	if(dc.font.set)
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
   128
		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
850
2ea201354cf0 we don't need to set the font all the time
Anselm R. Garbe <arg@suckless.org>
parents: 837
diff changeset
   129
	else
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
   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
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
   134
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
   135
	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
   136
}