X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.h;h=fb669fb54f5c5ff910ad8684921141efc7a4c26b;hb=fd52dc5d350cc753de8df1f702c318e3f3154dcf;hp=3114f4c71871cbd17913bd208d8d23c190cf2581;hpb=214fa8714ea0d2182c155eeb4b32ec32d7df337f;p=chaz%2Fopenbox

diff --git a/render/color.h b/render/color.h
index 3114f4c7..fb669fb5 100644
--- a/render/color.h
+++ b/render/color.h
@@ -21,17 +21,19 @@ typedef u_int32_t pixel32;
 typedef u_int16_t pixel16;   
 #endif /* HAVE_STDINT_H */  
 
-#if (G_ENDIAN == G_BIG_ENDIAN)
-#define default_red_shift 0
-#define default_green_shift 8
-#define default_blue_shift 16
-#define endian MSBFirst  
+#if (G_BYTE_ORDER == G_BIG_ENDIAN)
+#define default_red_offset 0
+#define default_green_offset 8
+#define default_blue_offset 16
+#define default_alpha_offset 24
+#define render_endian MSBFirst  
 #else
-#define default_red_shift 16
-#define default_green_shift 8
-#define default_blue_shift 0
-#define endian LSBFirst
-#endif /* G_ENDIAN == G_BIG_ENDIAN */
+#define default_alpha_offset 24
+#define default_red_offset 16
+#define default_green_offset 8
+#define default_blue_offset 0
+#define render_endian LSBFirst
+#endif /* G_BYTE_ORDER == G_BIG_ENDIAN */
 
 
 typedef struct color_rgb {
@@ -48,6 +50,7 @@ color_rgb *color_parse(char *colorname);
 color_rgb *color_new(int r, int g, int b);
 void color_free(color_rgb *in);
 void reduce_depth(pixel32 *data, XImage *im);
+void increase_depth(pixel32 *data, XImage *im);
 
 extern int render_red_offset;
 extern int render_green_offset;
@@ -57,6 +60,11 @@ extern int render_red_shift;
 extern int render_green_shift;
 extern int render_blue_shift;
 
+extern int render_red_mask;
+extern int render_green_mask;
+extern int render_blue_mask;
+
 extern int pseudo_bpc;
+#define pseudo_ncolors() (1 << (pseudo_bpc * 3))
 extern XColor *pseudo_colors;
 #endif /* __color_h */