merge the C branch into HEAD

1 files changed, 19 insertions, 0 deletions

diff --git a/render/color.h b/render/color.h
new file mode 100644
index 00000000..1e0cc57a
--- /dev/null
+++ b/render/color.h
@@ -0,0 +1,19 @@
+#ifndef __color_h
+#define __color_h
+
+#include <X11/Xlib.h>
+
+typedef struct color_rgb {
+    int r;
+    int g;
+    int b;
+    unsigned long pixel;
+    GC gc;
+} color_rgb;
+
+void color_allocate_gc(color_rgb *in);
+color_rgb *color_parse(char *colorname);
+color_rgb *color_new(int r, int g, int b);
+void color_free(color_rgb *in);
+
+#endif /* __color_h */