patch: fibonacci

[dwm.git] / util.h

diff --git a/util.h b/util.h
index be296e8..f633b51 100644 (file)
--- 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 *fmt, ...);
+void *ecalloc(size_t nmemb, size_t size);