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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.206 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.210 by root, Tue Jan 31 16:19:16 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;
 }
 #if ENABLE_XEMBED
   if (rs[Rs_embed])
     {
       long info[2] = { 0, XEMBED_MAPPED };
-      XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+      XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
                        32, PropModeReplace, (unsigned char *)&info, 2);
     }
 #endif
   XMapWindow (xdisp, vt);
   return true;
 }
 void rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
-  XChangeProperty (display->display, parent[0],
+  XChangeProperty (xdisp, parent[0],
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
 }
 void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);
-  XChangeProperty (display->display, parent[0],
+  XChangeProperty (xdisp, parent[0],
                    prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
                    (const unsigned char *)s, strlen (s));
   free (s);
   free (ws);
           SET_PIXCOLOR (idx);
           goto done;
         }
     }
-  if (!rXParseAllocColor (&xcol, color))
+  if (!set_color (xcol, color))
     return;
-  /* XStoreColor (display->display, display->cmap, XColor*); */
+  /* XStoreColor (xdisp, display->cmap, XColor*); */
   /*
    * FIXME: should free colors here, but no idea how to do it so instead,
    * so just keep gobbling up the colormap
    */
     if (pix_colors[idx] == pix_colors[i])
       break;
   if (i > Color_White)
     {
       /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
-      XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
+      XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
-                  DisplayPlanes (display->display, display->screen));
+                   DisplayPlanes (xdisp, display->screen));
     }
 # endif
   pix_colors_focused[idx] = xcol;
   SET_PIXCOLOR (idx);
   /* Cursor cursor; */
 done:
 #if OFF_FOCUS_FADING
   if (rs[Rs_fade])
+    {
+      rxvt_rgba c;
+      pix_colors [Color_fade].get (this, c);
-    pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
+      pix_colors_unfocused [idx] = pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), c);
+    }
 #endif
   /*TODO: handle Color_BD, scrollbar background, etc. */
   recolour_cursor ();
                      : pix_colors_focused[Color_fg];
   xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
                      ? pix_colors_focused[Color_pointer_bg]
                      : pix_colors_focused[Color_bg];
-  XQueryColors (display->display, cmap, xcol, 2);
+  XQueryColors (xdisp, cmap, xcol, 2);
-  XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
+  XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
 }
 /*----------------------------------------------------------------------*/
 /*
  * find if fg/bg matches any of the normal (low-intensity) colors
   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                          - *
  * -------------------------------------------------------------------- */
 {
   XWindowAttributes wattr;
   if (newwidth == 0 || newheight == 0)
     {
-      XGetWindowAttributes (display->display, display->root, &wattr);
+      XGetWindowAttributes (xdisp, display->root, &wattr);
       if (newwidth == 0)
         newwidth = wattr.width - szHint.base_width;
       if (newheight == 0)
         newheight = wattr.height - szHint.base_height;
       strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
       if ((p = strchr (server + 1, '@')) != NULL)      /* first one only */
         *p = '\0';
-      atom = XInternAtom (display->display, server, False);
+      atom = XInternAtom (xdisp, server, False);
-      win = XGetSelectionOwner (display->display, atom);
+      win = XGetSelectionOwner (xdisp, atom);
       if (win != None)
         return True;
     }
                "*",
                fheight,
                fheight + 1, fheight - 1,
                fheight - 2, fheight + 2);
-      fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
+      fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
                            &missing_charset_list, &missing_charset_count, &def_string);
       if (missing_charset_list)
         XFreeStringList (missing_charset_list);
                              status_attr ? XNStatusAttributes : NULL,
                              status_attr, NULL);
   if (preedit_attr) XFree (preedit_attr);
   if (status_attr) XFree (status_attr);
-  if (fs) XFreeFontSet (display->display, fs);
+  if (fs) XFreeFontSet (xdisp, fs);
   if (Input_Context == NULL)
     {
       rxvt_warn ("failed to create input context, continuing without XIM.\n");
       im_destroy ();

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.206 by root, Wed Jan 25 21:03:04 2006 UTC vs. Revision 1.210 by root, Tue Jan 31 16:19:16 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.206 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.210 by root, Tue Jan 31 16:19:16 2006 UTC