X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.h;h=26fa7afe61becc2bde9125d83c7b91a9c370f97b;hb=0b646b4e891dacb70f41a43307cbb0dd7304f92a;hp=8768d83a0c61e301d005ea79982a4d59d133217f;hpb=092616de9a809a1c9a646901521ffcc1f337e913;p=chaz%2Fopenbox

diff --git a/render/color.h b/render/color.h
index 8768d83a..26fa7afe 100644
--- a/render/color.h
+++ b/render/color.h
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   color.h for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __color_h
 #define __color_h
 
@@ -7,33 +26,26 @@
 #include <X11/Xutil.h>
 #include <glib.h>
 
-#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_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 */
-
 struct _RrColor {
     const RrInstance *inst;
 
-    int r;
-    int g;
-    int b;
-    unsigned long pixel;
+    gint r;
+    gint g;
+    gint b;
+    gulong pixel;
     GC gc;
+
+    gint key;
+    gint refcount;
+
+#ifdef DEBUG
+    gint id;
+#endif
 };
 
-void color_allocate_gc(RrColor *in);
-XColor *pickColor(const RrInstance *inst, gint r, gint g, gint b);
-void reduce_depth(const RrInstance *inst, RrPixel32 *data, XImage *im);
-void increase_depth(const RrInstance *inst, RrPixel32 *data, XImage *im);
+void RrColorAllocateGC(RrColor *in);
+XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b);
+void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im);
+void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im);
 
 #endif /* __color_h */