--- rxvt-unicode/src/main.C	2006/02/02 18:04:46	1.218
+++ rxvt-unicode/src/main.C	2006/08/02 09:14:19	1.228
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:        main.C
  *----------------------------------------------------------------------*
  *
@@ -58,10 +58,15 @@
 bool
 rxvt_set_locale (const char *locale) NOTHROW
 {
-  if (!locale || !strncmp (locale, curlocale, 128))
+  int size = strlen (locale) + 1;
+
+  if (size > sizeof (curlocale))
+    rxvt_fatal ("locale string too long, aborting.\n");
+
+  if (!locale || !memcmp (locale, curlocale, size))
     return false;
 
-  strncpy (curlocale, locale, 128);
+  memcpy (curlocale, locale, size);
   setlocale (LC_CTYPE, curlocale);
   return true;
 }
@@ -145,7 +150,7 @@
 
 rxvt_term::rxvt_term ()
     :
-#if TRANSPARENT
+#if TRANSPARENT || ENABLE_PERL
     rootwin_ev (this, &rxvt_term::rootwin_cb),
 #endif
 #ifdef HAVE_SCROLLBARS
@@ -200,6 +205,7 @@
   if (cmd_pid)
     kill (-cmd_pid, SIGHUP);
 
+  pty_ev.stop ();
   delete pty; pty = 0;
 }
 
@@ -327,7 +333,7 @@
 #if HAVE_SCROLLBARS
       scrollbar_ev.stop (display);
 #endif
-#if TRANSPARENT
+#if TRANSPARENT || ENABLE_PERL
       rootwin_ev.stop (display);
 #endif
       incr_ev.stop ();
@@ -505,6 +511,9 @@
       rootwin_ev.start (display, display->root);
     }
 #endif
+#if ENABLE_PERL
+  rootwin_ev.start (display, display->root);
+#endif
 
   set_colorfgbg ();
 
@@ -706,9 +715,9 @@
         window_vt_x += sb_w;
     }
 
-  szHint.width_inc = fwidth;
+  szHint.width_inc  = fwidth;
   szHint.height_inc = fheight;
-  szHint.min_width = szHint.base_width + szHint.width_inc;
+  szHint.min_width  = szHint.base_width + szHint.width_inc;
   szHint.min_height = szHint.base_height + szHint.height_inc;
 
   if (newwidth && newwidth - szHint.base_width < max_width)
@@ -937,18 +946,9 @@
   /* XSetWindowAttributes attr; */
   /* Cursor cursor; */
 done:
-
-#if OFF_FOCUS_FADING
-  if (rs[Rs_fade])
-    {
-      rgba c;
-      pix_colors [Color_fade].get (c);
-      pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
-    }
-#endif
-
   /*TODO: handle Color_BD, scrollbar background, etc. */
 
+  update_fade_color (idx);
   recolour_cursor ();
   scr_recolour ();
 }
@@ -1035,7 +1035,9 @@
   int old_height = szHint.height;
 
   window_calc (newwidth, newheight);
-  XSetWMNormalHints (dpy, parent[0], &szHint);
+
+  if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
+    XSetWMNormalHints (dpy, parent[0], &szHint);
 
   if (!ignoreparent)
     {
@@ -1119,7 +1121,7 @@
 #endif
 
 #ifdef USE_XIM
-  IMSetStatusPosition ();
+  IMSetPosition ();
 #endif
 }
 
@@ -1526,8 +1528,8 @@
                              status_attr, NULL);
 
   if (preedit_attr) XFree (preedit_attr);
-  if (status_attr) XFree (status_attr);
-  if (fs) XFreeFontSet (dpy, fs);
+  if (status_attr)  XFree (status_attr);
+  if (fs)           XFreeFontSet (dpy, fs);
 
   if (Input_Context == NULL)
     {
@@ -1542,8 +1544,7 @@
     vt_select_input ();
 #endif
 
-  if (input_style & XIMPreeditArea)
-    IMSetStatusPosition ();
+  IMSetPosition ();
 
   return true;
 }
@@ -1611,34 +1612,47 @@
 }
 
 void
-rxvt_term::IMSetStatusPosition ()
+rxvt_term::IMSetPosition ()
 {
   XRectangle preedit_rect, status_rect, *needed_rect;
   XVaNestedList preedit_attr, status_attr;
 
   if (!Input_Context
       || !focus
-      || !(input_style & XIMPreeditArea)
+      || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
       || !IMisRunning ())
     return;
 
-  /* Getting the necessary width of preedit area */
-  status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
-  XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
-  XFree (status_attr);
-
-  im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
-  XFree (needed_rect);
-
-  preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
-  status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
-
-  XSetICValues (Input_Context,
-                XNPreeditAttributes, preedit_attr,
-                XNStatusAttributes, status_attr, NULL);
+  if (input_style & XIMPreeditPosition)
+    {
+      im_set_size (preedit_rect);
+      preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
+    
+      XSetICValues (Input_Context,
+                    XNPreeditAttributes, preedit_attr, NULL);
+    }
+  else
+    {
+      /* Getting the necessary width of preedit area */
+      status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
+      XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
+      XFree (status_attr);
 
-  XFree (preedit_attr);
-  XFree (status_attr);
+      im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
+      XFree (needed_rect);
+
+      preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
+      status_attr  = XVaCreateNestedList (0, XNArea, &status_rect,  NULL);
+
+      XSetICValues (Input_Context,
+                    XNPreeditAttributes, preedit_attr,
+                    XNStatusAttributes,  status_attr,
+                    NULL);
+
+      XFree (status_attr);
+    }
+
+   XFree (preedit_attr);
 }
 #endif                          /* USE_XIM */