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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.160 by root, Wed Jan 4 05:35:34 2006 UTC

   if (OPTION (Opt_scrollBar))
     scrollBar.setIdle ();    /* set existence for size calculations */
 #endif
 #if ENABLE_PERL
+  if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
+      || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
+      || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
+    {
-  rxvt_perl.init ();
+      rxvt_perl.init ();
-#endif
-  PERL_INVOKE ((this, HOOK_INIT, DT_END));
+      PERL_INVOKE ((this, HOOK_INIT, DT_END));
+    }
+#endif
   create_windows (argc, argv);
   dDisp;
   prop.height += lineSpace;
   fs->set_prop (prop);
   fwidth  = prop.width;
   fheight = prop.height;
-  fbase   = (*fs)[1]->ascent;
+  fbase   = prop.ascent;
   for (int style = 1; style < 4; style++)
     {
 #if ENABLE_STYLES
       const char *res = rs[Rs_font + style];
         }
       if (menubar_visible ())
         XMoveResizeWindow (disp, menuBar.win,
                            window_vt_x, 0,
-                           TermWin_TotalWidth (), menuBar_TotalHeight ());
+                           width, menuBar_TotalHeight ());
       XMoveResizeWindow (disp, vt,
                          window_vt_x, window_vt_y,
-                         TermWin_TotalWidth (), TermWin_TotalHeight ());
+                         width, height);
       scr_clear ();
 #ifdef XPM_BACKGROUND
       resize_pixmap ();
 #endif

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