--- rxvt-unicode/src/main.C	2005/01/17 00:59:23	1.128
+++ rxvt-unicode/src/main.C	2005/02/03 07:18:30	1.132
@@ -161,6 +161,7 @@
     im_ev (this, &rxvt_term::im_cb),
 #endif
     sw_term (this, &rxvt_term::sig_term),
+    sw_int (this, &rxvt_term::sig_term),
     sw_chld (this, &rxvt_term::sig_chld),
     termwin_ev (this, &rxvt_term::x_cb),
     vt_ev (this, &rxvt_term::x_cb),
@@ -189,12 +190,12 @@
   if (cmd_pid)
     kill (-cmd_pid, SIGHUP);
 
-  pty.put ();
-
 #ifdef UTMP_SUPPORT
   privileged_utmp (RESTORE);
 #endif
 
+  pty.put ();
+
 #if ENABLE_STYLES
   for (int i = RS_styleCount; --i; )
     if (TermWin.fontset[i] != TermWin.fontset[0])
@@ -1117,6 +1118,7 @@
       XMoveResizeWindow (display->display, TermWin.vt,
                          window_vt_x, window_vt_y,
                          TermWin_TotalWidth (), TermWin_TotalHeight ());
+
       scr_clear ();
 #ifdef XPM_BACKGROUND
       resize_pixmap ();
@@ -1149,6 +1151,11 @@
   old_width = szHint.width;
   old_height = szHint.height;
 
+#ifdef XPM_BACKGROUND
+  if (TermWin.pixmap)
+    scr_touch (false);
+#endif
+
 #ifdef USE_XIM
   IMSetStatusPosition ();
 #endif
@@ -1387,7 +1394,7 @@
                TermWin.fheight + 1, TermWin.fheight - 1,
                TermWin.fheight - 2, TermWin.fheight + 2);
 
-      fs = XCreateFontSet (display->display, pat,
+      fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
                            &missing_charset_list, &missing_charset_count, &def_string);
 
       if (missing_charset_list)