*** empty log message ***

diff --git a/Changes b/Changes
index 53ef693b455cc7e226c504f42e6719c552cbb864..dbfe5f9d9c62f0aa7705f2b921d4c35a6b000171 100644 (file)
--- a/Changes
+++ b/Changes
@@ -34,6 +34,7 @@ WISH: just for fun, do shade and tint with XRender.
         - text with background==foreground colour gets displayed with default
           bg/fg now when in reverse video, so it can be seen when selecting.
         - allow koi8r* as x11 encoding name for koi8r (Nikita Danilov).
+        - removed undocumented inheritPixmapforce option.
         
 5.7  Wed Jul 13 04:46:33 CEST 2005
        - implement some useful (hopefully) options for rxvtd.

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 5cb95c1de6279f1ba8a1946ebe55e00e42b8b28b..0543338d17d1670db9501dabe417635d46711dad 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -107,7 +107,7 @@ Turn on/off simulated reverse video; resource B<reverseVideo>.
 
 Turn on/off jump scrolling; resource B<jumpScroll>.
 
-=item B<-ip>|B<+ip>
+=item B<-ip>|B<+ip> | B<-tr>|B<+tr>
 
 Turn on/off inheriting parent window's pixmap. Alternative form is
 B<-tr>; resource B<inheritPixmap>.
@@ -128,7 +128,9 @@ is black. resource B<fadeColor>.
 Tint the transparent background pixmap with the given colour when
 transparency is enabled with B<-tr> or B<-ip>. See also the B<-sh>
 option that can be used to brighten or darken the image in addition to
-tinting it; resource I<tintColor>.
+tinting it; resource I<tintColor>. Example:
+
+   @@RXVT_NAME@@ -tr -tint blue -sh 40
 
 =item B<-sh>
 

diff --git a/src/command.C b/src/command.C
index e9bde5efccd3f78393a77556a2a2c0611047a1e4..2e110fff5b90eb01f4232106aaa400b035aaacdc 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -2563,7 +2563,7 @@ rxvt_term::check_our_parents ()
 
       if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
         {
-          XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
+          XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]);
           XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
           am_transparent = 0;
           /* XXX: also turn off Opt_transparent? */

diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index a7f8f02d35f95bcc7bdf873272665e7e1f1b5d71..4f7ed17b7c4b156203f2fde007369ff802e41315 100644 (file)
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -183,53 +183,52 @@ typedef struct {
 /* ------------------------------------------------------------------------- */
 
 /* screen_t flags */
-#define Screen_Relative         (1<<0)  /* relative origin mode flag         */
-#define Screen_VisibleCursor    (1<<1)  /* cursor visible?                   */
-#define Screen_Autowrap         (1<<2)  /* auto-wrap flag                    */
-#define Screen_Insert           (1<<3)  /* insert mode (vs. overstrike)      */
-#define Screen_WrapNext         (1<<4)  /* need to wrap for next char?       */
-#define Screen_DefaultFlags     (Screen_VisibleCursor|Screen_Autowrap)
+#define Screen_Relative          (1<<0)  /* relative origin mode flag         */
+#define Screen_VisibleCursor     (1<<1)  /* cursor visible?                   */
+#define Screen_Autowrap          (1<<2)  /* auto-wrap flag                    */
+#define Screen_Insert            (1<<3)  /* insert mode (vs. overstrike)      */
+#define Screen_WrapNext          (1<<4)  /* need to wrap for next char?       */
+#define Screen_DefaultFlags      (Screen_VisibleCursor|Screen_Autowrap)
 
 /* rxvt_vars.options */
-#define Opt_console             (1UL<<0)
-#define Opt_loginShell          (1UL<<1)
-#define Opt_iconic              (1UL<<2)
-#define Opt_visualBell          (1UL<<3)
-#define Opt_mapAlert            (1UL<<4)
-#define Opt_reverseVideo        (1UL<<5)
-#define Opt_utmpInhibit         (1UL<<6)
-#define Opt_scrollBar           (1UL<<7)
-#define Opt_scrollBar_right     (1UL<<8)
-#define Opt_scrollBar_floating  (1UL<<9)
-#define Opt_meta8               (1UL<<10)
-#define Opt_scrollTtyOutput     (1UL<<11)
-#define Opt_scrollTtyKeypress   (1UL<<12)
-#define Opt_transparent         (1UL<<13)
-#define Opt_transparent_all     (1UL<<14)
-#define Opt_tripleclickwords    (1UL<<15)
-#define Opt_scrollWithBuffer    (1UL<<16)
-#define Opt_jumpScroll          (1UL<<17)
-#define Opt_mouseWheelScrollPage (1UL<<18)
-#define Opt_pointerBlank        (1UL<<19)
-#define Opt_cursorBlink         (1UL<<20)
-#define Opt_secondaryScreen    (1UL<<21)
-#define Opt_secondaryScroll    (1UL<<22)
+#define Opt_console              (1UL<<0)
+#define Opt_loginShell           (1UL<<1)
+#define Opt_iconic               (1UL<<2)
+#define Opt_visualBell           (1UL<<3)
+#define Opt_mapAlert             (1UL<<4)
+#define Opt_reverseVideo         (1UL<<5)
+#define Opt_utmpInhibit          (1UL<<6)
+#define Opt_scrollBar            (1UL<<7)
+#define Opt_scrollBar_right      (1UL<<8)
+#define Opt_scrollBar_floating   (1UL<<9)
+#define Opt_meta8                (1UL<<10)
+#define Opt_scrollTtyOutput      (1UL<<11)
+#define Opt_scrollTtyKeypress    (1UL<<12)
+#define Opt_transparent          (1UL<<13)
+#define Opt_tripleclickwords     (1UL<<14)
+#define Opt_scrollWithBuffer     (1UL<<15)
+#define Opt_jumpScroll           (1UL<<16)
+#define Opt_mouseWheelScrollPage (1UL<<17)
+#define Opt_pointerBlank         (1UL<<18)
+#define Opt_cursorBlink          (1UL<<19)
+#define Opt_secondaryScreen      (1UL<<20)
+#define Opt_secondaryScroll      (1UL<<21)
+#define Opt_pastableTabs         (1UL<<22)
+#define Opt_cursorUnderline      (1UL<<23)
 #if ENABLE_FRILLS
-# define Opt_insecure          (1UL<<23) // insecure esc sequences
-# define Opt_borderLess                (1UL<<24) // mem borderless hints
+# define Opt_insecure           (1UL<<24) // insecure esc sequences
+# define Opt_borderLess                 (1UL<<25) // mem borderless hints
 #else
-# define Opt_insecure          0
-# define Opt_borderLess                0
+# define Opt_insecure           0
+# define Opt_borderLess                 0
 #endif
-#define Opt_pastableTabs       (1UL<<25)
-#define Opt_cursorUnderline    (1UL<<26)
 /* place holder used for parsing command-line options */
-#define Opt_Reverse             (1UL<<30)
-#define Opt_Boolean             (1UL<<31)
+#define Opt_Reverse              (1UL<<30)
+#define Opt_Boolean              (1UL<<31)
 
-#define DEFAULT_OPTIONS         (Opt_scrollBar | Opt_scrollTtyOutput \
-                                 | Opt_jumpScroll | Opt_secondaryScreen \
-                                 | Opt_pastableTabs)
+#define DEFAULT_OPTIONS          (Opt_scrollBar | Opt_scrollTtyOutput \
+                                  | Opt_jumpScroll | Opt_secondaryScreen \
+                                  | Opt_pastableTabs)
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/src/screen.C b/src/screen.C
index 27f6d39a19b56fa1d0013bc730c3bfc02732351e..c80f47be6e2e098d23bdfc3d5c9f8ce42c8c1825 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -2555,22 +2555,6 @@ rxvt_term::scr_clear (bool really)
   num_scr_allow = 0;
   want_refresh = 1;
 
-#if TRANSPARENT
-  if ((options & Opt_transparent) && (am_pixmap_trans == 0))
-    {
-      int i;
-
-      if (!(options & Opt_transparent_all))
-        i = 0;
-      else
-        i = (int) (sizeof (TermWin.parent) / sizeof (Window));
-
-      while (i--)
-        if (TermWin.parent[i] != None)
-          XClearWindow (display->display, TermWin.parent[i]);
-    }
-#endif
-
   if (really)
     XClearWindow (display->display, TermWin.vt);
 }

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 11510ae1332555e830bf61a5abe2b2bad161c148..ec3cf416d2d9f15f7b6243124690b17dc3d6c2e0 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -112,7 +112,6 @@ optList[] = {
               BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
 #if TRANSPARENT
               BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
-              BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
               SWCH ("tr", Opt_transparent, NULL),
 # if TINTING
               STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),