X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=16f5c31c6be11a0364c149a7cb1e26e663c58dd5;hb=f827fbcaee822a0ef7d573edeb551bf2c1865aac;hp=d98cebdef9777cbef58b900d3e6bb3942566b560;hpb=bbaef2ee577be02d9572ee848ed62f915afd724a;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index d98cebde..16f5c31c 100644
--- a/render/render.h
+++ b/render/render.h
@@ -33,8 +33,7 @@ typedef enum {
     Background_CrossDiagonal,
     Background_PipeCross,
     Background_Rectangle,
-    Background_Pyramid,
-    Background_Elliptic
+    Background_Pyramid
 } SurfaceColorType;
 
 typedef enum {
@@ -53,6 +52,8 @@ typedef struct PlanarSurface {
     color_rgb *primary;
     color_rgb *secondary;
     color_rgb *border_color;
+    color_rgb *bevel_dark; 
+    color_rgb *bevel_light;
     gboolean interlaced;
     gboolean border;
     struct Appearance *parent;
@@ -79,6 +80,7 @@ typedef struct Surface {
 typedef struct {
     XftFont *xftfont;
     int height;
+    int elipses_length;
 } ObFont;
 
 typedef enum {
@@ -109,13 +111,13 @@ typedef struct TextureMask {
 } TextureMask;
 
 typedef struct TextureRGBA {
-    int width;
-    int height;
-    unsigned long *data;
+    guint width;
+    guint height;
+    pixel32 *data;
 /* cached scaled so we don't have to scale often */
-    int cwidth;
-    int cheight;
-    unsigned long *cache;
+    guint cwidth;
+    guint cheight;
+    pixel32 *cache;
 } TextureRGBA;
 
 typedef union {
@@ -140,6 +142,7 @@ typedef struct Appearance {
 } Appearance;
 
 extern Visual *render_visual;
+extern XVisualInfo render_visual_info;
 extern int render_depth;
 extern Colormap render_colormap;
 
@@ -148,6 +151,7 @@ void (*paint)(Window win, Appearance *l);
 void render_startup(void);
 void init_appearance(Appearance *l);
 void x_paint(Window win, Appearance *l);
+void gl_paint(Window win, Appearance *l);
 void render_shutdown(void);
 Appearance *appearance_new(SurfaceType type, int numtex);
 Appearance *appearance_copy(Appearance *a);
@@ -158,4 +162,7 @@ void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h);
 
 void appearance_minsize(Appearance *l, int *w, int *h);
 
+gboolean render_pixmap_to_rgba(Pixmap pmap, Pixmap mask,
+                               int *w, int *h, pixel32 **data);
+
 #endif /*__render_h*/