From 9ff3be06ed31ea7b4598527baa806e62ab02ae42 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 25 Oct 2005 19:04:45 +0000 Subject: [PATCH] *** empty log message *** --- Changes | 1 + doc/rxvt.1.pod | 6 ++-- src/command.C | 2 +- src/rxvtlib.h.in | 79 ++++++++++++++++++++++++------------------------ src/screen.C | 16 ---------- src/xdefaults.C | 1 - 6 files changed, 45 insertions(+), 60 deletions(-) diff --git a/Changes b/Changes index 53ef693b..dbfe5f9d 100644 --- 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 5cb95c1d..0543338d 100644 --- a/doc/rxvt.1.pod +++ b/doc/rxvt.1.pod @@ -107,7 +107,7 @@ Turn on/off simulated reverse video; resource B. Turn on/off jump scrolling; resource B. -=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. @@ -128,7 +128,9 @@ is black. resource B. 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. +tinting it; resource I. Example: + + @@RXVT_NAME@@ -tr -tint blue -sh 40 =item B<-sh> diff --git a/src/command.C b/src/command.C index e9bde5ef..2e110fff 100644 --- 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 a7f8f02d..4f7ed17b 100644 --- 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 27f6d39a..c80f47be 100644 --- 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 11510ae1..ec3cf416 100644 --- 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"), -- 2.34.1