--- rxvt-unicode/src/xpm.C	2004/08/23 18:48:03	1.19
+++ rxvt-unicode/src/xpm.C	2005/12/21 14:19:19	1.25
@@ -24,10 +24,11 @@
 
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
-#include "xpm.intpro"		/* PROTOS for internal routines */
 
 #ifdef XPM_BACKGROUND
 
+static void      rxvt_pixmap_incr                 (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight);
+
 /*
  * These GEOM strings indicate absolute size/position:
  * @ `WxH+X+Y'
@@ -137,10 +138,10 @@
           if (flags & YNegative)
             y += 100;
         }
-      MIN_IT (x, 100);
-      MIN_IT (y, 100);
-      MAX_IT (x, 0);
-      MAX_IT (y, 0);
+      min_it (x, 100);
+      min_it (y, 100);
+      max_it (x, 0);
+      max_it (y, 0);
       if (bgpixmap->x != x)
         {
           bgpixmap->x = x;
@@ -163,28 +164,31 @@
   GC              gc;
   unsigned int    width = TermWin_TotalWidth ();
   unsigned int    height = TermWin_TotalHeight ();
+  dDisp;
 
-  if (TermWin.pixmap != None)
-    XFreePixmap (display->display, TermWin.pixmap);
+  if (pixmap != None)
+    XFreePixmap (disp, pixmap);
 
   if (bgPixmap.pixmap == None)
     { /* So be it: I'm not using pixmaps */
-      TermWin.pixmap = None;
-      if (! (options & Opt_transparent) || am_transparent == 0)
-        XSetWindowBackground (display->display, TermWin.vt,
-                             pix_colors[Color_bg]);
+      pixmap = None;
+
+      if (!(options & Opt_transparent) || !am_transparent)
+        XSetWindowBackground (disp, vt,
+                              pix_colors[Color_bg]);
+
       return;
     }
 
   gcvalue.foreground = pix_colors[Color_bg];
-  gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
+  gc = XCreateGC (disp, vt, GCForeground, &gcvalue);
 
   if (bgPixmap.pixmap != None)
     {	/* we have a specified pixmap */
       unsigned int    w = bgPixmap.w, h = bgPixmap.h,
-                                          x = bgPixmap.x, y = bgPixmap.y;
+                      x = bgPixmap.x, y = bgPixmap.y;
       unsigned int    xpmh = xpmAttr.height,
-                             xpmw = xpmAttr.width;
+                      xpmw = xpmAttr.width;
 
       /*
        * don't zoom pixmap too much nor expand really small pixmaps
@@ -198,10 +202,10 @@
       if (w == 0)
         {
           /* basic X tiling - let the X server do it */
-          TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
+          pixmap = XCreatePixmap (disp, vt,
                                          xpmw, xpmh,
                                          (unsigned int)display->depth);
-          XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc,
+          XCopyArea (disp, bgPixmap.pixmap, pixmap, gc,
                     0, 0, xpmw, xpmh, 0, 0);
         }
       else
@@ -209,7 +213,7 @@
           float           incr, p;
           Pixmap          tmp;
 
-          TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
+          pixmap = XCreatePixmap (disp, vt,
                                          width, height,
                                          (unsigned int)display->depth);
           /*
@@ -217,9 +221,9 @@
            */
           rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
 
-          tmp = XCreatePixmap (display->display, TermWin.vt,
+          tmp = XCreatePixmap (disp, vt,
                               width, xpmh, (unsigned int)display->depth);
-          XFillRectangle (display->display, tmp, gc, 0, 0, width,
+          XFillRectangle (disp, tmp, gc, 0, 0, width,
                          xpmh);
 
           for ( /*nil */ ; x < w; x++, p += incr)
@@ -227,7 +231,7 @@
               if (p >= xpmw)
                 p = 0;
               /* copy one column from the original pixmap to the tmp pixmap */
-              XCopyArea (display->display, bgPixmap.pixmap, tmp, gc,
+              XCopyArea (disp, bgPixmap.pixmap, tmp, gc,
                         (int)p, 0, 1, xpmh, (int)x, 0);
             }
 
@@ -237,37 +241,34 @@
           rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
 
           if (y > 0)
-            XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width,
-                           y);
+            XFillRectangle (disp, pixmap, gc, 0, 0, width, y);
+
           if (h < height)
-            XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h,
-                           width, height - h + 1);
+            XFillRectangle (disp, pixmap, gc, 0, (int)h, width, height - h + 1);
+
           for ( /*nil */ ; y < h; y++, p += incr)
             {
               if (p >= xpmh)
                 p = 0;
+
               /* copy one row from the tmp pixmap to the main pixmap */
-              XCopyArea (display->display, tmp, TermWin.pixmap, gc,
+              XCopyArea (disp, tmp, pixmap, gc,
                         0, (int)p, width, 1, 0, (int)y);
             }
-          XFreePixmap (display->display, tmp);
+
+          XFreePixmap (disp, tmp);
         }
     }
 
-  XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap);
-  XFreeGC (display->display, gc);
+  XSetWindowBackgroundPixmap (disp, vt, pixmap);
+  XFreeGC (disp, gc);
   am_transparent = 0;
-
-  XClearWindow (display->display, TermWin.vt);
-
-  XSync (display->display, False);
 }
 
 /*
  * Calculate tiling sizes and increments
  * At start, p == 0, incr == xpmwidthheight
  */
-/* INTPROTO */
 static void
 rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
 {
@@ -343,7 +344,7 @@
 Pixmap
 rxvt_term::set_bgPixmap (const char *file)
 {
-  char           *f;
+  char *f;
 
   assert (file != NULL);
 
@@ -353,7 +354,7 @@
       bgPixmap.pixmap = None;
     }
 
-  XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
+  XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
 
   if (*file != '\0')
     {
@@ -362,7 +363,7 @@
       /*
        * we already have the required attributes
        */
-      /*      XGetWindowAttributes (display->display, TermWin.vt, &attr); */
+      /*      XGetWindowAttributes (display->display, vt, &attr); */
 
       xpmAttr.closeness = 30000;
       xpmAttr.colormap = display->cmap;