--- rxvt-unicode/src/init.C	2004/02/22 08:09:38	1.31
+++ rxvt-unicode/src/init.C	2004/03/14 23:14:39	1.40
@@ -386,30 +386,13 @@
   TermWin.saveLines = SAVELINES;
   numPixColors = TOTAL_COLORS;
 
-#ifndef NO_NEW_SELECTION
-  selection_style = NEW_SELECT;
-#else
-  selection_style = OLD_SELECT;
-#endif
-
 #ifndef NO_BRIGHTCOLOR
   colorfgbg = DEFAULT_RSTYLE;
 #endif
 
-#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
-  ks_bigfont = XK_greater;
-  ks_smallfont = XK_less;
-#endif
-
   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
@@ -600,18 +583,6 @@
   if (!rs[Rs_cutchars])
     rs[Rs_cutchars] = CUTCHARS;
 
-#ifdef ACS_ASCII
-  if (!rs[Rs_acs_chars])
-    rs[Rs_acs_chars] = ACS_CHARS;
-  if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
-    {
-      val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
-      for (; i < 0x20; )
-        val[i] = ' ';
-      rs[Rs_acs_chars] = val;
-    }
-#endif
-
 #ifndef NO_BACKSPACE_KEY
   if (!rs[Rs_backspace_key])
 # ifdef DEFAULT_BACKSPACE
@@ -649,29 +620,11 @@
       rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
     }
 
-  if (rs[Rs_selectstyle])
-    {
-      if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
-        selection_style = OLD_WORD_SELECT;
-#ifndef NO_OLD_SELECTION
-
-      else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
-        selection_style = OLD_SELECT;
-#endif
-
-    }
-
 #ifdef HAVE_SCROLLBARS
   setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
                    rs[Rs_scrollBar_thickness]);
 #endif
 
-  TermWin.fontset = new rxvt_fontset (this);
-  TermWin.fontset->populate (rs[Rs_font]);
-  TermWin.fwidth  = TermWin.fontset->base_font ()->width;
-  TermWin.fheight = TermWin.fontset->base_font ()->height;
-  TermWin.fbase   = TermWin.fontset->base_font ()->ascent;
-
 #ifdef XTERM_REVERSE_VIDEO
   /* this is how xterm implements reverseVideo */
   if (Options & Opt_reverseVideo)
@@ -804,7 +757,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
@@ -1139,7 +1092,13 @@
   /* grab colors before netscape does */
   Get_Colours ();
 
-  change_font (1, NULL);
+  if (!change_font (rs[Rs_font]))
+    {
+      fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
+      destroy ();
+      return;
+    }
+
   window_calc (0, 0);
   old_width = szHint.width;
   old_height = szHint.height;
@@ -1175,7 +1134,7 @@
   xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
 
   classHint.res_name = (char *)rs[Rs_name];
-  classHint.res_class = (char *)APL_CLASS;
+  classHint.res_class = (char *)RESCLASS;
 
   wmHint.flags = (InputHint | StateHint | WindowGroupHint);
   wmHint.input = True;
@@ -1248,17 +1207,21 @@
   if (menuBar_height ())
     {
       menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
-                                        window_vt_x, 0,
-                                        TermWin_TotalWidth (),
-                                        menuBar_TotalHeight (),
-                                        0,
-                                        PixColors[Color_fg],
-                                        PixColors[Color_scroll]);
+                                         window_vt_x, 0,
+                                         TermWin_TotalWidth (),
+                                         menuBar_TotalHeight (),
+                                         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 +1254,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
 }