--- rxvt-unicode/src/main.C	2004/02/24 16:25:44	1.44
+++ rxvt-unicode/src/main.C	2004/03/03 04:07:52	1.48
@@ -120,13 +120,15 @@
 
   if (display)
     {
-      if (TermWin.parent[0])
-        XDestroyWindow (display->display, TermWin.parent[0]);
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
-      if (menuBar.win)
-        XDestroyWindow (display->display, menuBar.win);
       delete menuBar.drawable;
+      //if (menuBar.win)
+      //  XDestroyWindow (display->display, menuBar.win);
 #endif
+      delete TermWin.drawable;
+      // destroy all windows
+      if (TermWin.parent[0])
+        XDestroyWindow (display->display, TermWin.parent[0]);
     }
 
   // TODO: free pixcolours, colours should become part of rxvt_display
@@ -385,7 +387,7 @@
   if (p)
     return p;
 
-  fprintf (stderr, APL_NAME ": memory allocation failure.  Aborting");
+  fprintf (stderr, RESNAME ": memory allocation failure.  Aborting");
   rxvt_clean_exit ();
   exit (EXIT_FAILURE);
   /* NOTREACHED */
@@ -401,7 +403,7 @@
   if (p)
     return p;
 
-  fprintf (stderr, APL_NAME ": memory allocation failure.  Aborting");
+  fprintf (stderr, RESNAME ": memory allocation failure.  Aborting");
   rxvt_clean_exit ();
   exit (EXIT_FAILURE);
   /* NOTREACHED */
@@ -420,7 +422,7 @@
   if (p)
     return p;
 
-  fprintf (stderr, APL_NAME ": memory allocation failure.  Aborting");
+  fprintf (stderr, RESNAME ": memory allocation failure.  Aborting");
   rxvt_clean_exit ();
   exit (EXIT_FAILURE);
   /* NOTREACHED */
@@ -739,7 +741,7 @@
     {
       rxvt_fontset *fs = new rxvt_fontset (this);
 
-      if (fs && fs->populate (fontname))
+      if (fs && fs->populate (fontname ? fontname : "fixed"))
         {
           delete TermWin.fontset;
           TermWin.fontset = fs;
@@ -747,8 +749,6 @@
           TermWin.fheight = fs->base_font ()->height;
           TermWin.fbase   = fs->base_font ()->ascent;
 
-          // TODO: screen needs to be told about new fonts
-          
           if (TermWin.parent[0])
             {
               resize_all_windows (0, 0, 0);
@@ -778,7 +778,7 @@
 #ifndef SMART_WINDOW_TITLE
   XStoreName (display->display, TermWin.parent[0], str);
 #else
-  char           *name;
+  char *name;
 
   if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
     name = NULL;
@@ -795,7 +795,7 @@
 #ifndef SMART_WINDOW_TITLE
   XSetIconName (display->display, TermWin.parent[0], str);
 #else
-  char           *name;
+  char *name;
 
   if (XGetIconName (display->display, TermWin.parent[0], &name))
     name = NULL;
@@ -810,8 +810,8 @@
 void
 rxvt_term::set_window_color (int idx, const char *color)
 {
-  rxvt_color      xcol;
-  int             i;
+  rxvt_color xcol;
+  int i;
 
   if (color == NULL || *color == '\0')
     return;
@@ -1038,7 +1038,7 @@
       XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
                          window_vt_y, TermWin_TotalWidth (),
                          TermWin_TotalHeight ());
-      scr_clear ();
+      scr_clear (height != old_height);
 #ifdef XPM_BACKGROUND
       resize_pixmap ();
 #endif