--- rxvt-unicode/src/command.C	2006/01/31 22:01:25	1.304
+++ rxvt-unicode/src/command.C	2006/02/02 18:04:45	1.305
@@ -1179,7 +1179,7 @@
 void
 rxvt_term::pointer_unblank ()
 {
-  XDefineCursor (xdisp, vt, TermWin_cursor);
+  XDefineCursor (dpy, vt, TermWin_cursor);
   recolour_cursor ();
 
 #ifdef POINTER_BLANK
@@ -1197,8 +1197,8 @@
   if (!OPTION (Opt_pointerBlank))
     return;
 
-  XDefineCursor (xdisp, vt, display->blank_cursor);
-  XFlush (xdisp);
+  XDefineCursor (dpy, vt, display->blank_cursor);
+  XFlush (dpy);
 
   hidden_pointer = 1;
 }
@@ -1287,7 +1287,7 @@
 {
   make_current ();
 
-  dLocal (Display *, xdisp);
+  dLocal (Display *, dpy);
 
   if (ev.xany.window == vt
       && SHOULD_INVOKE (HOOK_X_EVENT)
@@ -1407,7 +1407,7 @@
                       }
 #if ENABLE_EWMH
                     else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
-                      XSendEvent (xdisp, ev.xclient.window = display->root,
+                      XSendEvent (dpy, ev.xclient.window = display->root,
                                   False, SubstructureRedirectMask | SubstructureNotifyMask,
                                   &ev);
 #endif
@@ -1465,7 +1465,7 @@
       case ConfigureNotify:
         if (ev.xconfigure.window == parent[0])
           {
-            while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
+            while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
 
             if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
@@ -1533,11 +1533,11 @@
             do
               scr_expose (ev.xexpose.x, ev.xexpose.y,
                           ev.xexpose.width, ev.xexpose.height, False);
-            while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
+            while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
 
             ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
 
-            while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
+            while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
               scr_expose (ev.xexpose.x, ev.xexpose.y,
                           ev.xexpose.width, ev.xexpose.height, False);
 
@@ -1547,9 +1547,9 @@
           {
             XEvent unused_event;
 
-            while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
+            while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
               ;
-            while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
+            while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
               ;
 
             if (isScrollbarWindow (ev.xany.window))
@@ -1560,7 +1560,7 @@
 
 #ifdef TRANSPARENT
             if (am_transparent && ev.xany.window == parent[0])
-              XClearWindow (xdisp, ev.xany.window);
+              XClearWindow (dpy, ev.xany.window);
 #endif
           }
         break;
@@ -1580,10 +1580,10 @@
               ; // nop
             else if (ev.xbutton.state & (Button1Mask | Button3Mask))
               {
-                while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
+                while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
                   ;
 
-                XQueryPointer (xdisp, vt,
+                XQueryPointer (dpy, vt,
                                &unused_root, &unused_child,
                                &unused_root_x, &unused_root_y,
                                &ev.xbutton.x, &ev.xbutton.y,
@@ -1657,11 +1657,11 @@
           }
         else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
           {
-            while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
+            while (XCheckTypedWindowEvent (dpy, scrollBar.win,
                                            MotionNotify, &ev))
               ;
 
-            XQueryPointer (xdisp, scrollBar.win,
+            XQueryPointer (dpy, scrollBar.win,
                           &unused_root, &unused_child,
                           &unused_root_x, &unused_root_y,
                           &ev.xbutton.x, &ev.xbutton.y,
@@ -2432,17 +2432,17 @@
   if (!OPTION (Opt_transparent))
     return pchanged;	/* Don't try any more */
 
-  XGetWindowAttributes (xdisp, display->root, &wrootattr);
+  XGetWindowAttributes (dpy, display->root, &wrootattr);
   rootdepth = wrootattr.depth;
 
-  XGetWindowAttributes (xdisp, parent[0], &wattr);
+  XGetWindowAttributes (dpy, parent[0], &wattr);
 
   if (rootdepth != wattr.depth)
     {
       if (am_transparent)
         {
           pchanged = 1;
-          XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
+          XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
           am_transparent = am_pixmap_trans = 0;
         }
 
@@ -2450,7 +2450,7 @@
     }
 
   /* Get all X ops out of the queue so that our information is up-to-date. */
-  XSync (xdisp, False);
+  XSync (dpy, False);
 
   /*
    * Make the frame window set by the window manager have
@@ -2458,13 +2458,13 @@
    * windows for each client, so we have to take care about that.
    */
   i = (xa[XA_XROOTPMAP_ID]
-       && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
+       && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
                               0L, 1L, False, XA_PIXMAP, &atype, &aformat,
                               &nitems, &bytes_after, &prop) == Success);
 
   if (!i || prop == NULL)
      i = (xa[XA_ESETROOT_PMAP_ID]
-          && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
+          && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
                                  0L, 1L, False, XA_PIXMAP, &atype, &aformat,
                                  &nitems, &bytes_after, &prop) == Success);
 
@@ -2493,7 +2493,7 @@
       GC gc;
       XGCValues gcvalue;
 
-      XTranslateCoordinates (xdisp, parent[0], display->root,
+      XTranslateCoordinates (dpy, parent[0], display->root,
                              0, 0, &sx, &sy, &cr);
       nw = (unsigned int)szHint.width;
       nh = (unsigned int)szHint.height;
@@ -2516,9 +2516,9 @@
       min_it (nw, (unsigned int) (wrootattr.width - sx));
       min_it (nh, (unsigned int) (wrootattr.height - sy));
 
-      XSync (xdisp, False);
+      XSync (dpy, False);
       allowedxerror = -1;
-      image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
+      image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
 
       /* XXX: handle BadMatch - usually because we're outside the pixmap */
       /* XXX: may need a delay here? */
@@ -2531,7 +2531,7 @@
               pchanged = 1;
               if (pixmap != None)
                 {
-                  XFreePixmap (xdisp, pixmap);
+                  XFreePixmap (dpy, pixmap);
                   pixmap = None;
                 }
             }
@@ -2541,7 +2541,7 @@
       else
         {
           if (pixmap != None)
-            XFreePixmap (xdisp, pixmap);
+            XFreePixmap (dpy, pixmap);
 
 #if TINTING
           if (ISSET_PIXCOLOR (Color_tint))
@@ -2555,14 +2555,14 @@
             }
 #endif
 
-          pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
-          gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
-          XPutImage (xdisp, pixmap, gc, image, 0, 0,
+          pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
+          gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
+          XPutImage (dpy, pixmap, gc, image, 0, 0,
                      nx, ny, image->width, image->height);
-          XFreeGC (xdisp, gc);
+          XFreeGC (dpy, gc);
           XDestroyImage (image);
-          XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
-          XClearWindow (xdisp, parent[0]);
+          XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
+          XClearWindow (dpy, parent[0]);
 
           if (!am_transparent || !am_pixmap_trans)
             pchanged = 1;
@@ -2572,7 +2572,7 @@
     }
 
   if (am_pixmap_trans)
-    XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
+    XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
   else
     {
       unsigned int n;
@@ -2582,7 +2582,7 @@
       for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
         {
           oldp = parent[i];
-          XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
+          XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
           XFree (list);
 
           if (parent[i] == display->root)
@@ -2602,7 +2602,7 @@
       if (pchanged)
         for (; n < (unsigned int)i; n++)
           {
-            XGetWindowAttributes (xdisp, parent[n], &wattr);
+            XGetWindowAttributes (dpy, parent[n], &wattr);
 
             if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
               {
@@ -2613,8 +2613,8 @@
 
       if (n > (sizeof (parent) / sizeof (parent[0])))
         {
-          XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
-          XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
+          XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
+          XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
           am_transparent = 0;
           /* XXX: also turn off Opt_transparent? */
         }
@@ -2622,11 +2622,11 @@
         {
           for (n = 0; n < (unsigned int)i; n++)
             {
-              XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
-              XClearWindow (xdisp, parent[n]);
+              XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
+              XClearWindow (dpy, parent[n]);
             }
 
-          XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
+          XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
           am_transparent = 1;
         }
 
@@ -2636,7 +2636,7 @@
 
   if (scrollBar.win)
     {
-      XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
+      XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
       scrollBar.setIdle ();
       scrollbar_show (0);
     }
@@ -3537,7 +3537,7 @@
   XWindowAttributes wattr;
   Window wdummy;
 
-  dLocal (Display *, xdisp);
+  dLocal (Display *, dpy);
 
   if (nargs == 0)
     return;
@@ -3548,22 +3548,22 @@
        * commands
        */
       case 1:			/* deiconify window */
-        XMapWindow (xdisp, parent[0]);
+        XMapWindow (dpy, parent[0]);
         break;
       case 2:			/* iconify window */
-        XIconifyWindow (xdisp, parent[0], display->screen);
+        XIconifyWindow (dpy, parent[0], display->screen);
         break;
       case 3:			/* set position (pixels) */
-        XMoveWindow (xdisp, parent[0], args[1], args[2]);
+        XMoveWindow (dpy, parent[0], args[1], args[2]);
         break;
       case 4:			/* set size (pixels) */
         set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
         break;
       case 5:			/* raise window */
-        XRaiseWindow (xdisp, parent[0]);
+        XRaiseWindow (dpy, parent[0]);
         break;
       case 6:			/* lower window */
-        XLowerWindow (xdisp, parent[0]);
+        XLowerWindow (dpy, parent[0]);
         break;
       case 7:			/* refresh window */
         scr_touch (true);
@@ -3584,18 +3584,18 @@
        * reports - some output format copied from XTerm
        */
       case 11:			/* report window state */
-        XGetWindowAttributes (xdisp, parent[0], &wattr);
+        XGetWindowAttributes (dpy, parent[0], &wattr);
         tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
         break;
       case 13:			/* report window position */
-        XGetWindowAttributes (xdisp, parent[0], &wattr);
-        XTranslateCoordinates (xdisp, parent[0], wattr.root,
+        XGetWindowAttributes (dpy, parent[0], &wattr);
+        XTranslateCoordinates (dpy, parent[0], wattr.root,
                                -wattr.border_width, -wattr.border_width,
                                &x, &y, &wdummy);
         tt_printf ("\033[3;%d;%dt", x, y);
         break;
       case 14:			/* report window size (pixels) */
-        XGetWindowAttributes (xdisp, parent[0], &wattr);
+        XGetWindowAttributes (dpy, parent[0], &wattr);
         tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
         break;
       case 18:			/* report text area size (chars) */
@@ -3607,7 +3607,7 @@
       case 20:			/* report icon label */
         {
           char *s;
-          XGetIconName (xdisp, parent[0], &s);
+          XGetIconName (dpy, parent[0], &s);
           tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
@@ -3615,7 +3615,7 @@
       case 21:			/* report window title */
         {
           char *s;
-          XFetchName (xdisp, parent[0], &s);
+          XFetchName (dpy, parent[0], &s);
           tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
@@ -3751,7 +3751,7 @@
   bool query = str[0] == '?' && !str[1];
   int saveop = op;
 
-  dLocal (Display *, xdisp);
+  dLocal (Display *, dpy);
 
   assert (str != NULL);
   switch (op)
@@ -3777,7 +3777,7 @@
             const char *str = "";
 
             if (prop
-                && XGetWindowProperty (xdisp, parent[0],
+                && XGetWindowProperty (dpy, parent[0],
                                        prop, 0, 1<<16, 0, AnyPropertyType,
                                        &actual_type, &actual_format,
                                        &nitems, &bytes_after, &value) == Success
@@ -3799,7 +3799,7 @@
                 set_utf8_property (display->atom (str), eq + 1);
               }
             else
-              XDeleteProperty (xdisp, parent[0],
+              XDeleteProperty (dpy, parent[0],
                                display->atom (str));
           }
         break;