--- rxvt-unicode/src/rxvt.h	2012/01/09 15:34:56	1.461
+++ rxvt-unicode/src/rxvt.h	2012/01/19 13:33:43	1.466
@@ -1,17 +1,17 @@
 #ifndef RXVT_H_                /* include once only */
 #define RXVT_H_
 
-#include <cstdio>
-#include <cctype>
-#include <cerrno>
-#include <cstdarg>
-#include <cstdlib>
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
 #include <sys/types.h>
 #include <unistd.h>
-#include <cstring>
+#include <string.h>
 #include <assert.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -20,9 +20,7 @@
 #include <sys/strredir.h>
 #endif
 
-#if HAVE_CWCHAR
-# include <cwchar>
-#elif HAVE_WCHAR_H
+#if HAVE_WCHAR_H
 # include <wchar.h>
 #else
 // stdlib.h might provide it
@@ -872,6 +870,8 @@
 
 struct TermWin_t
 {
+  int            vt_width;      /* actual window width             [pixels] */
+  int            vt_height;     /* actual window height            [pixels] */
   int            width;         /* window width                    [pixels] */
   int            height;        /* window height                   [pixels] */
   int            fwidth;        /* font width                      [pixels] */
@@ -893,7 +893,6 @@
   Window         parent;        /* parent identifier                        */
   Window         vt;            /* vt100 window                             */
   GC             gc;            /* GC for drawing                           */
-  Pixmap         pixmap;
   rxvt_drawable *drawable;
   rxvt_fontset  *fontset[4];
 };
@@ -1160,7 +1159,7 @@
   bool bg_set_shade (const char *shade_str);
   bool bg_set_blur (const char *geom);
 
-  bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
+  bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
   bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
   void tint_ximage (Visual *visual, XImage *ximage);
   unsigned long make_transparency_pixmap ();
@@ -1216,9 +1215,6 @@
 
   vector<void *> allocated;           // free these memory blocks with free()
 
-  char            env_windowid[21];   /* environmental variable WINDOWID */
-  char            env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
-
   char           *locale;
   char            charsets[4];
   char           *v_buffer;           /* pointer to physical buffer */
@@ -1414,7 +1410,7 @@
   void set_title (const char *str);
   void set_icon_name (const char *str);
   void set_window_color (int idx, const char *color);
-  void set_colorfgbg ();
+  char *get_colorfgbg ();
   bool set_color (rxvt_color &color, const char *name);
   void alias_color (int dst, int src);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);