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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.208 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.211 by root, Tue Jan 31 16:57:35 2006 UTC

 {
   for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
     (*t)->emergency_cleanup ();
 }
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 static void
 print_x_error (Display *dpy, XErrorEvent *event)
 {
     char buffer[BUFSIZ];
     char mesg[BUFSIZ];
     GET_R->allowedxerror = event->error_code;
   else
     {
       // GET_R is most likely not the terminal which caused the error,
       // so just output the error and continue
-#if ENABLE_FRILLS
+#if ENABLE_MINIMAL
+      old_xerror_handler (display, event);
+#else
       print_x_error (display, event);
-#else
-      old_xerror_handler (display, event);
 #endif
     }
   return 0;
 }
   /* Cursor cursor; */
 done:
 #if OFF_FOCUS_FADING
   if (rs[Rs_fade])
-    pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
+    {
+      rxvt_rgba c;
+      pix_colors [Color_fade].get (this, c);
+      pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
+    }
 #endif
   /*TODO: handle Color_BD, scrollbar background, etc. */
   recolour_cursor ();

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