--- rxvt-unicode/src/main.C	2004/02/13 13:28:17	1.33
+++ rxvt-unicode/src/main.C	2004/02/22 08:09:38	1.40
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*--------------------------------*-C-*---------------------------------*;
  * File:        main.c
  *----------------------------------------------------------------------*
  *
@@ -13,6 +13,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -92,13 +93,13 @@
 #ifdef POINTER_BLANK
     pointer_ev (this, &rxvt_term::pointer_cb),
 #endif
+#ifdef USE_XIM
+    im_ev (this, &rxvt_term::im_cb),
+#endif
     check_ev (this, &rxvt_term::check_cb),
     destroy_ev (this, &rxvt_term::destroy_cb),
     pty_ev (this, &rxvt_term::pty_cb),
-    incr_ev (this, &rxvt_term::incr_cb),
-#ifdef USE_XIM
-    im_ev (this, &rxvt_term::im_cb)
-#endif
+    incr_ev (this, &rxvt_term::incr_cb)
 {
   cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
 }
@@ -108,15 +109,6 @@
   if (cmd_fd >= 0)
     close (cmd_fd);
 
-  scr_release ();
-
-  free (env_windowid);
-  free (env_display);
-  free (env_term);
-  free (env_colorfgbg);
-  free (locale);
-  free (codeset);
-
 #ifndef NO_SETOWNER_TTYDEV
   privileged_ttydev (RESTORE);
 #endif
@@ -124,13 +116,27 @@
   privileged_utmp (RESTORE);
 #endif
 
+  delete TermWin.fontset;
+
+  if (display)
+    if (TermWin.parent[0])
+      XDestroyWindow (display->display, TermWin.parent[0]);
+
   // TODO: free pixcolours, colours should become part of rxvt_display
 
   delete PixColors;
-  delete TermWin.fontset;
 
   displays.put (display);
 
+  scr_release ();
+
+  free (env_windowid);
+  free (env_display);
+  free (env_term);
+  free (env_colorfgbg);
+  free (locale);
+  free (codeset);
+
   delete envv;
   delete argv;
 }
@@ -140,13 +146,9 @@
 {
   if (display)
     {
-      if (TermWin.parent[0])
-        XDestroyWindow (display->display, TermWin.parent[0]);
-
       rootwin_ev.stop (display);
       termwin_ev.stop (display);
       vt_ev.stop (display);
-
 #ifdef USE_XIM
       im_destroy ();
       im_ev.stop (display);
@@ -262,15 +264,10 @@
   init_xlocale ();
 
   scr_reset ();         /* initialize screen */
-#ifdef RXVT_GRAPHICS
-  Gr_reset ();          /* reset graphics */
-#endif
 
 #if 0
-#ifdef DEBUG_X
   XSynchronize (display->display, True);
 #endif
-#endif
 
 #ifdef HAVE_SCROLLBARS
   if (Options & Opt_scrollBar)
@@ -997,11 +994,6 @@
       XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
                          window_vt_y, TermWin_TotalWidth (),
                          TermWin_TotalHeight ());
-#ifdef RXVT_GRAPHICS
-      if (old_height)
-        Gr_Resize (old_width - szHint.base_width,
-                   old_height - szHint.base_height);
-#endif
       scr_clear ();
 #ifdef XPM_BACKGROUND
       resize_pixmap ();
@@ -1317,7 +1309,7 @@
 
 #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])
-    setlocale (LC_CTYPE, rs[Rs_imLocale]);
+    SET_LOCALE (rs[Rs_imLocale]);
 #endif
 
   p = rs[Rs_inputMethod];
@@ -1358,7 +1350,7 @@
 done:
 #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])
-    setlocale (LC_CTYPE, locale);
+    SET_LOCALE (locale);
 #endif
 }