*** empty log message ***

diff --git a/doc/rxvt.1 b/doc/rxvt.1
index 148bf5b..9a553a1 100644 (file)
--- a/doc/rxvt.1
+++ b/doc/rxvt.1
@@ -1,7 +1,7 @@
 .if !\n(.g .ab GNU tbl requires GNU troff.
 .if !dTS .ds TS
 .if !dTE .ds TE
-.TH "RXVT" "1" "2004-07-26" "X Version 11" "X Tools" 
+.TH "RXVT" "1" "2004-07-31" "X Version 11" "X Tools" 
 .SH "NAME" 
 rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system
 .PP 
@@ -70,7 +70,7 @@ resource \fBbackground\fP\&.
 .IP "\fB-fg\fP \fIcolour\fP" 
 Window foreground colour;
 resource \fBforeground\fP\&.
-.IP "\fB-pixmap:\fP \fIfile[;geom]\fP" 
+.IP "\fB-pixmap\fP \fIfile[;geom]\fP" 
 Compile \fIXPM\fP: Specify XPM file for the background and also
 optionally specify its scaling with a geometry string\&.  Note you
 may need to add quotes to avoid special shell interpretation of

diff --git a/doc/rxvt.tbl b/doc/rxvt.tbl
index 234846f..9cd952d 100644 (file)
--- a/doc/rxvt.tbl
+++ b/doc/rxvt.tbl
@@ -1,4 +1,4 @@
-.TH "RXVT" "1" "2004-07-26" "X Version 11" "X Tools" 
+.TH "RXVT" "1" "2004-07-31" "X Version 11" "X Tools" 
 .SH "NAME" 
 rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system
 .PP 
@@ -67,7 +67,7 @@ resource \fBbackground\fP\&.
 .IP "\fB-fg\fP \fIcolour\fP" 
 Window foreground colour;
 resource \fBforeground\fP\&.
-.IP "\fB-pixmap:\fP \fIfile[;geom]\fP" 
+.IP "\fB-pixmap\fP \fIfile[;geom]\fP" 
 Compile \fIXPM\fP: Specify XPM file for the background and also
 optionally specify its scaling with a geometry string\&.  Note you
 may need to add quotes to avoid special shell interpretation of

diff --git a/doc/yodl/rxvt-options.yo b/doc/yodl/rxvt-options.yo
index 568a92b..cf541a6 100644 (file)
--- a/doc/yodl/rxvt-options.yo
+++ b/doc/yodl/rxvt-options.yo
@@ -1,4 +1,4 @@
-COMMENT(-- $Id: rxvt-options.yo,v 1.16 2004-07-31 13:40:46 root Exp $ --)
+COMMENT(-- $Id: rxvt-options.yo,v 1.17 2004-07-31 15:32:50 root Exp $ --)
 COMMENT(----------------------------------------------------------------------)
 manpageoptions()
 
@@ -43,10 +43,12 @@ startdit()
        Fade the text by the given percentage when focus is lost.
     dit(bf(-tint) em(colour))
         Tint the transparent background pixmap with the given colour when
-        transparency is enabled with bf(-tr) or bf(-ip). You can also
-        emulate the "shading" or "brigthness change" option known from
-        other terminal programs using gray10 (gray20, etc.) colour
-        strings.
+        transparency is enabled with bf(-tr) or bf(-ip). See also
+        the bf(-sh) option that cna be used to brighten or darken
+        the image in addition to tinting it.
+    dot(bf(-sh)) em(number)
+        Darken (0 .. 100) or lighten (-1 .. -100) the transparent background
+        image in addition to tinting it.
     dit(bf(-bg) em(colour))
        Window background colour;
         resource bf(background).

diff --git a/doc/yodl/rxvt-resources.yo b/doc/yodl/rxvt-resources.yo
index a77abb7..d83716d 100644 (file)
--- a/doc/yodl/rxvt-resources.yo
+++ b/doc/yodl/rxvt-resources.yo
@@ -1,4 +1,4 @@
-COMMENT(-- $Id: rxvt-resources.yo,v 1.17 2004-07-30 22:36:42 root Exp $ --)
+COMMENT(-- $Id: rxvt-resources.yo,v 1.18 2004-07-31 15:32:50 root Exp $ --)
 COMMENT(----------------------------------------------------------------------)
 manpagesection(RESOURCES (available also as long-options))
 
@@ -85,6 +85,9 @@ startdit()
        Fade the text by the given percentage when focus is lost.
     dit(bf(tintColor:) em(colour))
         Tint the transparent background pixmap with the given colour.
+    dit(bf(shading:) em(number))
+        Darken (0 .. 100) or lighten (-1 .. -100) the transparent background
+        image in addition to tinting it.
     dit(bf(fading:) em(number))
         Scale the tint colour by the given percentage.
     dit(bf(scrollColor:) em(colour))

diff --git a/src/menubar.C b/src/menubar.C
index c7040b8..c9f2ab3 100644 (file)
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -2037,7 +2037,7 @@ rxvt_term::menubar_expose ()
       /* Create the graphics context */
       XGCValues       gcvalue;
 
-      gcvalue.foreground = (XDEPTH <= 2 ? PixColors[Color_fg]
+      gcvalue.foreground = (display->depth <= 2 ? PixColors[Color_fg]
                             : PixColors[Color_Black]);
       menubarGC = XCreateGC (display->display, menuBar.win,
                             GCForeground, &gcvalue);

diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
index 99c29da..7a7101c 100644 (file)
--- a/src/scrollbar-next.C
+++ b/src/scrollbar-next.C
@@ -124,7 +124,7 @@ rxvt_term::renderPixmap (const char *const *data, int width, int height)
   Pixmap          d;
   GC              pointcolour;
 
-  d = XCreatePixmap (display->display, scrollBar.win, width, height, XDEPTH);
+  d = XCreatePixmap (display->display, scrollBar.win, width, height, display->depth);
 
   for (y = 0; y < height; y++)
     {