Merge branch 'm4/master'

diff --cc Makefile.am
Simple merge

diff --cc obrender/render.h
index d7066e253269762c38e3217deaa35d7e3666290d,d8d47c9d629ca6e23c092bf0616e9d7be5170e85..a5d6500ce5f768db32fc2fa90f65637f440b0667
--- 1/obrender/render.h
--- 2/obrender/render.h
+++ b/obrender/render.h
@@@ -44,11 -44,11 +44,12 @@@ typedef struct _RrPixmapMask       RrPi
  typedef struct _RrInstance         RrInstance;
  typedef struct _RrColor            RrColor;
  typedef struct _RrImage            RrImage;
 +typedef struct _RrImageSet         RrImageSet;
  typedef struct _RrImagePic         RrImagePic;
  typedef struct _RrImageCache       RrImageCache;
+ typedef struct _RrButton           RrButton;
  
 -typedef guint32 RrPixel32;
 +typedef guint32 RrPixel32;  /* RGBA format */
  typedef guint16 RrPixel16;
  typedef guchar  RrPixel8;
  
@@@ -284,8 -265,59 +285,54 @@@ struct _RrImageSe
        RrImage. */
      RrImagePic **resized;
      gint n_resized;
 -
 -    /* This function (if not NULL) will be called just before destroying
 -      RrImage. */
 -    RrImageDestroyFunc destroy_func;
 -    gpointer           destroy_data;
  };
  
+ struct _RrButton {
+     const RrInstance *inst;
+ 
+     /* colors */
+     RrColor *focused_unpressed_color;
+     RrColor *unfocused_unpressed_color;
+     RrColor *focused_pressed_color;
+     RrColor *unfocused_pressed_color;
+     RrColor *disabled_focused_color;
+     RrColor *disabled_unfocused_color;
+     RrColor *hover_focused_color;
+     RrColor *hover_unfocused_color;
+     RrColor *toggled_hover_focused_color;
+     RrColor *toggled_hover_unfocused_color;
+     RrColor *toggled_focused_pressed_color;
+     RrColor *toggled_unfocused_pressed_color;
+     RrColor *toggled_focused_unpressed_color;
+     RrColor *toggled_unfocused_unpressed_color;
+     
+     /* masks */
+     RrPixmapMask *mask;
+     RrPixmapMask *pressed_mask;
+     RrPixmapMask *disabled_mask;
+     RrPixmapMask *hover_mask;
+     RrPixmapMask *toggled_mask;
+     RrPixmapMask *toggled_hover_mask;
+     RrPixmapMask *toggled_pressed_mask;
+    
+     /* textures */
+     RrAppearance *a_focused_unpressed;
+     RrAppearance *a_unfocused_unpressed;
+     RrAppearance *a_focused_pressed;
+     RrAppearance *a_unfocused_pressed;
+     RrAppearance *a_disabled_focused;
+     RrAppearance *a_disabled_unfocused;
+     RrAppearance *a_hover_focused;
+     RrAppearance *a_hover_unfocused;
+     RrAppearance *a_toggled_focused_unpressed;
+     RrAppearance *a_toggled_unfocused_unpressed;
+     RrAppearance *a_toggled_focused_pressed;
+     RrAppearance *a_toggled_unfocused_pressed;
+     RrAppearance *a_toggled_hover_focused;
+     RrAppearance *a_toggled_hover_unfocused;
+ 
+ };
+ 
  /* these are the same on all endian machines because it seems to be dependant
     on the endianness of the gfx card, not the cpu. */
  #define RrDefaultAlphaOffset 24

diff --cc openbox/prompt.c
Simple merge