Various icccm and ewmh properties

[wmpus] / util.h

diff --git a/util.h b/util.h
index 65b82f5ec6bfa68f703c7853d74c5df4ba7ed787..16fe41eb4162b19aa07176f762dd79d590a55429 100644 (file)
--- a/util.h
+++ b/util.h
@@ -24,16 +24,16 @@
 #define countof(x) (sizeof(x)/sizeof((x)[0]))
 
 /* Constant length map functions */
-#define map_getg(map, test) ({ \
-       int i; \
-       for (i = 0; i < countof(map) && !(test); i++); \
-       i < countof(map) ? &map[i] : NULL ; \
+#define map_get(map, k, kv, v, def) ({         \
+       typeof(def) val = def;                 \
+       for (int i = 0; i < countof(map); i++) \
+               if (map[i].k == kv) {          \
+                       val = map[i].v;        \
+                       break;                 \
+               }                              \
+       val;                                   \
 })
 
-#define map_get(m,k)    map_getg(m,k==*((typeof(k)*)&m[i]))
-#define map_getr(m,k)   map_getg(m,k==*(((typeof(k)*)&m[i+1])-1))
-#define map_getk(m,k,a) map_getg(m,k==m[i].a)
-
 /* Linked lists */
 typedef struct list {
        struct list *prev;
@@ -58,6 +58,10 @@ list_t *list_find(list_t *list, void *data);
 list_t *list_sort(list_t *list, int rev, int (*func)(void*,void*));
 
 /* Misc */
+int residual(float num, float *state);
+
 int str2num(char *str, int def);
 
+int warn(char *fmt, ...);
+
 int error(char *fmt, ...);