X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=8363dd9095ded90a14d25d0bb1b950de11c9cf5c;hb=e5be9ad6ccc45b03ee52939f0c9e04a74009986b;hp=f8f0db8681c99745e19d4207ad1f1a4fd01ba054;hpb=3cb562fe0b1d9740fd72fd30b8094294106750cc;p=chaz%2Fopenbox diff --git a/render/render.h b/render/render.h index f8f0db86..8363dd90 100644 --- a/render/render.h +++ b/render/render.h @@ -7,34 +7,6 @@ #include #include "color.h" -#ifdef HAVE_STDINT_H -# include -#else -# ifdef HAVE_SYS_TYPES_H -# include -# 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 */ - typedef enum { Surface_Planar, Surface_Nonplanar @@ -99,6 +71,7 @@ typedef struct Surface { typedef struct { XftFont *xftfont; + int height; } ObFont; typedef enum { @@ -154,13 +127,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*/