--- rxvt-unicode/src/rxvtlib.h.in	2004/02/09 07:11:49	1.11
+++ rxvt-unicode/src/rxvtlib.h.in	2004/03/06 00:05:01	1.16
@@ -1,9 +1,9 @@
 #ifndef _RXVTLIB_H_             /* include once only */
 #define _RXVTLIB_H_
 
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cstdio>
+#include <cctype>
+#include <cerrno>
 @include_stdarg_h@
 @include_stdlib_h@
 @include_stdint_h@
@@ -22,6 +22,8 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
+#include <cwchar>
+
 extern "C" {
 #include <X11/Intrinsic.h>      /* Xlib, Xutil, Xresource, Xfuncproto */
 }
@@ -46,6 +48,7 @@
 struct rxvt_term;
 struct rxvt_display;
 struct rxvt_im;
+struct rxvt_drawable;
 
 typedef struct rxvt_term *rxvt_t;
 
@@ -62,7 +65,7 @@
   int32_t         col;
 } row_col_t;
 
-#if UNICODE3
+#if UNICODE_3
 typedef uint32_t text_t;
 #else
 typedef uint16_t text_t; // saves lots of memory
@@ -102,6 +105,7 @@
   GC             gc;            /* GC for drawing                           */
   Pixmap         pixmap;
   rxvt_fontset  *fontset;
+  rxvt_drawable *drawable;
 } TermWin_t;
 
 /*
@@ -157,7 +161,7 @@
 };
 
 typedef struct {
-  unsigned char  *text;       /* selected text                             */
+  wchar_t        *text;       /* selected text                             */
   uint32_t        len;        /* length of selected text                   */
   short           screen;     /* screen being used                         */
   short           clicks;     /* number of clicks                          */
@@ -197,7 +201,7 @@
 #define Opt_scrollTtyKeypress   (1LU<<12)
 #define Opt_transparent         (1LU<<13)
 #define Opt_transparent_all     (1LU<<14)
-#define Opt_mc_hack             (1LU<<15)
+#define Opt_15                  (1LU<<15) // UNALLOCATED
 #define Opt_tripleclickwords    (1LU<<16)
 #define Opt_scrollWithBuffer    (1LU<<17)
 #define Opt_jumpScroll          (1LU<<18)
@@ -216,6 +220,7 @@
 typedef struct {
   short           state;
   Window          win;
+  struct rxvt_drawable *drawable;
 } menuBar_t;
 
 typedef struct {