*** empty log message ***

diff --git a/doc/rxvt.1 b/doc/rxvt.1
index 3f678737efe04a5dcb7f044953038e05058c2c92..b0f16ddcb2239e04e6f36f1d26ce2712957abfc4 100644 (file)
--- a/doc/rxvt.1
+++ b/doc/rxvt.1
@@ -11,7 +11,7 @@ rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system
 .PP 
 .SH "DESCRIPTION" 
 .PP 
-\fBrxvt-unicode\fP, version \fB2\&.5\fP, is a colour vt102 terminal emulator
+\fBrxvt-unicode\fP, version \fB2\&.6\fP, is a colour vt102 terminal emulator
 intended as an \fIxterm\fP(1) replacement for users who do not require
 features such as Tektronix 4014 emulation and toolkit-style configurability\&.
 As a result, \fBrxvt-unicode\fP uses much less swap space -- a significant
@@ -56,6 +56,8 @@ resource \fBjumpScroll\fP\&.
 Turn on/off inheriting parent window\&'s pixmap\&.  Alternative form
 is \fB-tr\fP;
 resource \fBinheritPixmap\fP\&.
+.IP "\fB-tint\fP \fIcolour\fP" 
+Tint the transparent background pixmap with the given colour\&.
 .IP "\fB-bg\fP \fIcolour\fP" 
 Window background colour;
 resource \fBbackground\fP\&.
@@ -258,6 +260,8 @@ option \fB+j\fP\&.
 \fBTrue\fP: make the background inherit the parent windows\&' pixmap,
 giving artificial transparency\&.
 \fBFalse\fP: do not inherit the parent windows\&' pixmap\&.
+.IP "\fBtintColor\fP \fIcolour\fP" 
+Tint the transparent background pixmap with the given colour\&.
 .IP "\fBscrollColor:\fP \fIcolour\fP" 
 Use the specified colour for the scrollbar [default #B2B2B2]\&.
 .IP "\fBtroughColor:\fP \fIcolour\fP" 
@@ -1031,7 +1035,7 @@ Click-and-drag doesn\&'t work with X11 mouse report overriding\&.
 .PP 
 .SH "FTP LOCATION" 
 .PP 
-rxvt-2\&.5\&.tar\&.gz can be found at the following ftp sites
+rxvt-2\&.6\&.tar\&.gz can be found at the following ftp sites
 ftp://ftp\&.rxvt\&.org/pub/rxvt
 .PP 
 .SH "CURRENT PROJECT COORDINATOR" 

diff --git a/doc/rxvt.tbl b/doc/rxvt.tbl
index 87a27de37675245b52dee4b27d4c0ccb1a6b3ebf..1da1e65485a7f21e783704e20c45d37a6e1aaf86 100644 (file)
--- a/doc/rxvt.tbl
+++ b/doc/rxvt.tbl
@@ -8,7 +8,7 @@ rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system
 .PP 
 .SH "DESCRIPTION" 
 .PP 
-\fBrxvt-unicode\fP, version \fB2\&.5\fP, is a colour vt102 terminal emulator
+\fBrxvt-unicode\fP, version \fB2\&.6\fP, is a colour vt102 terminal emulator
 intended as an \fIxterm\fP(1) replacement for users who do not require
 features such as Tektronix 4014 emulation and toolkit-style configurability\&.
 As a result, \fBrxvt-unicode\fP uses much less swap space -- a significant
@@ -53,6 +53,8 @@ resource \fBjumpScroll\fP\&.
 Turn on/off inheriting parent window\&'s pixmap\&.  Alternative form
 is \fB-tr\fP;
 resource \fBinheritPixmap\fP\&.
+.IP "\fB-tint\fP \fIcolour\fP" 
+Tint the transparent background pixmap with the given colour\&.
 .IP "\fB-bg\fP \fIcolour\fP" 
 Window background colour;
 resource \fBbackground\fP\&.
@@ -255,6 +257,8 @@ option \fB+j\fP\&.
 \fBTrue\fP: make the background inherit the parent windows\&' pixmap,
 giving artificial transparency\&.
 \fBFalse\fP: do not inherit the parent windows\&' pixmap\&.
+.IP "\fBtintColor\fP \fIcolour\fP" 
+Tint the transparent background pixmap with the given colour\&.
 .IP "\fBscrollColor:\fP \fIcolour\fP" 
 Use the specified colour for the scrollbar [default #B2B2B2]\&.
 .IP "\fBtroughColor:\fP \fIcolour\fP" 
@@ -581,7 +585,7 @@ Click-and-drag doesn\&'t work with X11 mouse report overriding\&.
 .PP 
 .SH "FTP LOCATION" 
 .PP 
-rxvt-2\&.5\&.tar\&.gz can be found at the following ftp sites
+rxvt-2\&.6\&.tar\&.gz can be found at the following ftp sites
 ftp://ftp\&.rxvt\&.org/pub/rxvt
 .PP 
 .SH "CURRENT PROJECT COORDINATOR" 

diff --git a/doc/yodl/rxvt-resources.yo b/doc/yodl/rxvt-resources.yo
index d66ed373cc3f1fe15ab82cb13832d5929f92d1ac..1f3800666c53d20f79b77d702d61ad39de01d37a 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.9 2004-03-29 21:02:11 pcg Exp $ --)
+COMMENT(-- $Id: rxvt-resources.yo,v 1.10 2004-04-02 00:51:09 pcg Exp $ --)
 COMMENT(----------------------------------------------------------------------)
 manpagesection(RESOURCES (available also as long-options))
 
@@ -250,13 +250,15 @@ startdit()
     dit(bf(insecure))
         Enables "insecure" mode. Rxvt-unicode offers some escape sequences
         that echo arbitrary strings like the icon name or the locale. This
-        could be abused if somebody gets 8-bit-clean access to your display,
-        wether throuh a mail client displaying mail bodies unfiltered or
-        though write(1). Therefore, these sequences are disabled by default.
-        You can enable them by setting this boolean resource or specifying
-        bf(-insecure) as an option. At the moment, this enabled display-answer,
-        locale, findfont, icon label and window title requests as well as
-        dynamic menubar dispatch.
+        could be abused if somebody gets 8-bit-clean access to your
+        display, wether throuh a mail client displaying mail bodies
+        unfiltered or though write(1). Therefore, these sequences are
+        disabled by default.  (Note that other terminals, including xterm,
+        have these sequences enabled by default). You can enable them
+        by setting this boolean resource or specifying bf(-insecure) as
+        an option. At the moment, this enabled display-answer, locale,
+        findfont, icon label and window title requests as well as dynamic
+        menubar dispatch.
     dit(bf(modifier:) em(modifier))
        Set the key to be interpreted as the Meta key to:
        bf(alt), bf(meta), bf(hyper), bf(super), bf(mod1), bf(mod2), bf(mod3),

diff --git a/doc/yodl/rxvtRef-menubar.yo b/doc/yodl/rxvtRef-menubar.yo
index 6b41db2f2e727a62e20192141cd053e6309f9712..6c751e3c42bc66b30360967f5414106a0fd6dd64 100644 (file)
--- a/doc/yodl/rxvtRef-menubar.yo
+++ b/doc/yodl/rxvtRef-menubar.yo
@@ -1,4 +1,4 @@
-COMMENT(-- $Id: rxvtRef-menubar.yo,v 1.2 2003-11-24 17:31:27 pcg Exp $ --)
+COMMENT(-- $Id: rxvtRef-menubar.yo,v 1.3 2004-04-02 00:51:09 pcg Exp $ --)
 label(menuBar)
 nsect(menuBar)
 
@@ -11,7 +11,7 @@ use bf(./) to specify a menu relative to the current menu.
 
 nsubsect(Overview of menuBar operation)
 
-For the menuBar XTerm escape sequence tt(ESC ] 10 ; Pt ST), the
+For the menuBar XTerm escape sequence tt(ESC ] 703 ; Pt ST), the
 syntax of tt(Pt) can be used for a variety of tasks:
 startit()
     it()link(Commands)(menuBarCommands)
@@ -96,7 +96,7 @@ P()\
 P()\
     dl(bf([show]nl()[hide]))
        (control display of the menuBar ... just like
-       link(ESC[?10 h/l)(Priv10))
+       link(ESC[?703 h/l)(Priv703))
 P()\
     dl(bf([pixmap:+em(name)]nl()[pixmap:+em(name);em(scaling)]))
        (set the background pixmap globally ... just like
@@ -163,7 +163,7 @@ startdl()
     dl(For example,)
        (bf(M-xapropos) is equivalent to bf(\Exapropos\r))
     dl(and)
-       (bf(\E]10;mona;100) is equivalent to bf(\E]10;mona;100\a))
+       (bf(\E]703;mona;100) is equivalent to bf(\E]703;mona;100\a))
 enddl()
 
 The option bf({em(right-rtext)}) will be right-justified.  In the absence of

diff --git a/doc/yodl/rxvtRef-xterm.yo b/doc/yodl/rxvtRef-xterm.yo
index cb73b1d1bc2900326ed1dd388f86879b48c7c0f9..4f5ad78d635c3a40170ab86a282bfaf223d5b1de 100644 (file)
--- a/doc/yodl/rxvtRef-xterm.yo
+++ b/doc/yodl/rxvtRef-xterm.yo
@@ -1,4 +1,4 @@
-COMMENT(-- $Id: rxvtRef-xterm.yo,v 1.4 2004-03-05 21:26:01 pcg Exp $ --)
+COMMENT(-- $Id: rxvtRef-xterm.yo,v 1.5 2004-04-02 00:51:09 pcg Exp $ --)
 COMMENT(OSC: Operating System Commands)
 label(XTerm)
 nsect(XTerm Operating System Commands)
@@ -27,8 +27,9 @@ startdl()
                    0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, \
                    6=cyan, 7=white))\
            row(cell(bf(tt(Ps = 10)) bf((NB: may change in future)))\
-               cell(link(menuBar)(menuBar) command bf(tt(Pt)) \
-                   em(rxvt compile-time option)))\
+               cell(Change colour of text foreground to bf(tt(Pt))))\
+           row(cell(bf(tt(Ps = 11)) bf((NB: may change in future)))\
+               cell(Change colour of text background to bf(tt(Pt))))\
            row(cell(bf(tt(Ps = 12)))\
                cell(Change colour of text cursor foreground to bf(tt(Pt))))\
            row(cell(bf(tt(Ps = 13)))\
@@ -65,5 +66,10 @@ startdl()
                    bf(tt(Pt))))\
            row(cell(bf(tt(Ps = 701)))\
                cell(Change current locale to bf(tt(Pt)), or, if bf(tt(Pt)) is bf(tt(?)), return the current locale))\
+           row(cell(bf(tt(Ps = 702)))\
+               cell(find font for character, used for debugging)\
+           row(cell(bf(tt(Ps = 703)))\
+               cell(link(menuBar)(menuBar) command bf(tt(Pt)) \
+                   em(rxvt compile-time option)))\
        endtable())
 enddl()

diff --git a/src/defaultfont.C b/src/defaultfont.C
index bb65ff26325da8c30daf39a750392e980a85ab70..6eb9c7f0da3b0d834d1d82bf49cd99544d66aa64 100644 (file)
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -1000,7 +1000,7 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
 /////////////////////////////////////////////////////////////////////////////
 
 rxvt_fontset::rxvt_fontset (rxvt_t r)
-: r (r)
+: r (r), fontdesc (0)
 {
   clear ();
 }
@@ -1016,6 +1016,8 @@ rxvt_fontset::clear ()
   for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
     FONT_UNREF (*i);
 
+  free (fontdesc); fontdesc = 0;
+
   fonts.clear ();
   base_id = 0;
   base_prop.height = 0x7fffffff;
@@ -1132,6 +1134,8 @@ rxvt_fontset::populate (const char *desc)
 {
   clear ();
 
+  fontdesc = strdup (desc);
+
   fonts.push_back (new_font (0, CS_UNICODE));
   realize_font (0);
 

diff --git a/src/defaultfont.h b/src/defaultfont.h
index 7cdc75656f887bf0f06c0466fb4810822f25d0f4..d191b9c3294f0b97ab3d87319c7bd488925de818 100644 (file)
--- a/src/defaultfont.h
+++ b/src/defaultfont.h
@@ -100,6 +100,8 @@ struct rxvt_font {
 struct rxvt_fallback_font;
 
 struct rxvt_fontset {
+  char *fontdesc;
+
   rxvt_fontset (rxvt_t r);
   ~rxvt_fontset ();
 

diff --git a/src/menubar.C b/src/menubar.C
index f7f42d36490098d16ef0e046bc176a36effb1689..bd404dc7d08b5f8943d0754c7085fa6a04b8c7a2 100644 (file)
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -1708,7 +1708,7 @@ rxvt_term::menubar_dispatch (char *str)
             else if ((n = rxvt_Str_match (str, "pixmap:")) != 0)
               {
                 str += n;
-                xterm_seq (XTerm_Pixmap, str, CHAR_ST);
+                process_xterm_seq (XTerm_Pixmap, str, CHAR_ST);
               }
 #if (MENUBAR_MAX > 1)
             else if ((n = rxvt_Str_match (str, "rm")) != 0)
@@ -1761,7 +1761,7 @@ rxvt_term::menubar_dispatch (char *str)
 
                 if ((fp = fopen (buffer, "wb")) != NULL)
                   {
-                    xterm_seq (XTerm_title, buffer, CHAR_ST);
+                    process_xterm_seq (XTerm_title, buffer, CHAR_ST);
                     menubar_dump (fp);
                     fclose (fp);
                   }