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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.207 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.208 by root, Mon Jan 30 19:46:13 2006 UTC

           SET_PIXCOLOR (idx);
           goto done;
         }
     }
-  if (!rXParseAllocColor (&xcol, color))
+  if (!set_color (xcol, color))
     return;
   /* XStoreColor (xdisp, display->cmap, XColor*); */
   /*
   sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
 }
 /*----------------------------------------------------------------------*/
-int
+bool
-rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
+rxvt_term::set_color (rxvt_color &color, const char *name)
 {
-  if (!screen_in_out->set (this, colour))
+  if (color.set (this, name))
-    {
-      rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
-      return false;
-    }
-  return true;
+    return true;
+  rxvt_warn ("can't get colour '%s', continuing without.\n", name);
+  return false;
 }
 /* -------------------------------------------------------------------- *
  * -                         WINDOW RESIZING                          - *
  * -------------------------------------------------------------------- */

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