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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.228 by root, Wed Aug 2 09:14:19 2006 UTC

 static char curlocale[128], savelocale[128];
 bool
 rxvt_set_locale (const char *locale) NOTHROW
 {
+  int size = strlen (locale) + 1;
+  if (size > sizeof (curlocale))
+    rxvt_fatal ("locale string too long, aborting.\n");
-  if (!locale || !strncmp (locale, curlocale, 128))
+  if (!locale || !memcmp (locale, curlocale, size))
     return false;
-  strncpy (curlocale, locale, 128);
+  memcpy (curlocale, locale, size);
   setlocale (LC_CTYPE, curlocale);
   return true;
 }
 void
 }
 #endif
 rxvt_term::rxvt_term ()
     :
-#if TRANSPARENT
+#if TRANSPARENT || ENABLE_PERL
     rootwin_ev (this, &rxvt_term::rootwin_cb),
 #endif
 #ifdef HAVE_SCROLLBARS
     scrollbar_ev (this, &rxvt_term::x_cb),
 #endif
       im_ev.stop (display);
 #endif
 #if HAVE_SCROLLBARS
       scrollbar_ev.stop (display);
 #endif
-#if TRANSPARENT
+#if TRANSPARENT || ENABLE_PERL
       rootwin_ev.stop (display);
 #endif
       incr_ev.stop ();
       termwin_ev.stop (display);
       vt_ev.stop (display);
       XSelectInput (dpy, display->root, PropertyChangeMask);
       check_our_parents ();
       rootwin_ev.start (display, display->root);
     }
 #endif
+#if ENABLE_PERL
+  rootwin_ev.start (display, display->root);
+#endif
   set_colorfgbg ();
   init_command (cmd_argv);

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