X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=util.h;h=cded0434301b89014a41219601a8f93e206eea24;hb=3465bed290abc62cb2e69a8096084ba6b8eb4956;hp=be296e8ad42d06d85d23396536fe9a99b165a0cc;hpb=8a34fa50f75f4d6d8af234ac0c4f6d40b988d700;p=dwm.git

diff --git a/util.h b/util.h
index be296e8..cded043 100644
--- a/util.h
+++ b/util.h
@@ -1,41 +1,8 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 
-#include <X11/Xlib.h>
-#include <X11/Xlocale.h>
+#define MAX(A, B)               ((A) > (B) ? (A) : (B))
+#define MIN(A, B)               ((A) < (B) ? (A) : (B))
+#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
 
-typedef struct Brush Brush;
-typedef struct Color Color;
-typedef struct Fnt Fnt;
-
-struct Color {
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
-};
-
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-};
-
-struct Brush {
-	GC gc;
-	Drawable drawable;
-	XRectangle rect;
-	Bool border;
-	Fnt *font;
-	Color color;
-	const char *text;
-};
-
-extern void draw(Display *dpy, Brush *b);
-extern void loadcolor(Display *dpy, int screen, Color *c,
-		const char *bg, const char *fg, const char *bo);
-extern unsigned int textwidth_l(Fnt *font, char *text, unsigned int len);
-extern unsigned int textwidth(Fnt *font, char *text);
-extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
+void die(const char *errstr, ...);
+void *ecalloc(size_t, size_t);