X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=a983c7830c5f10db12a98af596c4d8fe0a911ee0;hb=5e3ab28bab78e07553b7b44fe7c7c7b20c9d2fd3;hp=2a45451ccf07f8b5698b3ef69c2a4a9db3ad9439;hpb=1f63f7b331887a192ddf927670471c3f00f307f5;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 2a45451c..a983c783 100644
--- a/render/render.h
+++ b/render/render.h
@@ -6,35 +6,7 @@
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include "color.h"
-#include "mask.h"
-
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#else
-#  ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#  endif
-#endif
-
-#ifdef HAVE_STDINT_H
-typedef uint32_t pixel32;
-typedef uint16_t pixel16;
-#else
-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
-#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 */
+#include "../kernel/geom.h"
 
 typedef enum {
     Surface_Planar,
@@ -68,9 +40,12 @@ typedef enum {
 typedef enum {
     Bitmask,
     Text,
-    RGBA
+    RGBA,
+    NoTexture
 } TextureType;
 
+struct Appearance;
+
 typedef struct PlanarSurface {
     SurfaceColorType grad;
     ReliefType relief;
@@ -80,6 +55,9 @@ typedef struct PlanarSurface {
     color_rgb *border_color;
     gboolean interlaced;
     gboolean border;
+    struct Appearance *parent;
+    int parentx;
+    int parenty;
     pixel32 *pixel_data;
 } PlanarSurface;
 
@@ -100,24 +78,43 @@ typedef struct Surface {
 
 typedef struct {
     XftFont *xftfont;
+    int height;
 } ObFont;
 
+typedef enum {
+    Justify_Center,
+    Justify_Left,
+    Justify_Right
+} Justify;
+
 typedef struct TextureText {
     ObFont *font;
-    int shadow;  
+    Justify justify;
+    int shadow;
     unsigned char tint;
     unsigned char offset;
     color_rgb *color;
     char *string;
 } TextureText;   
 
+typedef struct {
+    Pixmap mask;
+    guint w, h;
+} pixmap_mask;
+
 typedef struct TextureMask {
     color_rgb *color;
     pixmap_mask *mask;
 } TextureMask;
 
 typedef struct TextureRGBA {
-    int poo;
+    int width;
+    int height;
+    unsigned long *data;
+/* cached scaled so we don't have to scale often */
+    int cwidth;
+    int cheight;
+    unsigned long *cache;
 } TextureRGBA;
 
 typedef union {
@@ -127,6 +124,7 @@ typedef union {
 } TextureData;
 
 typedef struct Texture {
+    Rect position;
     TextureType type;
     TextureData data;
 } Texture;
@@ -143,13 +141,14 @@ extern Visual *render_visual;
 extern int render_depth;
 extern Colormap render_colormap;
 
-void (*paint)(Window win, Appearance *l, int w, int h);
+void (*paint)(Window win, Appearance *l, int x, int y, int w, int h);
 
 void render_startup(void);
 void init_appearance(Appearance *l);
-void x_paint(Window win, Appearance *l, int w, int h);
+void x_paint(Window win, Appearance *l, int x, int y, int w, int h);
 void render_shutdown(void);
 Appearance *appearance_new(SurfaceType type, int numtex);
 Appearance *appearance_copy(Appearance *a);
 void appearance_free(Appearance *a);
+void truecolor_startup(void);
 #endif /*__render_h*/