[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.31 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.33 by pcg, Sun Feb 22 10:37:54 2004 UTC

 #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)
     {
       if (!rs[Rs_color + Color_fg])
 void
 rxvt_term::set_locale (const char *locale)
 {
 #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
 #if HAVE_NL_LANGINFO
   free (codeset);
     }
   /* 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;
   /* parent window - reverse video so we can see placement errors

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines