--- rxvt-unicode/src/init.C	2004/02/22 08:28:36	1.32
+++ rxvt-unicode/src/init.C	2004/02/24 16:25:44	1.36
@@ -404,12 +404,6 @@
   refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
   prev_nrow = prev_ncol = 0;
-#ifdef MULTICHAR_SET
-# ifdef MULTICHAR_ENCODING
-  encoding_method = MULTICHAR_ENCODING;
-# endif
-  multichar_decode = rxvt_euc2jis;
-#endif
 
   oldcursor.row = oldcursor.col = -1;
 #ifdef XPM_BACKGROUND
@@ -798,7 +792,7 @@
 {
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
-  this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
+  this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif
@@ -1254,11 +1248,15 @@
                                         0,
                                         PixColors[Color_fg],
                                         PixColors[Color_scroll]);
+
 #ifdef DEBUG_X
       XStoreName (display->display, menuBar.win, "menubar");
 #endif
 
-      XDefineCursor (display->display, menuBar.win, pointer_leftptr);
+      menuBar.drawable = new rxvt_drawable (display, menuBar.win);
+
+      XDefineCursor (display->display, menuBar.win,
+                     XCreateFontCursor (display->display, XC_left_ptr));
 
       XSelectInput (display->display, menuBar.win,
                    (ExposureMask | ButtonPressMask | ButtonReleaseMask
@@ -1291,17 +1289,15 @@
                          GCForeground | GCBackground
                          | GCGraphicsExposures, &gcvalue);
 
+  TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
+
 #if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
   gcvalue.foreground = PixColors[Color_topShadow];
-  topShadowGC = XCreateGC (display->display, TermWin.vt,
-                          GCForeground, &gcvalue);
+  topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
   gcvalue.foreground = PixColors[Color_bottomShadow];
-  botShadowGC = XCreateGC (display->display, TermWin.vt,
-                          GCForeground, &gcvalue);
-  gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
-                                  : Color_scroll)];
-  scrollbarGC = XCreateGC (display->display, TermWin.vt,
-                          GCForeground, &gcvalue);
+  botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
+  gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
+  scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
 #endif
 }