draw.c
author Anselm R. Garbe <garbeam@gmail.com>
Thu, 23 Aug 2007 18:11:24 +0200
changeset 974 408014d21261
parent 960 b5f856fcef4c
child 987 ea0cef59c3a3
permissions -rw-r--r--
removed unnecessary include, prepared dwm-4.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
910
c13cb8c6b7a5 referred to LICENSE file
Anselm R. Garbe <arg@suckless.org>
parents: 909
diff changeset
     1
/* See LICENSE file for copyright and license details. */
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
     2
#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
     3
#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
     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
     5
/* 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
     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 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
     8
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
     9
	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
    10
	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
    11
	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
    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
	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
    14
	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
    15
	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
    16
	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
    17
	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
    18
	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
    19
		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
    20
		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
    21
	}
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
	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
    23
		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
    24
		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
    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
}
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
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
    29
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
    30
	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
    31
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
	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
    33
		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
    34
			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
    35
	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
    36
}
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
794
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    38
static unsigned int
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    39
textnw(const char *text, unsigned int len) {
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    40
	XRectangle r;
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    41
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    42
	if(dc.font.set) {
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    43
		XmbTextExtents(dc.font.set, text, len, NULL, &r);
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    44
		return r.width;
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    45
	}
6fa07beba3a7 fixed order
Anselm R. Garbe <arg@suckless.org>
parents: 793
diff changeset
    46
	return XTextWidth(dc.font.xfont, text, len);
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
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
    49
/* 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
    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
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
    52
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
    53
	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
    54
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
	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
    56
	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
    57
		dc.w = textw(tags[i]);
960
b5f856fcef4c renamed seltag into seltags
Anselm R. Garbe <garbeam@gmail.com>
parents: 946
diff changeset
    58
		if(seltags[i]) {
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
    59
			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
    60
			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
    61
		}
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
		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
    63
			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
    64
			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
    65
		}
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
		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
    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.w = blw;
946
b938876de936 made Layout a static struct in layout.c, added some convenience getters in layout.c, now lt->arrange accesses are not possible anymore, arrange() is the super-arrange function which sets up all layouts
Anselm R. Garbe <garbeam@gmail.com>
parents: 910
diff changeset
    69
	drawtext(getsymbol(), 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
    70
	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
    71
	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
    72
	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
    73
	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
    74
		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
    75
		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
    76
	}
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
	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
    78
	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
    79
		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
    80
		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
    81
			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
    82
			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
    83
		}
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
    84
		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
    85
			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
    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
	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
    88
	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
    89
}
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
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
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
    92
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
    93
	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
    94
	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
    95
	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
    96
	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
    97
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
	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
    99
	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
   100
	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
   101
		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
   102
	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
   103
	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
   104
	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
   105
		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
   106
	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
   107
	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
   108
	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
   109
	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
   110
	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
   111
	/* 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
   112
	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
   113
		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
   114
	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
   115
		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
   116
			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
   117
		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
   118
			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
   119
		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
   120
			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
   121
	}
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
	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
   123
		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
   124
	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
   125
	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
   126
		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
   127
	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
   128
		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
   129
}
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
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
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
   132
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
   133
	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
   134
}