--- rxvt-unicode/src/rxvt.h	2006/01/25 02:42:06	1.242
+++ rxvt-unicode/src/rxvt.h	2006/01/25 13:24:45	1.244
@@ -704,9 +704,9 @@
 #define dDisp			Display *disp = this->display->display
 
 // for speed reasons, we assume that all latin1 characters
-// are single-width (the first unicdoe combining character
+// are single-width (the first unicode combining character
 // is actually 0x300, but ascii is what matters most).
-#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
+#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
 
 /* convert pixel dimensions to row/column values.  Everything as int32_t */
 #define Pixel2Col(x)            Pixel2Width((int32_t)(x))
@@ -1068,15 +1068,16 @@
 
   vector<void *> allocated;           // free these memory blocks with free()
 
-  char           *env_windowid;       /* environmental variable WINDOWID */
+  char            env_windowid[21];   /* environmental variable WINDOWID */
+  char            env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
   char           *env_display;        /* environmental variable DISPLAY  */
   char           *env_term;           /* environmental variable TERM     */
-  char           *env_colorfgbg;
+
   char           *locale;
   char            charsets[4];
   char           *v_buffer;           /* pointer to physical buffer */
   unsigned int    v_buflen;           /* size of area to write */
-  stringvec      *argv, *envv;        /* if != 0, will be freed on destroy time */
+  stringvec      *argv, *envv;        /* if != 0, will be freed at destroy time */
 
 #ifdef KEYSYM_RESOURCE
   keyboard_manager *keyboard;