*** empty log message ***

diff --git a/src/menubar.C b/src/menubar.C
index a3a2261..4a5c92c 100644 (file)
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -960,8 +960,8 @@ rxvt_term::menu_show ()
                                             x, ActiveMenu->y,
                                             ActiveMenu->w, ActiveMenu->h,
                                             0,
-                                            PixColors[Color_fg],
-                                            PixColors[Color_scroll]);
+                                            pix_colors[Color_fg],
+                                            pix_colors[Color_scroll]);
       ActiveMenu->drawable = new rxvt_drawable (display, ActiveMenu->win);
       XMapWindow (display->display, ActiveMenu->win);
     }
@@ -2036,8 +2036,8 @@ rxvt_term::menubar_expose ()
       /* Create the graphics context */
       XGCValues       gcvalue;
 
-      gcvalue.foreground = (display->depth <= 2 ? PixColors[Color_fg]
-                            : PixColors[Color_Black]);
+      gcvalue.foreground = (display->depth <= 2 ? pix_colors[Color_fg]
+                            : pix_colors[Color_Black]);
       menubarGC = XCreateGC (display->display, menuBar.win,
                             GCForeground, &gcvalue);
 

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 0944a56..eb16cc8 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -197,9 +197,9 @@ rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
   else if (color >= 0)
     {
 #if XFT
-      XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
+      XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h);
 #else
-      XSetForeground (d.display->display, TGC, r->PixColors[color]);
+      XSetForeground (d.display->display, TGC, r->pix_colors[color]);
       XFillRectangle (d.display->display, d, TGC, x, y, w, h);
 #endif
     }
@@ -268,7 +268,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
 {
   clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
 
-  XSetForeground (d.display->display, TGC, r->PixColors[fg]);
+  XSetForeground (d.display->display, TGC, r->pix_colors[fg]);
 
   while (len--)
     {
@@ -733,7 +733,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
   int base = r->TermWin.fbase;
 
   XGCValues v;
-  v.foreground = r->PixColors[fg];
+  v.foreground = r->pix_colors[fg];
   v.font = f->fid;
 
   if (enc2b)
@@ -742,7 +742,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
 
       if (bg == Color_bg && !slow)
         {
-          v.background = r->PixColors[bg];
+          v.background = r->pix_colors[bg];
           XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
           XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
         }
@@ -774,7 +774,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
 
       if (bg == Color_bg && !slow)
         {
-          v.background = r->PixColors[bg];
+          v.background = r->pix_colors[bg];
           XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
           XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
         }
@@ -969,9 +969,9 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
   if (!slow && width == r->TermWin.fwidth && 0)
     {
       if (sizeof (text_t) == sizeof (FcChar16))
-        XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
+        XftDrawString16 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
       else
-        XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
+        XftDrawString32 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
     }
   else
     {
@@ -987,14 +987,14 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
               if (sizeof (text_t) == sizeof (FcChar16))
                 {
                   XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
-                  XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
+                  XftDrawString16 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
                                    y + r->TermWin.fbase, (const FcChar16 *)text, 1);
                 }
               else
                 {
                   XGlyphInfo extents;
                   XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
-                  XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
+                  XftDrawString32 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
                                    y + r->TermWin.fbase, (const FcChar32 *)text, 1);
                 }
             }

diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
index 7a7101c..0d84ee0 100644 (file)
--- a/src/scrollbar-next.C
+++ b/src/scrollbar-next.C
@@ -25,7 +25,6 @@
 
 #include "../config.h"         /* NECESSARY */
 #include "rxvt.h"              /* NECESSARY */
-#include "scrollbar-next.intpro"       /* PROTOS for internal routines */
 
 /*----------------------------------------------------------------------*/
 #if defined(NEXT_SCROLLBAR)
@@ -154,11 +153,11 @@ rxvt_term::init_scrollbar_stuff ()
 
   gcvalue.graphics_exposures = False;
 
-  gcvalue.foreground = PixColors[Color_Black];
+  gcvalue.foreground = pix_colors[Color_Black];
   blackGC = XCreateGC (display->display, scrollBar.win,
                       GCForeground | GCGraphicsExposures, &gcvalue);
 
-  gcvalue.foreground = PixColors[Color_White];
+  gcvalue.foreground = pix_colors[Color_White];
   whiteGC = XCreateGC (display->display, scrollBar.win,
                       GCForeground | GCGraphicsExposures, &gcvalue);
 
@@ -166,7 +165,7 @@ rxvt_term::init_scrollbar_stuff ()
   xcol.green = 0xaaaa;
   xcol.blue = 0xaeba;
   //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
-  xcol.pixel = PixColors[Color_AntiqueWhite];
+  xcol.pixel = pix_colors[Color_AntiqueWhite];
   light = gcvalue.foreground = xcol.pixel;
   grayGC = XCreateGC (display->display, scrollBar.win,
                      GCForeground | GCGraphicsExposures, &gcvalue);
@@ -175,7 +174,7 @@ rxvt_term::init_scrollbar_stuff ()
   xcol.green = 0x5555;
   xcol.blue = 0x5144;
   //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
-  xcol.pixel = PixColors[Color_Grey25];
+  xcol.pixel = pix_colors[Color_Grey25];
   dark = gcvalue.foreground = xcol.pixel;
   darkGC = XCreateGC (display->display, scrollBar.win,
                      GCForeground | GCGraphicsExposures, &gcvalue);
@@ -189,7 +188,7 @@ rxvt_term::init_scrollbar_stuff ()
   gcvalue.fill_style = FillOpaqueStippled;
   gcvalue.stipple = stipple;
 
-  /*    XSetWindowBackground (display->display, scrollBar.win, PixColors[Color_Red]); */
+  /*    XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_Red]); */
 
   stippleGC = XCreateGC (display->display, scrollBar.win,
                         GCForeground | GCBackground | GCStipple